diff -Nru connman-0.55/1.patch connman-0.55/1.patch --- connman-0.55/1.patch 1970-01-01 01:00:00.000000000 +0100 +++ connman-0.55/1.patch 2010-08-13 11:24:08.000000000 +0100 @@ -0,0 +1,39 @@ +=== modified file 'debian/connman.install' +--- debian/connman.install 2010-08-13 09:21:08 +0000 ++++ debian/connman.install 2010-08-13 09:59:00 +0000 +@@ -3,6 +3,5 @@ + debian/tmp/usr/lib/connman/plugins/*.so + debian/tmp/usr/lib/connman/scripts/dhclient.conf + debian/tmp/usr/lib/connman/scripts/dhclient-script +-scripts/connman etc/init.d/ + debian/source_connman.py /usr/share/apport/package-hooks/ + debian/connman-crashdb.conf /etc/apport/crashdb.conf.d/ + +=== added file 'debian/connman.upstart' +--- debian/connman.upstart 1970-01-01 00:00:00 +0000 ++++ debian/connman.upstart 2010-08-13 09:56:36 +0000 +@@ -0,0 +1,10 @@ ++description "Connection Manager" ++ ++start on (local-filesystems ++ and started dbus) ++stop on stopping dbus ++ ++expect fork ++respawn ++ ++exec connmand + +=== modified file 'debian/rules' +--- debian/rules 2010-08-06 10:23:30 +0000 ++++ debian/rules 2010-08-13 10:06:28 +0000 +@@ -28,7 +28,7 @@ + --enable-ofono \ + $(NULL) + +-DEB_DH_INSTALLINIT_ARGS := --onlyscripts -- start 28 2 3 4 5 . ++DEB_DH_INSTALLINIT_ARGS := + + DEB_DH_MAKESHLIBS_ARGS_ALL := -X/usr/lib/connman/ + + diff -Nru connman-0.55/.bzr/branch/branch.conf connman-0.55/.bzr/branch/branch.conf --- connman-0.55/.bzr/branch/branch.conf 1970-01-01 01:00:00.000000000 +0100 +++ connman-0.55/.bzr/branch/branch.conf 2010-08-12 11:30:54.000000000 +0100 @@ -0,0 +1 @@ +parent_location = bzr+ssh://bazaar.launchpad.net/~ubuntu-branches/ubuntu/maverick/connman/maverick/ diff -Nru connman-0.55/.bzr/branch/format connman-0.55/.bzr/branch/format --- connman-0.55/.bzr/branch/format 1970-01-01 01:00:00.000000000 +0100 +++ connman-0.55/.bzr/branch/format 2010-08-12 11:30:54.000000000 +0100 @@ -0,0 +1 @@ +Bazaar Branch Format 7 (needs bzr 1.6) diff -Nru connman-0.55/.bzr/branch/last-revision connman-0.55/.bzr/branch/last-revision --- connman-0.55/.bzr/branch/last-revision 1970-01-01 01:00:00.000000000 +0100 +++ connman-0.55/.bzr/branch/last-revision 2010-08-13 11:45:32.000000000 +0100 @@ -0,0 +1 @@ +20 kalle.valo@canonical.com-20100813104529-51hl7llw4b4w2op3 diff -Nru connman-0.55/.bzr/branch/tags connman-0.55/.bzr/branch/tags --- connman-0.55/.bzr/branch/tags 1970-01-01 01:00:00.000000000 +0100 +++ connman-0.55/.bzr/branch/tags 2010-08-12 11:30:54.000000000 +0100 @@ -0,0 +1 @@ +d32:0.10+git20090203t223225-0ubuntu255:james.westby@ubuntu.com-20090217204125-rw42sbot3zcfvd5w32:0.10+git20090203t223225-0ubuntu355:james.westby@ubuntu.com-20090220172228-u1cf28w74w2s3uz929:0.15+git.1.864cd602c-0ubuntu155:james.westby@ubuntu.com-20090514184717-enio41hwshnvinr813:0.17-0ubuntu155:james.westby@ubuntu.com-20090525121333-mi0u6a3gt5u63hir13:0.19-0ubuntu155:james.westby@ubuntu.com-20090525121832-6dcah4fw7s58qigo29:0.23+git.1.e08a09987-0ubuntu155:james.westby@ubuntu.com-20090714212302-sz4u6cwhg93izsw334:0.30+git.1.5b69740e1+dfsg-0ubuntu155:james.westby@ubuntu.com-20090722103721-5ruh91k7j0n7kjiz27:0.30+git.1.5b69740e1+dfsg-155:james.westby@ubuntu.com-20090722104155-d9tue3xwfmcb7y7218:0.42+dfsg-0ubuntu155:james.westby@ubuntu.com-20091014235904-xbulmde9bfcx0wuk11:0.42+dfsg-155:james.westby@ubuntu.com-20091031135948-7wyhelutpr4q9y6e18:0.45+dfsg-0ubuntu155:james.westby@ubuntu.com-20100113063231-aiz81a4j5318f3ri11:0.48+dfsg-155:james.westby@ubuntu.com-20100203225432-x6rsmb87oay5nsc211:0.48+dfsg-255:james.westby@ubuntu.com-20100212100803-s8iaj8g1dmgwm2uz18:0.52+dfsg-0ubuntu155:james.westby@ubuntu.com-20100520153524-pnl48c2qpz37z6yx18:0.53+dfsg-0ubuntu155:james.westby@ubuntu.com-20100526105504-dpqt10amt6x1h4wi18:0.54+dfsg-0ubuntu155:james.westby@ubuntu.com-20100628175205-oqacf9k6oljy29us13:0.55-0ubuntu155:james.westby@ubuntu.com-20100804172228-i57dpa2s4sv0c7qs13:0.55-0ubuntu255:james.westby@ubuntu.com-20100806102330-1wib5dpoqkf7futg32:upstream-0.10+git20090203t22322555:james.westby@ubuntu.com-20090217204125-ky954zacfel8j9vs29:upstream-0.15+git.1.864cd602c55:james.westby@ubuntu.com-20090514184717-7llt2duafgd0qq6313:upstream-0.1755:james.westby@ubuntu.com-20090525121333-e4b22g9argyoyeoh13:upstream-0.1955:james.westby@ubuntu.com-20090525121832-amwrh592q04er20e29:upstream-0.23+git.1.e08a0998755:james.westby@ubuntu.com-20090714212302-cdbeia860mf0v49i34:upstream-0.30+git.1.5b69740e1+dfsg55:james.westby@ubuntu.com-20090722103721-zm4qllu68c0ohiyi18:upstream-0.42+dfsg55:james.westby@ubuntu.com-20091014235904-u49tnfczihole8ry18:upstream-0.45+dfsg55:james.westby@ubuntu.com-20100113063231-kfmiad725u66580u18:upstream-0.48+dfsg55:james.westby@ubuntu.com-20100212100803-p4h2sll33m2h4d1k18:upstream-0.52+dfsg55:james.westby@ubuntu.com-20100520153524-2moab14y4eamb8jt18:upstream-0.53+dfsg55:james.westby@ubuntu.com-20100526105504-f111qwtuws5sczp218:upstream-0.54+dfsg55:james.westby@ubuntu.com-20100628175205-83v0zjz466td30by13:upstream-0.5555:james.westby@ubuntu.com-20100804172228-xukwj41venuki2vze \ No newline at end of file diff -Nru connman-0.55/.bzr/branch-format connman-0.55/.bzr/branch-format --- connman-0.55/.bzr/branch-format 1970-01-01 01:00:00.000000000 +0100 +++ connman-0.55/.bzr/branch-format 2010-08-12 11:30:49.000000000 +0100 @@ -0,0 +1 @@ +Bazaar-NG meta directory, format 1 diff -Nru connman-0.55/.bzr/checkout/conflicts connman-0.55/.bzr/checkout/conflicts --- connman-0.55/.bzr/checkout/conflicts 1970-01-01 01:00:00.000000000 +0100 +++ connman-0.55/.bzr/checkout/conflicts 2010-08-13 10:07:54.000000000 +0100 @@ -0,0 +1 @@ +BZR conflict list format 1 Binary files /tmp/UeQCCBo52h/connman-0.55/.bzr/checkout/dirstate and /tmp/zIMM9Dlct1/connman-0.55/.bzr/checkout/dirstate differ diff -Nru connman-0.55/.bzr/checkout/format connman-0.55/.bzr/checkout/format --- connman-0.55/.bzr/checkout/format 1970-01-01 01:00:00.000000000 +0100 +++ connman-0.55/.bzr/checkout/format 2010-08-12 11:30:54.000000000 +0100 @@ -0,0 +1 @@ +Bazaar Working Tree Format 6 (bzr 1.14) diff -Nru connman-0.55/.bzr/checkout/merge-hashes connman-0.55/.bzr/checkout/merge-hashes --- connman-0.55/.bzr/checkout/merge-hashes 1970-01-01 01:00:00.000000000 +0100 +++ connman-0.55/.bzr/checkout/merge-hashes 2010-08-13 10:07:54.000000000 +0100 @@ -0,0 +1 @@ +BZR merge-modified list format 1 diff -Nru connman-0.55/.bzr/README connman-0.55/.bzr/README --- connman-0.55/.bzr/README 1970-01-01 01:00:00.000000000 +0100 +++ connman-0.55/.bzr/README 2010-08-12 11:30:49.000000000 +0100 @@ -0,0 +1,3 @@ +This is a Bazaar control directory. +Do not change any files in this directory. +See http://bazaar-vcs.org/ for more information about Bazaar. diff -Nru connman-0.55/.bzr/repository/format connman-0.55/.bzr/repository/format --- connman-0.55/.bzr/repository/format 1970-01-01 01:00:00.000000000 +0100 +++ connman-0.55/.bzr/repository/format 2010-08-12 11:30:49.000000000 +0100 @@ -0,0 +1 @@ +Bazaar repository format 2a (needs bzr 1.16 or later) Binary files /tmp/UeQCCBo52h/connman-0.55/.bzr/repository/indices/9ca2cb49ebf34f4c3589e7b2ba3d3a47.cix and /tmp/zIMM9Dlct1/connman-0.55/.bzr/repository/indices/9ca2cb49ebf34f4c3589e7b2ba3d3a47.cix differ Binary files /tmp/UeQCCBo52h/connman-0.55/.bzr/repository/indices/9ca2cb49ebf34f4c3589e7b2ba3d3a47.iix and /tmp/zIMM9Dlct1/connman-0.55/.bzr/repository/indices/9ca2cb49ebf34f4c3589e7b2ba3d3a47.iix differ Binary files /tmp/UeQCCBo52h/connman-0.55/.bzr/repository/indices/9ca2cb49ebf34f4c3589e7b2ba3d3a47.rix and /tmp/zIMM9Dlct1/connman-0.55/.bzr/repository/indices/9ca2cb49ebf34f4c3589e7b2ba3d3a47.rix differ diff -Nru connman-0.55/.bzr/repository/indices/9ca2cb49ebf34f4c3589e7b2ba3d3a47.six connman-0.55/.bzr/repository/indices/9ca2cb49ebf34f4c3589e7b2ba3d3a47.six --- connman-0.55/.bzr/repository/indices/9ca2cb49ebf34f4c3589e7b2ba3d3a47.six 1970-01-01 01:00:00.000000000 +0100 +++ connman-0.55/.bzr/repository/indices/9ca2cb49ebf34f4c3589e7b2ba3d3a47.six 2010-08-13 10:21:17.000000000 +0100 @@ -0,0 +1,5 @@ +B+Tree Graph Index 2 +node_ref_lists=0 +key_elements=1 +len=0 +row_lengths= Binary files /tmp/UeQCCBo52h/connman-0.55/.bzr/repository/indices/9ca2cb49ebf34f4c3589e7b2ba3d3a47.tix and /tmp/zIMM9Dlct1/connman-0.55/.bzr/repository/indices/9ca2cb49ebf34f4c3589e7b2ba3d3a47.tix differ Binary files /tmp/UeQCCBo52h/connman-0.55/.bzr/repository/indices/bb16755862761d00ddd8cd7c63378fc8.cix and /tmp/zIMM9Dlct1/connman-0.55/.bzr/repository/indices/bb16755862761d00ddd8cd7c63378fc8.cix differ Binary files /tmp/UeQCCBo52h/connman-0.55/.bzr/repository/indices/bb16755862761d00ddd8cd7c63378fc8.iix and /tmp/zIMM9Dlct1/connman-0.55/.bzr/repository/indices/bb16755862761d00ddd8cd7c63378fc8.iix differ Binary files /tmp/UeQCCBo52h/connman-0.55/.bzr/repository/indices/bb16755862761d00ddd8cd7c63378fc8.rix and /tmp/zIMM9Dlct1/connman-0.55/.bzr/repository/indices/bb16755862761d00ddd8cd7c63378fc8.rix differ diff -Nru connman-0.55/.bzr/repository/indices/bb16755862761d00ddd8cd7c63378fc8.six connman-0.55/.bzr/repository/indices/bb16755862761d00ddd8cd7c63378fc8.six --- connman-0.55/.bzr/repository/indices/bb16755862761d00ddd8cd7c63378fc8.six 1970-01-01 01:00:00.000000000 +0100 +++ connman-0.55/.bzr/repository/indices/bb16755862761d00ddd8cd7c63378fc8.six 2010-08-12 11:30:54.000000000 +0100 @@ -0,0 +1,5 @@ +B+Tree Graph Index 2 +node_ref_lists=0 +key_elements=1 +len=0 +row_lengths= Binary files /tmp/UeQCCBo52h/connman-0.55/.bzr/repository/indices/bb16755862761d00ddd8cd7c63378fc8.tix and /tmp/zIMM9Dlct1/connman-0.55/.bzr/repository/indices/bb16755862761d00ddd8cd7c63378fc8.tix differ diff -Nru connman-0.55/.bzr/repository/indices/c32e6da633acf4ccb6cceb664d24a00c.cix connman-0.55/.bzr/repository/indices/c32e6da633acf4ccb6cceb664d24a00c.cix --- connman-0.55/.bzr/repository/indices/c32e6da633acf4ccb6cceb664d24a00c.cix 1970-01-01 01:00:00.000000000 +0100 +++ connman-0.55/.bzr/repository/indices/c32e6da633acf4ccb6cceb664d24a00c.cix 2010-08-12 11:51:13.000000000 +0100 @@ -0,0 +1,6 @@ +B+Tree Graph Index 2 +node_ref_lists=0 +key_elements=1 +len=1 +row_lengths=1 +x 0 ԙ"#QƲbQP A߽ܽkytH .& MNB F7/EDf#E=S \ No newline at end of file Binary files /tmp/UeQCCBo52h/connman-0.55/.bzr/repository/indices/c32e6da633acf4ccb6cceb664d24a00c.iix and /tmp/zIMM9Dlct1/connman-0.55/.bzr/repository/indices/c32e6da633acf4ccb6cceb664d24a00c.iix differ Binary files /tmp/UeQCCBo52h/connman-0.55/.bzr/repository/indices/c32e6da633acf4ccb6cceb664d24a00c.rix and /tmp/zIMM9Dlct1/connman-0.55/.bzr/repository/indices/c32e6da633acf4ccb6cceb664d24a00c.rix differ diff -Nru connman-0.55/.bzr/repository/indices/c32e6da633acf4ccb6cceb664d24a00c.six connman-0.55/.bzr/repository/indices/c32e6da633acf4ccb6cceb664d24a00c.six --- connman-0.55/.bzr/repository/indices/c32e6da633acf4ccb6cceb664d24a00c.six 1970-01-01 01:00:00.000000000 +0100 +++ connman-0.55/.bzr/repository/indices/c32e6da633acf4ccb6cceb664d24a00c.six 2010-08-12 11:51:13.000000000 +0100 @@ -0,0 +1,5 @@ +B+Tree Graph Index 2 +node_ref_lists=0 +key_elements=1 +len=0 +row_lengths= Binary files /tmp/UeQCCBo52h/connman-0.55/.bzr/repository/indices/c32e6da633acf4ccb6cceb664d24a00c.tix and /tmp/zIMM9Dlct1/connman-0.55/.bzr/repository/indices/c32e6da633acf4ccb6cceb664d24a00c.tix differ Binary files /tmp/UeQCCBo52h/connman-0.55/.bzr/repository/indices/e6c58200708f4770e500a2f05dd4f84f.cix and /tmp/zIMM9Dlct1/connman-0.55/.bzr/repository/indices/e6c58200708f4770e500a2f05dd4f84f.cix differ diff -Nru connman-0.55/.bzr/repository/indices/e6c58200708f4770e500a2f05dd4f84f.iix connman-0.55/.bzr/repository/indices/e6c58200708f4770e500a2f05dd4f84f.iix --- connman-0.55/.bzr/repository/indices/e6c58200708f4770e500a2f05dd4f84f.iix 1970-01-01 01:00:00.000000000 +0100 +++ connman-0.55/.bzr/repository/indices/e6c58200708f4770e500a2f05dd4f84f.iix 2010-08-13 11:45:32.000000000 +0100 @@ -0,0 +1,7 @@ +B+Tree Graph Index 2 +node_ref_lists=1 +key_elements=1 +len=1 +row_lengths=1 +x 0 PLCbҠVvww7Tk[^Em(d +2ѦC@(E9W(Iv^'Q616杷)T@#C"p*ƍ;<1`(&t(GB8tX ɦR }*PJ ]>[)FǮg3Aj Y{^cXտG>x[XV@`@p;:4a-&ęf';B \ No newline at end of file Binary files /tmp/UeQCCBo52h/connman-0.55/.bzr/repository/pack-names and /tmp/zIMM9Dlct1/connman-0.55/.bzr/repository/pack-names differ Binary files /tmp/UeQCCBo52h/connman-0.55/.bzr/repository/packs/9ca2cb49ebf34f4c3589e7b2ba3d3a47.pack and /tmp/zIMM9Dlct1/connman-0.55/.bzr/repository/packs/9ca2cb49ebf34f4c3589e7b2ba3d3a47.pack differ Binary files /tmp/UeQCCBo52h/connman-0.55/.bzr/repository/packs/bb16755862761d00ddd8cd7c63378fc8.pack and /tmp/zIMM9Dlct1/connman-0.55/.bzr/repository/packs/bb16755862761d00ddd8cd7c63378fc8.pack differ Binary files /tmp/UeQCCBo52h/connman-0.55/.bzr/repository/packs/c32e6da633acf4ccb6cceb664d24a00c.pack and /tmp/zIMM9Dlct1/connman-0.55/.bzr/repository/packs/c32e6da633acf4ccb6cceb664d24a00c.pack differ Binary files /tmp/UeQCCBo52h/connman-0.55/.bzr/repository/packs/e6c58200708f4770e500a2f05dd4f84f.pack and /tmp/zIMM9Dlct1/connman-0.55/.bzr/repository/packs/e6c58200708f4770e500a2f05dd4f84f.pack differ diff -Nru connman-0.55/debian/changelog connman-0.55/debian/changelog --- connman-0.55/debian/changelog 2010-08-13 12:36:38.000000000 +0100 +++ connman-0.55/debian/changelog 2010-08-13 11:44:38.000000000 +0100 @@ -1,3 +1,11 @@ +connman (0.55-0ubuntu2~ind1) maverick; urgency=low + + * Add connman-dbg package. + * Add apport support. + * Use upstart. + + -- Kalle Valo Fri, 13 Aug 2010 13:44:38 +0300 + connman (0.55-0ubuntu2) maverick; urgency=low * Fix DEB_DH_INSTALLINIT_ARGS arguments. Thanks to Kalle Valo for diff -Nru connman-0.55/debian/connman-crashdb.conf connman-0.55/debian/connman-crashdb.conf --- connman-0.55/debian/connman-crashdb.conf 1970-01-01 01:00:00.000000000 +0100 +++ connman-0.55/debian/connman-crashdb.conf 2010-08-13 10:08:21.000000000 +0100 @@ -0,0 +1,5 @@ +connman = { + 'impl' : 'launchpad', + 'project' : 'connman', + 'bug_pattern_base' : None, + } diff -Nru connman-0.55/debian/connman.install connman-0.55/debian/connman.install --- connman-0.55/debian/connman.install 2010-08-13 12:36:38.000000000 +0100 +++ connman-0.55/debian/connman.install 2010-08-13 10:59:00.000000000 +0100 @@ -3,6 +3,5 @@ debian/tmp/usr/lib/connman/plugins/*.so debian/tmp/usr/lib/connman/scripts/dhclient.conf debian/tmp/usr/lib/connman/scripts/dhclient-script -scripts/connman etc/init.d/ - - +debian/source_connman.py /usr/share/apport/package-hooks/ +debian/connman-crashdb.conf /etc/apport/crashdb.conf.d/ diff -Nru connman-0.55/debian/connman.upstart connman-0.55/debian/connman.upstart --- connman-0.55/debian/connman.upstart 1970-01-01 01:00:00.000000000 +0100 +++ connman-0.55/debian/connman.upstart 2010-08-13 11:41:00.000000000 +0100 @@ -0,0 +1,15 @@ +description "Connection Manager" + +start on (local-filesystems + and started dbus) +stop on stopping dbus + +expect fork +respawn + +script + if [ -f /etc/default/connman ]; then + . /etc/default/connman + fi + exec connmand $DAEMON_OPTS +end script diff -Nru connman-0.55/debian/control connman-0.55/debian/control --- connman-0.55/debian/control 2010-08-13 12:36:38.000000000 +0100 +++ connman-0.55/debian/control 2010-08-12 11:35:07.000000000 +0100 @@ -53,3 +53,20 @@ This package contains headers, pkg-config support mainly useful for developing connman plugins. +Package: connman-dbg +Section: debug +Priority: extra +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, connman (= ${binary:Version}) +Description: Intel Connection Manager daemon (debugging files) + The Linux Connection Manager project provides a daemon for managing + Internet connections within embedded devices running the Linux + operating system. The Connection Manager is designed to be slim and to + use as few resources as possible, so it can be easily integrated in + other Moblin-based embedded systems. It is fully modular system that + can be extended through plug-ins, to support all kinds of wired or + wireless technologies. Also, configuration methods like DHCP and + domain name resolving are implemented using plug-ins. The plug-in + approach allows for easy adaption and modification for various use cases. + . + This package contains the detached debugging symbols for the daemon. diff -Nru connman-0.55/debian/rules connman-0.55/debian/rules --- connman-0.55/debian/rules 2010-08-13 12:36:38.000000000 +0100 +++ connman-0.55/debian/rules 2010-08-13 11:06:28.000000000 +0100 @@ -28,7 +28,7 @@ --enable-ofono \ $(NULL) -DEB_DH_INSTALLINIT_ARGS := --onlyscripts -- start 28 2 3 4 5 . +DEB_DH_INSTALLINIT_ARGS := DEB_DH_MAKESHLIBS_ARGS_ALL := -X/usr/lib/connman/ diff -Nru connman-0.55/debian/source_connman.py connman-0.55/debian/source_connman.py --- connman-0.55/debian/source_connman.py 1970-01-01 01:00:00.000000000 +0100 +++ connman-0.55/debian/source_connman.py 2010-08-13 10:08:41.000000000 +0100 @@ -0,0 +1,29 @@ +'''Apport package hook for ConnMan + +(c) 2010 Canonical Ltd. +Contributors: +Kalle Valo + +This program is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2 of the License, or (at your +option) any later version. See http://www.gnu.org/copyleft/gpl.html for +the full text of the license. +''' + +import apport.hookutils + +def add_info(report, ui): + apport.hookutils.attach_network(report) + apport.hookutils.attach_wifi(report) + apport.hookutils.attach_hardware(report) + if not apport.packaging.is_distro_package(report['Package'].split()[0]): + report['ThirdParty'] = 'True' + report['CrashDB'] = 'connman' + +if __name__ == '__main__': + report = {} + report['CrashDB'] = 'ubuntu' + add_info(report, None) + for key in report: + print '%s: %s' % (key, report[key].split('\n', 1)[0])