Ubuntu
networkmanagement package

Merge lp:~ari-tczew/ubuntu/saucy/networkmanagement/lp-1205545 into lp:ubuntu/saucy/networkmanagement

  1. Saucy (13.10)
  2. lp-1205545
  3. Merge into saucy
Proposed by Artur Rona
Status: Merged
Merge reported by: Artur Rona
Merged at revision: not available
Proposed branch: lp:~ari-tczew/ubuntu/saucy/networkmanagement/lp-1205545
Merge into: lp:ubuntu/saucy/networkmanagement
Diff against target: 180 lines (+49/-54)
6 files modified
debian/changelog (+37/-1)
debian/control (+4/-4)
debian/gbp.conf (+3/-0)
debian/patches/series (+1/-0)
debian/plasma-widget-networkmanagement.install (+3/-48)
debian/plasma-widget-networkmanagement.preinst (+1/-1)
To merge this branch: bzr merge lp:~ari-tczew/ubuntu/saucy/networkmanagement/lp-1205545
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+177297@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks. Uploaded.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-06-17 22:19:06 +0000
+++ debian/changelog 2013-07-28 22:12:27 +0000
@@ -1,3 +1,33 @@
1networkmanagement (0.9.0.9-1ubuntu1) saucy; urgency=low
2
3 [ Artur Rona ]
4 * Merge from Debian unstable. (LP: #1205545) Remaining changes:
5 - debian/control:
6 + Suggest instead of recommend network-manager plugins.
7 + Breaks/Replaces old kde-workspace-data for moved icon.
8 - debian/plasma-widget-networkmanagement.install:
9 + Add .desktop files for Modem Manager.
10 * Stop shipping unused headers. (LP: #1195498)
11
12 [ Felix Geyer ]
13 * debian/plasma-widget-networkmanagement.install:
14 - Add missing solid_modemmanager05.so.
15
16 -- Artur Rona <ari-tczew@tlen.pl> Sat, 27 Jul 2013 01:19:42 +0200
17
18networkmanagement (0.9.0.9-1) unstable; urgency=low
19
20 [ Felix Geyer ]
21 * Replace kdebase-workspace with kde-workspace in package dependencies.
22 * Add network-manager-openconnect to Suggests.
23 * Switch to debhelper compat level v9 which exports build flags.
24
25 [ Michael Biebl ]
26 * New upstream release.
27 * Bump minimum required version of network-manager to 0.9.8.
28
29 -- Michael Biebl <biebl@debian.org> Fri, 28 Jun 2013 22:44:59 +0200
30
1networkmanagement (0.9.0.9-0ubuntu1) saucy; urgency=low31networkmanagement (0.9.0.9-0ubuntu1) saucy; urgency=low
232
3 * New upstream release. 33 * New upstream release.
@@ -138,6 +168,13 @@
138168
139 -- Michael Biebl <biebl@debian.org> Sat, 12 May 2012 14:46:31 +0200169 -- Michael Biebl <biebl@debian.org> Sat, 12 May 2012 14:46:31 +0200
140170
171networkmanagement (0.9.0.1-1) unstable; urgency=low
172
173 * New upstream release.
174 * Add Build-Depends on libnm-glib-dev.
175
176 -- Michael Biebl <biebl@debian.org> Mon, 09 Apr 2012 11:38:15 +0200
177
141networkmanagement (0.9.0.1-0ubuntu2) precise-proposed; urgency=low178networkmanagement (0.9.0.1-0ubuntu2) precise-proposed; urgency=low
142179
143 * Rebuild for .pot generation180 * Rebuild for .pot generation
@@ -637,4 +674,3 @@
637 * Initial release. (Closes: #508438)674 * Initial release. (Closes: #508438)
638675
639 -- Modestas Vainius <modestas@vainius.eu> Wed, 28 Jan 2009 01:30:31 +0200676 -- Modestas Vainius <modestas@vainius.eu> Wed, 28 Jan 2009 01:30:31 +0200
640
641677
=== modified file 'debian/control'
--- debian/control 2013-06-17 22:19:06 +0000
+++ debian/control 2013-07-28 22:12:27 +0000
@@ -6,7 +6,7 @@
6Uploaders: Modestas Vainius <modax@debian.org>, Michael Biebl <biebl@debian.org>6Uploaders: Modestas Vainius <modax@debian.org>, Michael Biebl <biebl@debian.org>
7Build-Depends: debhelper (>= 9), cmake (>= 2.6.2), pkg-kde-tools (>= 0.5),7Build-Depends: debhelper (>= 9), cmake (>= 2.6.2), pkg-kde-tools (>= 0.5),
8 libqt4-dev (>= 4:4.6.0), kdelibs5-dev (>= 4:4.6.0), kde-workspace-dev (>= 4:4.6.0),8 libqt4-dev (>= 4:4.6.0), kdelibs5-dev (>= 4:4.6.0), kde-workspace-dev (>= 4:4.6.0),
9 network-manager-dev (>= 0.9.8), libnm-util-dev (>= 0.9.0), libnm-glib-dev (>= 0.9.0),9 network-manager-dev (>= 0.9.8), libnm-util-dev (>= 0.9.8), libnm-glib-dev (>= 0.9.8),
10 libopenconnect-dev (>= 4.04),10 libopenconnect-dev (>= 4.04),
11 mobile-broadband-provider-info11 mobile-broadband-provider-info
12Standards-Version: 3.9.412Standards-Version: 3.9.4
@@ -15,10 +15,10 @@
1515
16Package: plasma-widget-networkmanagement16Package: plasma-widget-networkmanagement
17Architecture: any17Architecture: any
18Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.9.0),18Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.9.8),
19 mobile-broadband-provider-info19 mobile-broadband-provider-info
20Suggests: kde-workspace-bin, network-manager-vpnc, network-manager-openvpn, 20Suggests: kde-workspace-bin, network-manager-openconnect, network-manager-vpnc,
21 network-manager-pptp, network-manager-openconnect21 network-manager-openvpn, network-manager-pptp
22Recommends: kwalletmanager22Recommends: kwalletmanager
23Replaces: knm-runtime, kde-workspace-data (<< 4:4.10.80)23Replaces: knm-runtime, kde-workspace-data (<< 4:4.10.80)
24Breaks: knm-runtime, kde-workspace-data (<< 4:4.10.80)24Breaks: knm-runtime, kde-workspace-data (<< 4:4.10.80)
2525
=== added file 'debian/gbp.conf'
--- debian/gbp.conf 1970-01-01 00:00:00 +0000
+++ debian/gbp.conf 2013-07-28 22:12:27 +0000
@@ -0,0 +1,3 @@
1[DEFAULT]
2pristine-tar = True
3debian-branch = master
04
=== added directory 'debian/patches'
=== added file 'debian/patches/series'
--- debian/patches/series 1970-01-01 00:00:00 +0000
+++ debian/patches/series 2013-07-28 22:12:27 +0000
@@ -0,0 +1,1 @@
1# patches for plasma-widget-networkmanagement
02
=== modified file 'debian/plasma-widget-networkmanagement.install'
--- debian/plasma-widget-networkmanagement.install 2013-06-17 22:19:06 +0000
+++ debian/plasma-widget-networkmanagement.install 2013-07-28 22:12:27 +0000
@@ -10,6 +10,7 @@
10usr/lib/kde4/networkmanagement_openconnectui.so10usr/lib/kde4/networkmanagement_openconnectui.so
11usr/lib/kde4/plasma_applet_networkmanagement.so11usr/lib/kde4/plasma_applet_networkmanagement.so
12usr/lib/kde4/plasma_engine_networkmanagement.so12usr/lib/kde4/plasma_engine_networkmanagement.so
13usr/lib/kde4/solid_modemmanager05.so
13usr/lib/kde4/solid_networkmanager09.so14usr/lib/kde4/solid_networkmanager09.so
14usr/lib/libknm_nm.so15usr/lib/libknm_nm.so
15usr/lib/libknmclient.so.*16usr/lib/libknmclient.so.*
@@ -34,54 +35,8 @@
34usr/share/kde4/services/networkmanagement_openconnectui.desktop35usr/share/kde4/services/networkmanagement_openconnectui.desktop
35usr/share/kde4/services/plasma-applet-networkmanagement.desktop36usr/share/kde4/services/plasma-applet-networkmanagement.desktop
36usr/share/kde4/services/plasma-engine-networkmanagement.desktop37usr/share/kde4/services/plasma-engine-networkmanagement.desktop
38usr/share/kde4/services/solidbackends/solid_modemmanager05.desktop
37usr/share/kde4/services/solidbackends/solid_networkmanager09.desktop39usr/share/kde4/services/solidbackends/solid_networkmanager09.desktop
38usr/share/kde4/servicetypes/networkmanagement_vpnuiplugin.desktop40usr/share/kde4/servicetypes/networkmanagement_vpnuiplugin.desktop
41usr/share/kde4/servicetypes/solidmodemmanagernm09.desktop
39usr/share/kde4/servicetypes/solidnetworkmanagernm09.desktop42usr/share/kde4/servicetypes/solidnetworkmanagernm09.desktop
40usr/share/kde4/services/solidbackends/solid_modemmanager05.desktop
41usr/share/kde4/servicetypes/solidmodemmanagernm09.desktop
42usr/include/solid/controlnm09/solid_control_export.h
43usr/include/solid/controlnm09/modemgsmcardinterface.h
44usr/include/solid/controlnm09/networkmodeminterface.h
45usr/include/solid/controlnm09/networkbtinterface.h
46usr/include/solid/controlnm09/networkserialinterface.h
47usr/include/solid/controlnm09/singletondefs.h
48usr/include/solid/controlnm09/networkipv4config.h
49usr/include/solid/controlnm09/modemmanager.h
50usr/include/solid/controlnm09/modemmanagerinterface.h
51usr/include/solid/controlnm09/modemgsmussdinterface.h
52usr/include/solid/controlnm09/modemgsmnetworkinterface.h
53usr/include/solid/controlnm09/modeminterface.h
54usr/include/solid/controlnm09/networking.h
55usr/include/solid/controlnm09/networkgsminterface.h
56usr/include/solid/controlnm09/networkipv4confignm09.h
57usr/include/solid/controlnm09/wirelessaccesspoint.h
58usr/include/solid/controlnm09/wirednetworkinterface.h
59usr/include/solid/controlnm09/networkcdmainterface.h
60usr/include/solid/controlnm09/networkmanager.h
61usr/include/solid/controlnm09/modemcdmainterface.h
62usr/include/solid/controlnm09/networkinterface.h
63usr/include/solid/controlnm09/modemgsmsmsinterface.h
64usr/include/solid/controlnm09/wirelessnetworkinterface.h
65usr/include/solid/controlnm09/modemgsmcontactsinterface.h
66usr/include/solid/controlnm09/modemgsmhsointerface.h
67usr/include/solid/controlnm09/modemlocationinterface.h
68usr/include/solid/controlnm09/ifaces/modemgsmcardinterface.h
69usr/include/solid/controlnm09/ifaces/networkmodeminterface.h
70usr/include/solid/controlnm09/ifaces/networkbtinterface.h
71usr/include/solid/controlnm09/ifaces/modemmanager.h
72usr/include/solid/controlnm09/ifaces/modemmanagerinterface.h
73usr/include/solid/controlnm09/ifaces/modemgsmussdinterface.h
74usr/include/solid/controlnm09/ifaces/modemgsmnetworkinterface.h
75usr/include/solid/controlnm09/ifaces/modeminterface.h
76usr/include/solid/controlnm09/ifaces/wirelessaccesspoint.h
77usr/include/solid/controlnm09/ifaces/wirednetworkinterface.h
78usr/include/solid/controlnm09/ifaces/networkmanager.h
79usr/include/solid/controlnm09/ifaces/modemcdmainterface.h
80usr/include/solid/controlnm09/ifaces/networkinterface.h
81usr/include/solid/controlnm09/ifaces/modemgsmsmsinterface.h
82usr/include/solid/controlnm09/ifaces/wirelessnetworkinterface.h
83usr/include/solid/controlnm09/ifaces/modemgsmcontactsinterface.h
84usr/include/solid/controlnm09/ifaces/modemgsmhsointerface.h
85usr/include/solid/controlnm09/ifaces/authentication.h
86usr/include/solid/controlnm09/ifaces/modemlocationinterface.h
87
8843
=== modified file 'debian/plasma-widget-networkmanagement.preinst'
--- debian/plasma-widget-networkmanagement.preinst 2013-05-16 22:48:59 +0000
+++ debian/plasma-widget-networkmanagement.preinst 2013-07-28 22:12:27 +0000
@@ -29,7 +29,7 @@
29 fi29 fi
30}30}
3131
32if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt-nl "0.9.0.8-3ubuntu1" ; then32if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt-nl "0.9.0.8-2" ; then
33 # The conffile was moved from knm-runtime to p-n-m during33 # The conffile was moved from knm-runtime to p-n-m during
34 # development of wheezy so we need some special handling of this case34 # development of wheezy so we need some special handling of this case
35 rm_conffile plasma-widget-networkmanagement "/etc/dbus-1/system.d/NetworkManager-kde4.conf"35 rm_conffile plasma-widget-networkmanagement "/etc/dbus-1/system.d/NetworkManager-kde4.conf"

Subscribers

People subscribed via source and target branches

to all changes: