13 files changed, 849 insertions, 0 deletions
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..a2761fc
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,93 @@
+
+------------------------------------------------------
+
+ README.source - for Debian/Ubuntu modemmanager
+ Author: Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>
+
+------------------------------------------------------
+
+Content:
+
+  I. Packaging overview
+  II. Upstream (orig.tar.gz)
+  III. Efficient Upstream orig.tar.gz production
+  IV. Patching
+
+------
+
+I. Packaging overview
+
+  + Obtaining latest packaging:
+    bzr branch lp:~modemmanager/modemmanager/ubuntu
+
+  + this gives you a debian/ only bzr branch
+
+  + the suggested way to build is using bzr-builddeb; for that
+    1. put the orig.tar.gz matching your debian/changelog in --orig-dir
+       of bzr-builddeb (default: ..)
+    2. run: bzr bd --dont-purge
+    3. this gives you a build tree and the results in --build-dir
+       and --result-dir
+
+  + if all you want to do is check the current package with full source, run:
+        ./debian/rules get-current-source
+        bzr bd-do
+
+
+II. Upstream (orig.tar.gz)
+
+The package provides means to easily grab the _current_ and the latest
+upstream snapshot of ModemManager.
+
+./debian/rules gets the pristine upstream snapshot for you then packs
+things up in a tarball orig.tar.gz.
+
+The nested tarball is packed using _gz_.
+
+Examples on how to get orig.tar.gz for snapshots:
+
+  + get latest upstream snapshot:
+    ./debian/rules get-orig-source
+
+  + get current upstream snapshot (by changelog):
+    ./debian/rules get-current-source
+
+
+III. Efficient Upstream orig.tar.gz production
+
+The packaging provides a feature to speed up the orig.tar.gz production by
+keeping a local mirror of the NetworkManager checkouts; this reduces the
+network overhead considerably and allows you to regularly create tarballs
+rather quickly. To do that, append LOCAL_BRANCH=/local/MM/checkout
+to your debian/rules invocation, e.g.
+
+  + produce latest upstream snapshot:
+    ./debian/rules get-orig-source LOCAL_BRANCH=~/ModemManager/
+
+  + produce current upstream snapshot (by changelog):
+    ./debian/rules get-current-source LOCAL_BRANCH=~/ModemManager/
+
+
+V. Patching
+
+We use quilt for the sake of efficiency to code and update patches.
+
+if you want to create a patch or write a patch, you can quickly get
+ready by first getting the orig.tar.gz, then using bzr-builddeb like
+so:
+
+ bzr bd-do
+
+Make sure your QUILT_PATCHES is set appropriately:
+
+ QUILT_PATCHES=debian/patches
+
+and start working on quilt patches as usual, e.g.
+
+ quilt push -a
+ quilt applied
+ quilt pop
+ quilt refresh
+ ...
+
+
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..9061232
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,425 @@
+modemmanager (0.5-1) unstable; urgency=low
+
+  * debian/rules: override dh_autoreconf in a nicer way so we don't have to
+    clean up manually afterwards.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 07 Aug 2011 01:47:27 +0200
+
+modemmanager (0.5-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release 0.5.
+    - gsm: send init command twice to make the N900 happy (LP: #765516)
+    - fix sierra modems' sleep mode command (LP: #459052, #738005)
+  * debian/patches/lp700316_usb_blacklist.patch: add extra devices to blacklist
+    of USB devices known to usually be serial dongles or other things MM should
+    not touch. (LP: #700316)
+  * debian/control, debian/rules: add a -dbg package for modemmanager, and
+    override dh_strip accordingly. (LP: #415394)
+  * debian/rules: fix .la/.a file removal to not fail if there is nothing to
+    remove.
+  * debian/modemmanager.install: install files to the modemmanager package
+    explicitly now that it's not the only binary package.
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Fri, 05 Aug 2011 12:46:32 -0400
+
+modemmanager (0.4.997-1ubuntu1) oneiric; urgency=low
+
+  * debian/modemmanager.upstart: add an upstart config file so ModemManager
+    gets started just before NM, and stopped along with it. (LP: #806082)
+  * debian/rules: install upstart file only for Ubuntu.
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Fri, 08 Jul 2011 15:32:13 -0400
+
+modemmanager (0.4.997-1) unstable; urgency=low
+
+  * debian/watch: Switch to .bz2 tarballs.
+  * Upload to unstable.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 16 Jun 2011 17:12:41 +0200
+
+modemmanager (0.4.997-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release 0.4.997.
+    + switch to git branch MM_05. 
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Thu, 09 Jun 2011 09:41:20 -0400
+
+modemmanager (0.4+git.20110429t103114.863dbca-1) unstable; urgency=low
+
+  [ Thomas Bechtold ]
+  * debian/rules, debian/control: migrate from CDBS to using dh
+
+  [ Mathieu Trudel-Lapierre ]
+  * upstream snapshot 2011-04-29 10:31:14 (GMT)
+    + 863dbca63132b820fca6c48a9c212f852752ee16
+  * debian/README.source: add instructions for using this packaging branch and
+    how to build from it; adapted from the NetworkManager package.
+  * debian/rules, debian/control: update control and rules to use dh-autoreconf
+    rather than just autoreconf.
+  * debian/control: bump Standards-Version to 3.9.2.
+  * debian/rules: re-add DEB_* variables which got dropped from the dh
+    migration, since we no longer include buildvars.mk.
+  * debian/patches/git-backport-e208c52-to-0c4b944.patch,
+    debian/patches/git-backport-verbose-cmee-errors-7d20acc.patch: dropped,
+    applied upstream.
+  * debian/control: bump debhelper Build-Depends to 8.
+  * debian/compat: bump to compat level 8, according to the debhelper update.
+  * debian/rules: cleanup extra files left behind by intltoolize.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 04 May 2011 13:17:33 +0200
+
+modemmanager (0.4+git.20110124t203624.00b6cce-2ubuntu1) natty; urgency=low
+
+  * debian/patches/git-backport-e208c52-to-0c4b944.patch: backport a number of
+    upstream bug fixes:
+    - gsm: fix for parsing malformed Gobi CREG response
+    - core: allow plugins to handle custom init responses (LP: #712580)
+    - policy: loosen permissions somewhat for reading device info (kde#266807)
+    - logging: use glong for secs and usecs
+    - cdma: ensure the ActivationStateChanged signal exists
+    - log: fix spacing so messages line up
+    - simtech: add port tags for SCT U300 (Element Mobile)
+    - core: allow platform devices without a VID/PID
+    - zte: fix handling of Icera simple connect process
+    - icera: fix username and password ordering for authentication
+  * debian/patches/0001-Use-type-glong-for-secs-and-usecs.patch: drop, included
+    in the above backports from upstream.
+  * debian/patches/git-backport-verbose-cmee-errors-7d20acc.patch: backport
+    patch to make sure error reporting is set to verbose when asking modems
+    about PIN status, so we get a useful message instead of a generic error.
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Sun, 10 Apr 2011 18:16:54 -0400
+
+modemmanager (0.4+git.20110124t203624.00b6cce-2) unstable; urgency=low
+
+  * debian/patches/0001-Use-type-glong-for-secs-and-usecs.patch
+    - GVariant defines tv_usec  as glong and suseconds_t is not guaranteed to
+      be of type long on sparc, resulting in a build failure.
+      So use type glong instead for sec and usecs.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 25 Feb 2011 11:16:05 +0100
+
+modemmanager (0.4+git.20110124t203624.00b6cce-1) unstable; urgency=low
+
+  * Upload to unstable.
+  * Fixes GTest build failures. (Closes: #614448)
+  * Switch to source format 3.0 (quilt)
+    - Add debian/source/format.
+    - Drop Build-Depends on quilt.
+    - Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk from debian/rules.
+  * Bump Standards-Version to 3.9.1. No further changes.
+  * Bump Build-Depends on libdbus-glib-1-dev to (>= 0.86).
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 25 Feb 2011 00:08:15 +0100
+
+modemmanager (0.4+git.20110124t203624.00b6cce-0ubuntu1) natty; urgency=low
+
+  * upstream snapshot 2011-01-24 20:36:24 (GMT)
+    + 00b6cce4df7d4acbf3e580a03c2f044e18589d2c
+    - rules: blacklist some unlikely USB serial dongles
+    - gsm: enable unsolicited codes on secondary ports too
+    - test: handle cancel and distinguish between initiate and respond
+    - gsm: wire up USSD Respond function
+    - api: add reply parameter to USSD Respond method
+    - linktop: add plugin for Linktop/Teracom LW273
+    - gsm: prefer AT+CIND signal quality for modems that support it (LP: #682282)
+    - huawei: don't spam syslog with tx/rx stats (LP: #673457, #662791)
+    - gsm: query signal strength with +CIND if modem does not support +CSQ
+    - gsm: add preliminary USSD support
+    - huawei: fix potential double-free on error
+    - core: prefer CDMA capabilities over GSM for dual-mode devices
+    - gsm: allow use of GSM 03.38 character set
+    - polkit: fix for polkit >= 0.97
+    - core: work around dbus-glib property access bug (CVE-2010-1172)
+  * debian/patches/qdl-blacklist.patch: add a blacklist of Gobi QDL devices so
+    that we don't break firmware loading by trying to initialize them before
+    the modem is really ready. (LP: #686418)
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Wed, 26 Jan 2011 21:03:12 -0500
+
+modemmanager (0.4+git.20100809t153145.be28089-0ubuntu1) maverick; urgency=low
+
+  * upstream snapshot 2010-08-09 15:31:45 (GMT)
+    + be28089dc4c1b07d9def45a3c763f432ae8322c4
+    - cdma: determine EVDO registration even when in 1X mode
+    - zte: add more port tags
+    - gsm: ensure invalid operator names don't get used (rh #597088)
+    - nokia: N900 appears to need a longer port delay (rh #583691)
+    - novatel: detect CDMA home/roaming status
+    - novatel: fix S720 signal quality reporting
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Wed, 11 Aug 2010 10:57:27 -0400
+
+modemmanager (0.4+git.20100624t180933.6e79d15-1) unstable; urgency=low
+
+  [ Michael Biebl ]
+  * New upstream release. (Closes: #585957)
+  * Drop debian/patches/01-termios.patch, merged upstream.
+  * debian/rules
+    - Drop aclocal workaround, no longer required.
+    - Add intltoolize call to pre-build.
+
+  [ Mathieu Trudel-Lapierre ]
+  * upstream snapshot 2010-06-24 18:09:33 (GMT)
+    + 6e79d153efc30fb2030536f7f795c19ad4a0661a
+  * Add myself to Uploaders.
+    - update debian/control
+
+  [ Michael Biebl ]
+  * Use watch file to track new upstream releases.
+    - Add debian/watch.
+  * Add Build-Depends on intltool.
+    - Update debian/control.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 27 Jun 2010 02:46:38 +0200
+
+modemmanager (0.3-2) unstable; urgency=low
+
+  [ Alexander Sack ]
+  * also bump debhelper build-depends to >= 7
+    - update debian/control
+  * recommend usb-modeswitch
+    - update debian/control
+  * fix lintian warning about empty quilt series file; add
+    a single line comment
+    - update debian/patches/series
+  * add Michael Biebl <biebl@debian.org> to Uploaders
+    - update debian/control
+  * use asac@ubuntu.com as maintainer as the mailing list
+    bounces bug mail (Closes: #566833)
+    - update debian/control
+
+  [ Michael Biebl ]
+  * Bump Standards-Version to 3.8.4. No further changes.
+    - update debian/control
+  * Fix FTBFS on alpha by using the POSIX.1 struct termios interface instead
+    of the obsolete struct termio ioctl interface. (Closes: #570661)
+    - add debian/patches/01-termios.patch
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 01 Mar 2010 18:07:54 +0100
+
+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 <asac@debian.org>  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 <CF><LF> 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 <espy@ubuntu.com> ]
+  * add get-snapshot-info target to rules
+    - update debian/rules
+
+  [ Alexander Sack <asac@ubuntu.com> ]
+  * 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 <espy@ubuntu.com>  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 <asac@ubuntu.com>  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 <asac@ubuntu.com>  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 <asac@ubuntu.com>  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 <asac@ubuntu.com>  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 <asac@ubuntu.com> ]
+  * 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 <asac@ubuntu.com>  Mon, 14 Sep 2009 11:38:05 +0200
+
+modemmanager (0.2.git.20090820t183237.cd75023-0ubuntu1) karmic; urgency=low
+
+  [ Tony Espy <espy@ubuntu.com> ]
+  * upstream snapshot 2009-08-20 18:32:37 (GMT)
+    + cd750230687177b45c2b8e507a0f0b22095aeb02
+      - includes gsm and mbm fixes
+
+  [ Alexander Sack <asac@ubuntu.com> ]
+  * 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 <espy@ubuntu.com>  Thu, 20 Aug 2009 15:06:51 -0400
+
+modemmanager (0.2.git.20090806t105932.354a4cb-0ubuntu3) karmic; urgency=low
+
+  [ Tony Espy <espy@ubuntu.com> ]
+  * update automake1.10 to automake in Build-Depends:, as automake
+    provides automake1.10 now
+    - update debian/control
+
+  [ Alexander Sack <asac@ubuntu.com> ]
+  * 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 <asac@ubuntu.com>  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 <espy@ubuntu.com>  Thu, 06 Aug 2009 17:13:08 +0100
+
+modemmanager (0.2.git.20090806t105932.354a4cb-0ubuntu1) karmic; urgency=low
+
+  [ Tony Espy <espy@ubuntu.com> ]
+  * 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 <asac@ubuntu.com> ]
+  * Initial release.
+  * 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 <espy@ubuntu.com>  Thu, 06 Aug 2009 12:50:45 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..ee13168
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,45 @@
+Source: modemmanager
+Section: net
+Priority: optional
+Maintainer: Alexander Sack <asac@ubuntu.com>
+Uploaders: Alexander Sack <asac@debian.org>, Michael Biebl <biebl@debian.org>, Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>
+Build-Depends: debhelper (>= 8),
+	dh-autoreconf,
+	automake (>= 1:1.10), automake (<< 1:1.12),
+	libtool,
+	libdbus-glib-1-dev (>= 0.86),
+	libglib2.0-dev (>= 2.18),
+	libgudev-1.0-dev,
+	xsltproc,
+	intltool
+Standards-Version: 3.9.2
+Vcs-Bzr: https://code.launchpad.net/~modemmanager/modemmanager/ubuntu
+
+Package: modemmanager
+Architecture: any
+Depends: ${shlibs:Depends},
+	${misc:Depends}
+Recommends: usb-modeswitch
+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/
+
+Package: modemmanager-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: modemmanager (= ${binary:Version}),
+	${misc:Depends}
+Description: D-Bus service for managing modems - debugging symbols
+ 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/
+ .
+ This package contains debugging symbols for 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/modemmanager.install b/debian/modemmanager.install
new file mode 100644
index 0000000..9c13e90
--- /dev/null
+++ b/debian/modemmanager.install
@@ -0,0 +1,3 @@
+debian/tmp/etc
+debian/tmp/lib
+debian/tmp/usr
diff --git a/debian/patches/lp700316_usb_blacklist.patch b/debian/patches/lp700316_usb_blacklist.patch
new file mode 100644
index 0000000..0deb577
--- /dev/null
+++ b/debian/patches/lp700316_usb_blacklist.patch
@@ -0,0 +1,19 @@
+Index: modemmanager-0.5/src/77-mm-usb-device-blacklist.rules
+===================================================================
+--- modemmanager-0.5.orig/src/77-mm-usb-device-blacklist.rules	2011-08-05 11:37:37.535618352 -0400
++++ modemmanager-0.5/src/77-mm-usb-device-blacklist.rules	2011-08-05 11:39:06.565883158 -0400
+@@ -68,5 +68,14 @@
+ # ATEN Intl UC-232A (Prolific)
+ ATTRS{idVendor}=="0557", ATTRS{idProduct}=="2008", ENV{ID_MM_DEVICE_IGNORE}="1"
+ 
++# Prolific Technology, Inc. PL2303 Serial Port
++ATTRS{idVendor}=="067b", ATTRS{idProduct}=="2303", ENV{ID_MM_DEVICE_IGNORE}="1"
++
++# Cygnal Integrated Products, Inc. CP210x
++ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="ea60", ENV{ID_MM_DEVICE_IGNORE}="1"
++
++# QinHeng Electronics HL-340
++ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="7523", ENV{ID_MM_DEVICE_IGNORE}="1"
++
+ LABEL="mm_usb_device_blacklist_end"
+ 
diff --git a/debian/patches/qdl-blacklist.patch b/debian/patches/qdl-blacklist.patch
new file mode 100644
index 0000000..6f64d82
--- /dev/null
+++ b/debian/patches/qdl-blacklist.patch
@@ -0,0 +1,111 @@
+From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
+Subject: Add blacklists for Gobi QDL devices (devices before firmware load)
+Bug-Ubuntu: http://launchpad.net/bugs/686418
+
+Blacklist a number of device IDs that happen to be "QDL" devices, only used
+as an initial state device to then load the firmware used by the actual modem
+devices.
+
+Because these devices do nothing but load firmware, we shouldn't try to
+initialize them in ModemManager, it just fails.
+
+Thanks to Jochen Gruse for the work to generate this list. See LP bug 686418
+for the details.
+
+Index: modemmanager-0.4+git.20110124t203624.00b6cce/src/77-mm-qdl-device-blacklist.rules
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ modemmanager-0.4+git.20110124t203624.00b6cce/src/77-mm-qdl-device-blacklist.rules	2011-01-26 20:18:45.000000000 -0500
+@@ -0,0 +1,80 @@
++# do not edit this file, it will be overwritten on update
++
++ACTION!="add|change", GOTO="mm_qdl_device_blacklist_end"
++
++# Acer Gobi QDL device
++ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9211", ENV{ID_MM_DEVICE_IGNORE}="1"
++
++# HP un2400 Gobi QDL Device
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="201d", ENV{ID_MM_DEVICE_IGNORE}="1"
++
++# Panasonic Gobi QDL device
++ATTRS{idVendor}=="04da", ATTRS{idProduct}=="250c", ENV{ID_MM_DEVICE_IGNORE}="1"
++
++# Dell Gobi QDL device
++ATTRS{idVendor}=="413c", ATTRS{idProduct}=="8171", ENV{ID_MM_DEVICE_IGNORE}="1"
++
++# Novatel Gobi QDL device
++ATTRS{idVendor}=="1410", ATTRS{idProduct}=="a008", ENV{ID_MM_DEVICE_IGNORE}="1"
++
++# Asus Gobi QDL device
++ATTRS{idVendor}=="0b05", ATTRS{idProduct}=="1774", ENV{ID_MM_DEVICE_IGNORE}="1"
++
++# ONDA Gobi QDL device
++ATTRS{idVendor}=="19d2", ATTRS{idProduct}=="fff2", ENV{ID_MM_DEVICE_IGNORE}="1"
++
++# OQO Gobi QDL device
++ATTRS{idVendor}=="1557", ATTRS{idProduct}=="0a80", ENV{ID_MM_DEVICE_IGNORE}="1"
++
++# Generic Gobi QDL device
++ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9008", ENV{ID_MM_DEVICE_IGNORE}="1"
++
++# Generic Gobi QDL device
++ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9201", ENV{ID_MM_DEVICE_IGNORE}="1"
++
++# Generic Gobi QDL device
++ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9221", ENV{ID_MM_DEVICE_IGNORE}="1"
++
++# Generic Gobi QDL device
++ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9231", ENV{ID_MM_DEVICE_IGNORE}="1"
++
++# Unknown Gobi QDL device
++ATTRS{idVendor}=="1f45", ATTRS{idProduct}=="0001", ENV{ID_MM_DEVICE_IGNORE}="1"
++
++# Dell Gobi 2000 QDL device (N0218, VU936)
++ATTRS{idVendor}=="413c", ATTRS{idProduct}=="8185", ENV{ID_MM_DEVICE_IGNORE}="1"
++
++# Generic Gobi 2000 QDL device
++ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9208", ENV{ID_MM_DEVICE_IGNORE}="1"
++
++# Sony Gobi 2000 QDL device (N0279, VU730)
++ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9224", ENV{ID_MM_DEVICE_IGNORE}="1"
++
++# Samsung Gobi 2000 QDL device (VL176)
++ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9244", ENV{ID_MM_DEVICE_IGNORE}="1"
++
++# HP Gobi 2000 QDL device (VP412)
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="241d", ENV{ID_MM_DEVICE_IGNORE}="1"
++
++# Acer Gobi 2000 QDL device (VP413)
++ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9214", ENV{ID_MM_DEVICE_IGNORE}="1"
++
++# Asus Gobi 2000 QDL device (VR305)
++ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9264", ENV{ID_MM_DEVICE_IGNORE}="1"
++
++# Top Global Gobi 2000 QDL device (VR306)
++ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9234", ENV{ID_MM_DEVICE_IGNORE}="1"
++
++# iRex Technologies Gobi 2000 QDL device (VR307)
++ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9274", ENV{ID_MM_DEVICE_IGNORE}="1"
++
++# Sierra Wireless Gobi 2000 QDL device (VT773)
++ATTRS{idVendor}=="1199", ATTRS{idProduct}=="9000", ENV{ID_MM_DEVICE_IGNORE}="1"
++
++# CMDTech Gobi 2000 QDL device (VU922)
++ATTRS{idVendor}=="16d8", ATTRS{idProduct}=="8001", ENV{ID_MM_DEVICE_IGNORE}="1"
++
++# Gobi 2000 QDL device
++ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9204", ENV{ID_MM_DEVICE_IGNORE}="1"
++
++LABEL="mm_qdl_device_blacklist_end"
+Index: modemmanager-0.4+git.20110124t203624.00b6cce/src/Makefile.am
+===================================================================
+--- modemmanager-0.4+git.20110124t203624.00b6cce.orig/src/Makefile.am	2011-01-26 20:19:16.259452829 -0500
++++ modemmanager-0.4+git.20110124t203624.00b6cce/src/Makefile.am	2011-01-26 20:19:59.871751441 -0500
+@@ -3,6 +3,7 @@
+ udevrulesdir = $(UDEV_BASE_DIR)/rules.d
+ udevrules_DATA = \
+ 	77-mm-usb-device-blacklist.rules \
++	77-mm-qdl-device-blacklist.rules \
+ 	77-mm-pcmcia-device-blacklist.rules \
+ 	77-mm-platform-serial-whitelist.rules \
+ 	80-mm-candidate.rules
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..808f502
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+# patches for modemmanager
+qdl-blacklist.patch
+lp700316_usb_blacklist.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..e906b96
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,101 @@
+#!/usr/bin/make -f
+
+#For debhelper debugging
+#export DH_VERBOSE=1
+
+#always exclude any data from version control systems
+DH_ALWAYS_EXCLUDE=.svn:.git:.bzr
+
+%:
+	dh $@ --with autoreconf
+
+autoreconf:
+	intltoolize -f
+	autoreconf -f -i
+
+override_dh_autoreconf:
+	dh_autoreconf debian/rules -- autoreconf
+
+override_dh_auto_clean:
+	rm -f $(CURDIR)/debian/modemmanager.upstart
+	dh_auto_clean
+
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--with-docs
+
+override_dh_makeshlibs:
+	dh_makeshlibs -X/usr/lib/ModemManager/ -X/usr/lib/pppd/
+
+override_dh_strip:
+	dh_strip --dbg-package=modemmanager-dbg
+
+override_dh_install:
+	if dpkg-vendor --is ubuntu; then \
+		cp $(CURDIR)/debian/ubuntu/modemmanager.upstart $(CURDIR)/debian; \
+	fi
+	find $(CURDIR)/debian/tmp/ -name \*.a -exec rm {} \;
+	find $(CURDIR)/debian/tmp/ -name \*.la -exec rm {} \;
+	dh_install
+
+override_dh_installdocs:
+	dh_installdocs -A README AUTHORS docs/spec.html
+
+DEB_SOURCE_PACKAGE := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f 2 -d ' ')
+DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+DEB_MAJOR_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 's/git.*//')
+
+GIT_URL := git://anongit.freedesktop.org/ModemManager/ModemManager
+GIT_BRANCH := "MM_05"
+GIT_BRANCH_NAME := ModemManager
+
+ifneq (,$(LOCAL_BRANCH))
+LOCAL_REAL_BRANCH = $(realpath $(LOCAL_BRANCH))
+endif
+
+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;
+
+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";
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/ubuntu/modemmanager.upstart b/debian/ubuntu/modemmanager.upstart
new file mode 100644
index 0000000..a7b1642
--- /dev/null
+++ b/debian/ubuntu/modemmanager.upstart
@@ -0,0 +1,14 @@
+# modemmanager - modem manager
+#
+# The Network Manager daemon manages the system's network connections,
+# automatically switching between the best available.
+
+description	"modem connection manager"
+
+start on starting network-manager
+stop on stopping network-manager
+
+expect fork
+respawn
+
+exec /usr/sbin/modem-manager &
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..b586c1a
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://ftp.gnome.org/pub/gnome/sources/ModemManager/([\d\.]+)/ModemManager-(.*)\.tar\.bz2