From 492419b6b733432a39adfb24f2e2b739ae2ad57c Mon Sep 17 00:00:00 2001 From: Alexander Sack Date: Sat, 23 Jan 2010 16:08:03 +0100 Subject: Imported Debian patch 0.3-1 --- debian/changelog | 225 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ debian/compat | 1 + debian/control | 29 +++++++ debian/copyright | 31 ++++++++ debian/rules | 89 ++++++++++++++++++++++ 5 files changed, 375 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100755 debian/rules diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..d7a61e1 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,225 @@ +modemmanager (0.3-1) unstable; urgency=low + + * initial upload to debian (Closes: #546587) + * address ftpmaster comments: refined debian/copyright to list all copyright + holders and explicitly declare doc-generator.xsl to be LGPL-2.1 + - update debian/copyright + * use debhelper compat level 7 and bump Standards-Version to 3.8.3 + - update debian/compat + + -- Alexander Sack Sat, 23 Jan 2010 16:08:03 +0100 + +modemmanager (0.3-0ubuntu1) lucid; urgency=low + + * upstream snapshot: 2009-12-08 06:07:58 (GMT) + + 07114d4f43c6e724d22294108b1e73785e7aab2a + - release: bump version to 0.2.997 + - gsm: handle different +COPS response behavior + - gsm: implement enable/connecting/disconnecting state handling + - core: fix ordering of DISABLING and DISABLED states + - cdma: reset previous state if disconnect failed + - cdma: correctly handle state update after disconnection + - cdma: handle interim enabling/disabling states better + - cdma: update for new modem states and make connect actually work + - mbm: update state after enabling the device + - core: schedule enabled/disabled callbacks to avoid infinite recursion + - cdma: set correct modem state on connect failure + - build: require glib-2.0 >= 2.6.18 for g_set_error_literal() + - zte: add missing ZTE device aux port tags + - gsm: more complete parsing of PIN responses + - gsm: fix unsolicited registration segfaults + - hso: ensure authentication works again after auth errors + - serial: don't run commands when there's already one in progress + - hso: fix up connection issues and error ignorance + - nozomi: fix detection (LP: #425312) + - gsm: CGDCONT parsing fixes (bgo #602552) + - core: don't allow double scheduled callbacks (fixes crash) + - serial: handle arbitrary amounts of padding in responses + - gsm: make "X4 &C1" init arguments optional (LP: #455031) + + * upstream release 0.3 + - cdma: increase data call initiation timeout + - core: fix mm_modem_check_removed() to return errors correctly + - cdma: allow plugins to override AT+CSS? during registration checking (rh #547294) + - anydata: add plugin for AnyData CDMA devices (rh #547294) + - huawei-cdma: robustify SYSINFO parsing + - sierra: prefer primary port for status + - core: protect against modem removal in critical callbacks (rh #553953) + - cdma: prefer primary port unless it's connected + - probe: add CPIN request during the probing process (bgo #604369) + - zte: ignore SIM Build Main Menu requests (rh #551376) + - longcheer: new plugin for Longcheer (Alcatel etc) devices (bgo #606550) + - gsm: correctly parse Nokia N80 +COPS response + - gsm: split out +COPS response parsing and add testcases + - serial: prevent "hangs" by limiting EAGAIN retries on serial writes + - gsm: ensure registration state is reset when disabling the modem + - core: implement a PropertiesChanged signal for the MMModem class + - core: add Enabled property to org.freedesktop.ModemManager.Modem interface + - sierra: fix CDMA registration detection in some cases + - zte: handle unsolicited messages during probe + - cdma: fix quality parsing if modem doesn't prepend +CSQ: + - sierra: use at!pcstate on CDMA modems for power control + - option: always pick the right data port + - mbm: ensure various unsolicited responses are turned off when disabling + - cdma: try +CSQ? if CSQ fails + - cdma: accept SID 0 in some cases + + [ Tony Espy ] + * add get-snapshot-info target to rules + - update debian/rules + + [ Alexander Sack ] + * package improvements pointed out by mbiebl (thx) + + exclude pkglibdir and pppd from makeshlibs + - update debian/rules + + generate dbus spec during build and add it to package; build depend on + xsltproc accordingly + - update debian/rules + - update debian/control + + explicitly depend on libglib2.0-dev (>= 2.18) + - update debian/control + + fix git url in package description + - update debian/control + + -- Tony Espy Thu, 21 Jan 2010 19:07:37 -0500 + +modemmanager (0.2.git.20091014t233208.16f3e00-0ubuntu1) karmic; urgency=low + + New upstream snapshot: 2009-10-14 21:33:52 (GMT) + + 16f3e00f3438507aee06ffcaee560e337b8e8279 + - gsm: fix unsolicited registration by calling the statemachine callback + info (LP: #416893) + - mbm: use generic get_signal_quality implementation rather than our own + CIND based one - helps to fix LP: #449037 as its less error prone + - mbm: implement AT*ENAP polling; needed for some mbm devices, like m300 (LP: #442967) + - gsm: don't issue CFUN=0 by default (LP: #438150) + - mbm: fix disable after 3b19a85727458821f5df20153f8c04bc7717ba30 (LP: #447347, #438150) + - nokia: fix class property overrides to stop modemmanager from sending AT+CFUN (LP: #450256) + + -- Alexander Sack Thu, 15 Oct 2009 02:03:37 +0200 + +modemmanager (0.2.git.20091003t063318.aa78b5f-0ubuntu1) karmic; urgency=low + + New upstream snapshot: 2009-10-03 06:33:18 (GMT) + + aa78b5f5e5319e04f5b57f928bfab69dd4b93d88 + * fixes + - LP: #430576 - refuse to connect over Nokia N85, turns off the handset + - LP: #416126 - various unsolicited messages for mbm cause fail on connect + + -- Alexander Sack Tue, 06 Oct 2009 01:02:12 +0200 + +modemmanager (0.2.git.20090923t083842.f2a3825-0ubuntu1) karmic; urgency=low + + New upstream snapshot 2009-09-23 08:38:42 (GMT) + + commit: f2a3825f9d10ecebc63ce3c8602473cbbb6ab72c + + fix LP: #430576 - refuse to connect over Nokia N85, turns off the handset + + fix various F3507g related issues on first connect + + -- Alexander Sack Thu, 24 Sep 2009 11:41:08 +0200 + +modemmanager (0.2.git.20090909t142854.64b7be7-1) unstable; urgency=low + + * initial upload to debian (Closes: #546587) + + -- Alexander Sack Mon, 14 Sep 2009 14:53:24 +0200 + +modemmanager (0.2.git.20090909t142854.64b7be7-0ubuntu1) karmic; urgency=low + + New upstream snapshot 2009-09-09 14:28:54 (GMT) + + commit: 64b7be7460c3a9dbb3c9981de5754b330a8d2cdd + + fix LP: #414604 - Modem Manager setting bad baud rate, breaking pppd + connections. + + fix LP: #416418 - First connection attempt via F3507g fails + + fix LP: #424603 - Not closing modems when disconnected + + [ Alexander Sack ] + * address MIR comments (LP: #410259) + + cleanup debian/copyright + + set debhelper compat level to 5, matching debian/control + - add debian/compat + + remove not used patches + - delete debian/patches/ftbfs_hardy_glib_include_signal_h.patch + + use proper automake lower and upper version bounds matching the + versions referred to in debian/rules + - update debian/control + + don't redefine cdbs variables DEB_SOURCE, DEB_VERSION and + DEB_UPSTREAM_VERSION; in turn move DEB_MAJOR_VERSION definition + below the cdbs includes and use DEB_SOURCE_PACKAGE in GET_SOURCE + function + - update debian/rules + + document why we touch aclocal.m4 in pre-build:: + - update debian/rules + + use Ubuntu Network Manager Team as Maintainer and add asac@debian.org + to Uploaders + - update debian/control + + -- Alexander Sack Mon, 14 Sep 2009 11:38:05 +0200 + +modemmanager (0.2.git.20090820t183237.cd75023-0ubuntu1) karmic; urgency=low + + [ Tony Espy ] + * upstream snapshot 2009-08-20 18:32:37 (GMT) + + cd750230687177b45c2b8e507a0f0b22095aeb02 + - includes gsm and mbm fixes + + [ Alexander Sack ] + * add LOCAL_BRANCH feature to play nicely with fta's build bot + - update debian/rules + * use automake 1.10 vs. 1.11 depending on what is currently available + on the system + - update debian/rules + + -- Tony Espy Thu, 20 Aug 2009 15:06:51 -0400 + +modemmanager (0.2.git.20090806t105932.354a4cb-0ubuntu3) karmic; urgency=low + + [ Tony Espy ] + * update automake1.10 to automake in Build-Depends:, as automake + provides automake1.10 now + - update debian/control + + [ Alexander Sack ] + * fix LP: #410261 - do not ship .la and .a files in pkglibdir for + plugins; we strop .a and .la files in cdbs binary-post-install/modemmanager:: + - update debian/rules + + -- Alexander Sack Tue, 11 Aug 2009 13:38:38 +0200 + +modemmanager (0.2.git.20090806t105932.354a4cb-0ubuntu2) karmic; urgency=low + + * fix LP: #409943 - modemmanager debian/copyright has LGPL, + but upstream source is GPL + - update debian/copyright + + -- Tony Espy Thu, 06 Aug 2009 17:13:08 +0100 + +modemmanager (0.2.git.20090806t105932.354a4cb-0ubuntu1) karmic; urgency=low + + [ Tony Espy ] + * upstream snapshot 2009-08-06 10:59:32 (GMT) + + fixes license problems (LP: #403009) + + git://anongit.freedesktop.org/ModemManager/ModemManager + * drop patches superseded by upstream code base + - delete debian/patches/fix_makefile.patch + - update debian/patches/series + * add tarball generation code; added get-curr-source to + grab a specific version, and get-orig-source grabs the tip + of variable GIT_BRANCH; adjusted changelog version to the + new scheme. + - update debian/rules + * add real copyright notices and update git URL + - update debian/copyright + + [ Alexander Sack ] + * Initial release. (Closes: #XXXXXX) + * replace hal with gudev build dependency + - update debian/control + * signal.h is not implicitly included by hardy glib.h; add patch to + explicitly include this in src/main.c when SIGUSR1 is not defined + - add debian/patches/ftbfs_hardy_glib_include_signal_h.patch + - update debian/patches/series + * fix build failure due to gcc pickiness (committed upstream) + - add debian/patches/ftbfs_serial_quickfix.patch + - update debian/patches/series + + -- Tony Espy Thu, 06 Aug 2009 12:50:45 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +7 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..5429ac6 --- /dev/null +++ b/debian/control @@ -0,0 +1,29 @@ +Source: modemmanager +Section: net +Priority: optional +Maintainer: Ubuntu Network Manager Team +Uploaders: Alexander Sack +Build-Depends: debhelper (>= 5.0.0), + automake (>= 1:1.10), automake (<< 1:1.12), + cdbs, + quilt, + libtool, + libdbus-glib-1-dev (>= 0.75), + libglib2.0-dev (>= 2.18), + libgudev-1.0-dev, + xsltproc +Standards-Version: 3.8.3 +Vcs-Bzr: https://code.launchpad.net/~modemmanager/modemmanager/ubuntu + +Package: modemmanager +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: D-Bus service for managing modems + Provides a D-Bus interface to communicate with mobile broadband (GSM, CDMA, + UMTS, ...) cards. Implements a loadable plugin interface to add work-arounds + for non standard devices. Also provides patches to use networkmanager (and + the applet) with modem manager. + . + Git Repository: http://cgit.freedesktop.org/ModemManager/ModemManager/ + diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..77ac6d3 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,31 @@ + +I. Copyright + +Copyright (C) 2008 - 2009 Novell, Inc. +Copyright (C) 2009 Red Hat, Inc. +ModemManager code is Licensed under GPL version 2 (or any later version). +See: /usr/share/common-licenses/GPL-2 + +ModemManager is maintained at http://cgit.freedesktop.org/ModemManager/ModemManager/ +The git repository used to export from can be cloned by: +git://anongit.freedesktop.org/ModemManager/ModemManager + +Some files have an additional copyright holder: + ./plugins/mm-modem-mbm.h: Copyright (C) 2008 Ericsson AB + ./plugins/mm-modem-mbm.c: Copyright (C) 2008 Ericsson AB + ./plugins/mm-plugin-mbm.c: Copyright (C) 2008 Ericsson AB + ./plugins/mm-plugin-mbm.h: Copyright (C) 2008 Ericsson AB + ./doc-generator.xsl: Copyright (C) 2006, 2007 Collabora Limited + +Some files are governed under the more liberal LGPL-2.1 (or any later version) +that can be found in /usr/share/common-licenses/LGPL-2.1: + ./doc-generator.xsl: LGPL-2.1 (or any later version) + +II. Packaging Copyright + +Packaging is (C) 2009 Canonical Ltd. +and licensed under the GPL version 3 (or any later version). +See: /usr/share/common-licenses/GPL + +The url of the packaging bzr branch is documented in debian/control + diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..a722624 --- /dev/null +++ b/debian/rules @@ -0,0 +1,89 @@ +#!/usr/bin/make -f + +DEB_AUTO_UPDATE_LIBTOOL = pre +DEB_AUTO_UPDATE_AUTOHEADER = 2.50 +DEB_AUTO_UPDATE_AUTOCONF = 2.50 + +# use automake 1.10 ... or 1.11 +ifneq (,$(wildcard /usr/bin/aclocal-1.11)) +DEB_AUTO_UPDATE_ACLOCAL = 1.11 +DEB_AUTO_UPDATE_AUTOMAKE = 1.11 -a -c -f +else +DEB_AUTO_UPDATE_ACLOCAL = 1.10 +DEB_AUTO_UPDATE_AUTOMAKE = 1.10 -a -c -f +endif + +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +DEB_MAJOR_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 's/git.*//') + +DEB_DH_MAKESHLIBS_ARGS_modemmanager := -X/usr/lib/ModemManager/ -X/usr/lib/pppd/ + +DEB_INSTALL_DOCS_ALL := README AUTHORS docs/spec.html + +DEB_CONFIGURE_EXTRA_FLAGS += \ + --with-docs \ + $(NULL) + +GIT_URL := git://anongit.freedesktop.org/ModemManager/ModemManager +GIT_BRANCH := "master" +GIT_BRANCH_NAME := ModemManager + +ifneq (,$(LOCAL_BRANCH)) +LOCAL_REAL_BRANCH = $(realpath $(LOCAL_BRANCH)) +endif + +pre-build:: + # workaround cdbs that does not run aclocal if no aclocal.m4 file exists + touch aclocal.m4 + +GET_SOURCE = \ + set -e; \ + tmpdir=`mktemp -d -t`; \ + cd $$tmpdir; \ + echo "cloning upstream repository ..."; \ + git clone $(if $(LOCAL_BRANCH),$(call LOCAL_REAL_BRANCH)/$(GIT_BRANCH_NAME),$(GIT_URL)); \ + echo "getting specific upstream revision/tag: $(1)"; \ + cd `ls | head -n 1`; git checkout -b orig $(1); \ + commit_id=`git log -n1 --abbrev-commit | grep '^commit ' | sed -e 's/commit //'`; \ + raw=`date --utc --date="$$(git log --pretty=fuller -n1 --date=rfc | grep CommitDate: | sed -e 's/CommitDate:[^0-9]*//')" "+%Y%m%dt%H%M%S"`; \ + if echo $(1) | grep -c "orig" > /dev/null || echo $(DEB_VERSION) | grep -c "git" > /dev/null; \ + then \ + upstream_version=$(DEB_MAJOR_VERSION)git.$$raw.$$commit_id; \ + else \ + upstream_version=$(DEB_UPSTREAM_VERSION); \ + fi; \ + cd ..; tar --exclude=.git -czf $(CURDIR)/$(DEB_SOURCE_PACKAGE)_$$upstream_version.orig.tar.gz `ls | head -n 1`; \ + cd $(CURDIR); rm -rf $$tmpdir; + +binary-post-install/modemmanager:: + find $(CURDIR)/debian/modemmanager/ -name \*.a | xargs rm + find $(CURDIR)/debian/modemmanager/ -name \*.la | xargs rm + +get-current-source:: $(if $(LOCAL_BRANCH), update-local-branch) + set -e; if echo $(DEB_VERSION) | grep -c "git" > /dev/null; \ + then \ + git_version=`echo $(DEB_VERSION) | sed -e 's/^.*git\.*\([0-9t]*\)\.\(.*\)-.*$$/\2/g'`; \ + else \ + git_version=$(DEB_UPSTREAM_VERSION); \ + fi; \ + $(call GET_SOURCE, $$git_version, "current") + +get-orig-source:: $(if $(LOCAL_BRANCH), update-local-branch) + $(call GET_SOURCE, $(GIT_BRANCH), "orig") + +update-local-branch:: + @echo "updating local branch: $(LOCAL_BRANCH) ..." + @set -e; if ! test -d $(LOCAL_BRANCH); then mkdir -p $(LOCAL_BRANCH); fi + @set -e; if ! test -d $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); then git clone $(GIT_URL) $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); fi + @set -e; cd $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); git pull -f + @echo "updated local branch: $(LOCAL_BRANCH)." + +get-snapshot-info:: $(if $(LOCAL_BRANCH),update-local-branch) + @set -e; \ + git_version=`echo $(DEB_VERSION) | sed -e 's/^.*git\.*\([0-9t]*\)\.\(.*\)-.*$$/\2/g'`; \ + cd $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); \ + raw=`date --utc --date="$$(git log --pretty=fuller -n1 --date=rfc $$git_version | grep CommitDate: | sed -e 's/CommitDate:[^0-9]*//')" "+%Y-%m-%d %H:%M:%S (GMT)"`; \ + git log -n1 $$git_version --format="%n%s%n%n * upstream snapshot $$raw%n + %H%n"; -- cgit v1.2.3