From 109a7976fe0363e22681d919258b3d9ce4b3bfb3 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Tue, 10 Jan 2006 15:31:05 +0000 Subject: first import of dhcbdb and networkmanager git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@440 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.postinst | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 debian/network-manager.postinst (limited to 'debian/network-manager.postinst') diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst new file mode 100644 index 00000000..302e4bf7 --- /dev/null +++ b/debian/network-manager.postinst @@ -0,0 +1,19 @@ +#!/bin/sh +set -e + +case "$1" in + configure) + if [ -x /etc/dbus-1/event.d/zz99NetworkManager ]; then + mv /etc/dbus-1/event.d/zz99NetworkManager /etc/dbus-1/event.d/zz99NetworkManager.disabled + fi + + if [ -x /usr/bin/dbus-send ]; then + /usr/bin/dbus-send --system --type=method_call \ + --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig + /etc/dbus-1/event.d/25NetworkManager restart + /etc/dbus-1/event.d/25NetworkManagerDispatcher restart + fi + ;; +esac + +#DEBHELPER# -- cgit 1.3.0-6-gf8a5 From 7f2046277c083ddfc70394044c8b5ba049beabed Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Thu, 26 Jan 2006 18:49:59 +0000 Subject: git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@521 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.postinst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'debian/network-manager.postinst') diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index 302e4bf7..849dec1c 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -6,12 +6,11 @@ case "$1" in if [ -x /etc/dbus-1/event.d/zz99NetworkManager ]; then mv /etc/dbus-1/event.d/zz99NetworkManager /etc/dbus-1/event.d/zz99NetworkManager.disabled fi - - if [ -x /usr/bin/dbus-send ]; then + if [ -x /usr/bin/dbus-send ]; then /usr/bin/dbus-send --system --type=method_call \ --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig /etc/dbus-1/event.d/25NetworkManager restart - /etc/dbus-1/event.d/25NetworkManagerDispatcher restart + /etc/dbus-1/event.d/26NetworkManagerDispatcher restart fi ;; esac -- cgit 1.3.0-6-gf8a5 From 79ca1e2e63391e2a9657167f5d66517b06e8de3f Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Sat, 4 Mar 2006 21:48:28 +0000 Subject: improved .postinst file git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@722 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.postinst | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'debian/network-manager.postinst') diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index 849dec1c..5b2fb40f 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -3,16 +3,11 @@ set -e case "$1" in configure) - if [ -x /etc/dbus-1/event.d/zz99NetworkManager ]; then - mv /etc/dbus-1/event.d/zz99NetworkManager /etc/dbus-1/event.d/zz99NetworkManager.disabled - fi - if [ -x /usr/bin/dbus-send ]; then - /usr/bin/dbus-send --system --type=method_call \ - --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig - /etc/dbus-1/event.d/25NetworkManager restart - /etc/dbus-1/event.d/26NetworkManagerDispatcher restart - fi - ;; + if [ -x "/etc/init.d/dbus" ]; then + invoke-rc.d dbus force-reload || true + fi + + ;; esac #DEBHELPER# -- cgit 1.3.0-6-gf8a5 From b751f5821a594667e333c0d984e985625e671676 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Mon, 6 Mar 2006 12:43:20 +0000 Subject: NM and NMDispatcher must be restarted in .postinst git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@737 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.postinst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'debian/network-manager.postinst') diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index 5b2fb40f..c24034b5 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -6,7 +6,10 @@ case "$1" in if [ -x "/etc/init.d/dbus" ]; then invoke-rc.d dbus force-reload || true fi - + + /etc/dbus-1/event.d/25NetworkManager restart + /etc/dbus-1/event.d/26NetworkManagerDispatcher restart + ;; esac -- cgit 1.3.0-6-gf8a5 From 912f26326946676b99051279bfdcc5e9a48bcad8 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Thu, 9 Mar 2006 16:53:01 +0000 Subject: - Added NetworkManagerDebian.patch which introduce supports for resolvconf * added a Dep on wpasupplicant as it's necessary for all encrypted connections. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@742 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.postinst | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'debian/network-manager.postinst') diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index c24034b5..ac127e03 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -7,9 +7,13 @@ case "$1" in invoke-rc.d dbus force-reload || true fi - /etc/dbus-1/event.d/25NetworkManager restart - /etc/dbus-1/event.d/26NetworkManagerDispatcher restart - + if [ -x "/etc/dbus-1/event.d/25NetworkManager" ]; then + /etc/dbus-1/event.d/25NetworkManager restart + fi + + if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher"]; then + /etc/dbus-1/event.d/26NetworkManagerDispatcher restart + fi ;; esac -- cgit 1.3.0-6-gf8a5 From 96f4bb63e1aea9d7428205b05a0cd007ce01ca79 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 14 Mar 2006 16:50:45 +0000 Subject: * New upstream release. * Added myself to uploaders. * Reformatted changelog, always indent - bullet points. * Added dependency on dbus (>= 0.60) * Fixed a small typo in network-manager.postinst * Downgraded dependency of wpasupplicant to 0.4.8. Given that the wpasupplicant includes my patch, this should be enough. If not, we will raise this dependency to 0.5.1 again. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@745 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.postinst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/network-manager.postinst') diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index ac127e03..9460b596 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -11,10 +11,10 @@ case "$1" in /etc/dbus-1/event.d/25NetworkManager restart fi - if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher"]; then + if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then /etc/dbus-1/event.d/26NetworkManagerDispatcher restart fi - ;; + ;; esac #DEBHELPER# -- cgit 1.3.0-6-gf8a5 From 0cdf500bc3cc1bf5f193c49f1804cdbfc24bd42e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Oct 2006 12:40:46 +0000 Subject: * Create group netdev in postinst and add a Depends on adduser. * Cleanup indentation. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1097 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.postinst | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) (limited to 'debian/network-manager.postinst') diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index 9460b596..1e73dfa2 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -1,20 +1,27 @@ #!/bin/sh + set -e case "$1" in - configure) - if [ -x "/etc/init.d/dbus" ]; then - invoke-rc.d dbus force-reload || true - fi + configure) + if ! getent group netdev > /dev/null; then + addgroup --quiet --system netdev + fi + + if [ -x "/etc/init.d/dbus" ]; then + invoke-rc.d dbus force-reload || true + fi - if [ -x "/etc/dbus-1/event.d/25NetworkManager" ]; then - /etc/dbus-1/event.d/25NetworkManager restart - fi + if [ -x "/etc/dbus-1/event.d/25NetworkManager" ]; then + /etc/dbus-1/event.d/25NetworkManager restart + fi - if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then - /etc/dbus-1/event.d/26NetworkManagerDispatcher restart - fi - ;; + if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then + /etc/dbus-1/event.d/26NetworkManagerDispatcher restart + fi + ;; esac #DEBHELPER# + +exit 0 -- cgit 1.3.0-6-gf8a5 From 4310bb5e2f9d9e56a0c1e544adf87d7c91d74c76 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Apr 2007 21:00:59 +0000 Subject: Switch to regular SysV init scripts - Rename the start script properly so they are picked up by dh_installinit - Start them at S26, stop them at K14 - preinst,postinst,postrm: Make sure, the old conffiles for NetworkManager(Dispatcher) are removed/renamed properly. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1434 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.postinst | 68 ++++++++++++++++++++++++++++++----------- 1 file changed, 50 insertions(+), 18 deletions(-) (limited to 'debian/network-manager.postinst') diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index 1e73dfa2..c2a445c7 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -1,27 +1,59 @@ -#!/bin/sh +#!/bin/sh -e +# This script can be called in the following ways: +# +# After the package was installed: +# configure +# +# +# If prerm fails during upgrade or fails on failed upgrade: +# abort-upgrade +# +# If prerm fails during deconfiguration of a package: +# abort-deconfigure in-favour +# removing +# +# If prerm fails during replacement due to conflict: +# abort-remove in-favour -set -e -case "$1" in - configure) - if ! getent group netdev > /dev/null; then - addgroup --quiet --system netdev - fi +# Remove a no-longer used conffile +rm_conffile() +{ + CONFFILE="$1" + + if [ -e "$CONFFILE".dpkg-remove ]; then + echo "Removing obsolete conffile $CONFFILE" + rm -f "$CONFFILE".dpkg-remove + fi +} + - if [ -x "/etc/init.d/dbus" ]; then - invoke-rc.d dbus force-reload || true - fi +case "$1" in + configure) + # Upgrade from previous versions + if dpkg --compare-versions "$2" lt "0.6.4-8"; then + rm_conffile /etc/dbus-1/event.d/25NetworkManager + rm_conffile /etc/dbus-1/event.d/26NetworkManagerDispatcher + fi - if [ -x "/etc/dbus-1/event.d/25NetworkManager" ]; then - /etc/dbus-1/event.d/25NetworkManager restart - fi + if ! getent group netdev > /dev/null; then + addgroup --quiet --system netdev + fi - if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then - /etc/dbus-1/event.d/26NetworkManagerDispatcher restart - fi - ;; + if [ -x "/etc/init.d/dbus" ]; then + invoke-rc.d dbus force-reload || true + fi + ;; + + abort-upgrade|abort-deconfigure|abort-remove) + ;; + + *) + echo "$0 called with unknown argument \`$1'" 1>&2 + exit 1 + ;; esac #DEBHELPER# - exit 0 + -- cgit 1.3.0-6-gf8a5 From eb8f8ce9dc798e8c9ec6b0adb7709ad18a8330ae Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 3 Apr 2008 00:53:19 +0000 Subject: debian/rules, debian/network-manager.postinst - Minimize downtime during upgrades. (Closes: #432322) Restart the service in postinst instead of stop in prerm and start in postinst. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2159 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.postinst | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'debian/network-manager.postinst') diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index c2a445c7..4d7cb755 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -43,6 +43,18 @@ case "$1" in if [ -x "/etc/init.d/dbus" ]; then invoke-rc.d dbus force-reload || true fi + + # Stop the service on upgrades before it is started again. + # dh_installinit -r will create the start code. + if [ -n "$2" ]; then + if [ -x "/etc/init.d/network-manager" ]; then + invoke-rc.d network-manager stop || true + fi + if [ -x "/etc/init.d/network-manager-dispatcher" ]; then + invoke-rc.d network-manager-dispatcher stop || true + fi + fi + ;; abort-upgrade|abort-deconfigure|abort-remove) -- cgit 1.3.0-6-gf8a5 From 5b1afa498f15562272686b5a7b167780bc55b213 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 22 Feb 2009 02:05:46 +0000 Subject: Merged revisions 2066,2304-2305,2308,2317-2318,2320-2323,2325,2333,2405-2415,2426-2429,2431-2434,2456-2458,2460,2464,2507-2508,2510,2513-2515,2517,2538-2539,2659-2668,2734-2735,2862 via svnmerge from svn+ssh://biebl@svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager ........ r2066 | biebl | 2008-01-25 15:36:51 +0100 (Fr, 25 Jan 2008) | 19 lines * SVN snapshot of the upcoming 0.7 release. * Drop patches which are either obsolete, merged upstream or not yet ported - 01-supplicant_timeout.patch - 04-if_fix.patch - 11-man_page_sh_name.patch - 12_readme_format.patch - 13-validate_mac_addr.patch - 20-stable_branch_updates_r2652.patch - 21-endianess_fix_r2754.patch - 22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch - 23-rfkill_return_type.patch - 24-get_mode_fix_r3122.patch - 25-libnl_unique_pid_r3155.patch - 26-libnl_1.0-pre8_r3206.patch - 27-dont_repeat_errors.patch * debian/patches/05-debian_backend.patch - Updated for 0.7. * debian/patches/02-dbus_access_network_manager.patch - Updated for 0.7. ........ r2304 | sjoerd | 2008-06-18 15:05:11 +0200 (Mi, 18 Jun 2008) | 1 line Merge mbiebl's packaging ........ r2305 | sjoerd | 2008-06-18 15:39:30 +0200 (Mi, 18 Jun 2008) | 3 lines * New SVN snapshot * debian/patches/03-system-settings-conf.patch - Removed. Merged upstream ........ r2308 | sjoerd | 2008-06-18 16:54:57 +0200 (Mi, 18 Jun 2008) | 2 lines * Split out libnm-glib-vpn from libnm-glib * debian/rules: Use list-missing ........ r2317 | sjoerd | 2008-06-18 19:39:15 +0200 (Mi, 18 Jun 2008) | 1 line Ensure we install all header files ........ r2318 | sjoerd | 2008-06-18 19:47:38 +0200 (Mi, 18 Jun 2008) | 1 line Don't forget about nm-types.h ........ r2320 | biebl | 2008-06-19 00:18:13 +0200 (Do, 19 Jun 2008) | 2 lines Fix symbols files (remove Debian revision) ........ r2321 | biebl | 2008-06-19 00:20:07 +0200 (Do, 19 Jun 2008) | 5 lines - nm-vpn-properties was removed. Remove the now unnecessary build-deps. - Wrap lines in the long description. - libnm-glib-dev seems to required network-manager-dev ........ r2322 | biebl | 2008-06-19 00:21:18 +0200 (Do, 19 Jun 2008) | 3 lines Merge changelog. 0.7.0~svn3747-1 was never released. A more complete changelog will follow... ........ r2323 | biebl | 2008-06-19 00:23:48 +0200 (Do, 19 Jun 2008) | 2 lines Actually remove the NetworkManagerDispatcher init script. ........ r2325 | biebl | 2008-06-19 01:58:40 +0200 (Do, 19 Jun 2008) | 1 line Fix the package name in libnm-glib-vpn0.symbols ........ r2333 | sjoerd | 2008-06-22 23:27:01 +0200 (So, 22 Jun 2008) | 3 lines * debian/patches/10-execute_system_dhclient_script.patch - Added. Let NM's custom dhclient script execute the systems dhclient script. ........ r2405 | biebl | 2008-08-22 21:39:05 +0200 (Fr, 22 Aug 2008) | 2 lines Update symbols file for svn snapshot r4002 ........ r2406 | biebl | 2008-08-22 21:40:18 +0200 (Fr, 22 Aug 2008) | 2 lines Add "status" action. Requires lsb-base (>= 3.2-14). ........ r2407 | biebl | 2008-08-22 21:43:29 +0200 (Fr, 22 Aug 2008) | 5 lines Disable 05-debian_backend.patch and 10-execute_system_dhclient_script.patch The integration of resolvconf will have to be done differently. The current patches no longer apply. ........ r2408 | biebl | 2008-08-22 21:44:12 +0200 (Fr, 22 Aug 2008) | 2 lines Stop NM at priority 88, exclude private libs from dh_makeshlibs. ........ r2409 | biebl | 2008-08-22 21:46:43 +0200 (Fr, 22 Aug 2008) | 5 lines Update installed files/directories - Install avahi action script and dbus config file - Install nm-dhcp4-config.h header - Install dispatcher.d and system-connections directories created by upstream. ........ r2410 | biebl | 2008-08-22 21:47:21 +0200 (Fr, 22 Aug 2008) | 2 lines Copyright has to be revised. This is a first attempt to remove stale stuff. ........ r2411 | biebl | 2008-08-22 21:47:48 +0200 (Fr, 22 Aug 2008) | 2 lines Update to svn r4002 ........ r2412 | biebl | 2008-08-22 21:49:32 +0200 (Fr, 22 Aug 2008) | 4 lines - Bump Standards Version to 3.8.0 - Suggest avahi-autoipd, NM no longer does IPv4LL - Bump dependency on lsb-base, required by status_of_proc ........ r2413 | biebl | 2008-08-22 22:14:37 +0200 (Fr, 22 Aug 2008) | 1 line Remove, all relevant parts are upstream now ........ r2414 | biebl | 2008-08-22 22:15:21 +0200 (Fr, 22 Aug 2008) | 4 lines Remove 10-execute_system_dhclient_script.patch, patch no longer applies. Resolvconf intergration will have to be addressedd differently. ........ r2415 | biebl | 2008-08-22 22:16:09 +0200 (Fr, 22 Aug 2008) | 2 lines Update to r4004, which contains our custom backend changes. ........ r2426 | smcv | 2008-09-30 19:21:44 +0200 (Di, 30 Sep 2008) | 2 lines * Newer tarball * debian/patches/03-run-resolvconf.patch: Use (and depend on) resolvconf ........ r2427 | biebl | 2008-10-01 13:40:09 +0200 (Mi, 01 Okt 2008) | 5 lines Revert r2426 After a short discussion on irc, it deemed to be best to revert this change as upstream has added resolvconf in r4043 ........ r2428 | sjoerd | 2008-10-03 00:17:18 +0200 (Fr, 03 Okt 2008) | 1 line Update to svn version 4142 ........ r2429 | sjoerd | 2008-10-03 00:40:18 +0200 (Fr, 03 Okt 2008) | 1 line Update the various symbols files ........ r2431 | biebl | 2008-10-03 01:55:09 +0200 (Fr, 03 Okt 2008) | 2 lines Strip off debian revision ........ r2432 | biebl | 2008-10-03 01:57:04 +0200 (Fr, 03 Okt 2008) | 2 lines Pass the correct path of resolvconf and dhclient to ./configure ........ r2433 | biebl | 2008-10-03 01:57:25 +0200 (Fr, 03 Okt 2008) | 2 lines Install the ifupdown plugin and enable it by default. ........ r2434 | sjoerd | 2008-10-03 13:40:53 +0200 (Fr, 03 Okt 2008) | 3 lines * debian/patches/03-nm_get_debian_hostname.patch: - Added. Temporary minimal patch to get hostname from /etc/hostname. There is work being done upstream for a more extensive version. ........ r2456 | sjoerd | 2008-10-10 00:31:49 +0200 (Fr, 10 Okt 2008) | 1 line Update to svn revision 4160 ........ r2457 | sjoerd | 2008-10-10 00:34:20 +0200 (Fr, 10 Okt 2008) | 1 line remove 03-nm_get_debian_hostname.patch, a more complete implementation is merged upstream ........ r2458 | sjoerd | 2008-10-10 00:36:36 +0200 (Fr, 10 Okt 2008) | 1 line unfuck the changelog ........ r2460 | sjoerd | 2008-10-18 21:02:32 +0200 (Sa, 18 Okt 2008) | 1 line Update snapshot to svn version 4191 ........ r2464 | sjoerd | 2008-10-18 22:30:07 +0200 (Sa, 18 Okt 2008) | 1 line target experimental ........ r2507 | sjoerd | 2008-11-29 22:05:27 +0100 (Sa, 29 Nov 2008) | 1 line Start preparing new upstream release (0.7.0) ........ r2508 | sjoerd | 2008-11-29 22:22:54 +0100 (Sa, 29 Nov 2008) | 1 line debian/libnm-util0.symbols: Updated ........ r2510 | sjoerd | 2008-11-29 23:15:59 +0100 (Sa, 29 Nov 2008) | 1 line debian/libnm-glib0.symbols: Updated ........ r2513 | sjoerd | 2008-11-30 15:07:06 +0100 (So, 30 Nov 2008) | 2 lines * debian/patches/03-F3507g.patch - Added. Fix gsm support for Ericsson F3507g Mobile Broadband cards ........ r2514 | biebl | 2008-11-30 15:07:49 +0100 (So, 30 Nov 2008) | 6 lines Update all symbols files - Strip of debian revision number - Use the final 0.7.0 version number for the ~svn??? snapshots which were never released anyway. ........ r2515 | sjoerd | 2008-11-30 15:08:29 +0100 (So, 30 Nov 2008) | 1 line Fix typo in the name ........ r2517 | sjoerd | 2008-12-04 00:52:46 +0100 (Do, 04 Dez 2008) | 1 line debian/control: Recommend ppp ........ r2538 | biebl | 2008-12-06 00:53:36 +0100 (Sa, 06 Dez 2008) | 5 lines * debian/patches/04-ltversioning.patch - Bump soname of libnm-util due to an ABI break between 0.6.6 and 0.7. (Closes: #503682) * Update control, install and symbols file for the new libnm-util library name. ........ r2539 | biebl | 2008-12-06 01:12:06 +0100 (Sa, 06 Dez 2008) | 2 lines * debian/patches/05-dhclient_lease_files.patch - Change the location of the dhclient lease files to /var/lib/dhcp3. ........ r2659 | biebl | 2008-12-16 07:48:51 +0100 (Di, 16 Dez 2008) | 4 lines Rework the changelog for (0.7.0~svn4191-1) List all changes between 0.6.6-2 and 0.7.0~svn4191-1 ........ r2660 | biebl | 2008-12-16 08:55:37 +0100 (Di, 16 Dez 2008) | 2 lines Close bug reports that are fixed by this new upstream release. ........ r2661 | biebl | 2008-12-16 09:03:46 +0100 (Di, 16 Dez 2008) | 5 lines * debian/control - Add Conflicts/Replaces: network-manager-pptp (<< 0.7~~) as the pppd plugin is now shipped by this package. - Add Breaks for network-manager-{gnome,kde} (<< 0.7~~) as the 0.6 versions of those packages do not work with network-manager 0.7. ........ r2662 | biebl | 2008-12-16 09:18:47 +0100 (Di, 16 Dez 2008) | 2 lines Add the vpn (core) plugins also to the Breaks list. ........ r2663 | biebl | 2008-12-16 09:28:27 +0100 (Di, 16 Dez 2008) | 3 lines * debian/network-manager.README.Debian - Merge the README.Debian from Ubuntu which describes the new managed/unmanaged modes. ........ r2664 | biebl | 2008-12-16 09:39:13 +0100 (Di, 16 Dez 2008) | 2 lines * debian/nm-system-settings.conf - Set default mode to unmanaged. ........ r2665 | biebl | 2008-12-16 09:42:40 +0100 (Di, 16 Dez 2008) | 1 line changelog tweaks ........ r2666 | biebl | 2008-12-16 09:55:59 +0100 (Di, 16 Dez 2008) | 3 lines * debian/copyright - Revised and updated. libnm-glib and libnm-util are licensed under the LGPL v2 or later. ........ r2667 | biebl | 2008-12-16 09:56:31 +0100 (Di, 16 Dez 2008) | 1 line Upload to experimental ........ r2668 | biebl | 2008-12-16 10:04:31 +0100 (Di, 16 Dez 2008) | 1 line Refresh 03-F3507g.patch with -p1 ........ r2734 | biebl | 2009-01-13 08:10:58 +0100 (Di, 13 Jan 2009) | 2 lines * debian/control - Add ${misc:Depends} to all binary packages. ........ r2735 | biebl | 2009-01-13 08:15:00 +0100 (Di, 13 Jan 2009) | 2 lines Let network-manager depend on dhcp3-client directly, as the dependency on dhcdbd has been removed. (Closes: #509655) ........ r2862 | biebl | 2009-02-20 02:47:38 +0100 (Fr, 20 Feb 2009) | 3 lines * debian/rules - Include debhelper.mk before any other files as recommended by the cdbs documentation. ........ git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2884 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.postinst | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'debian/network-manager.postinst') diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index 4d7cb755..c7694427 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -16,25 +16,8 @@ # abort-remove in-favour -# Remove a no-longer used conffile -rm_conffile() -{ - CONFFILE="$1" - - if [ -e "$CONFFILE".dpkg-remove ]; then - echo "Removing obsolete conffile $CONFFILE" - rm -f "$CONFFILE".dpkg-remove - fi -} - - case "$1" in configure) - # Upgrade from previous versions - if dpkg --compare-versions "$2" lt "0.6.4-8"; then - rm_conffile /etc/dbus-1/event.d/25NetworkManager - rm_conffile /etc/dbus-1/event.d/26NetworkManagerDispatcher - fi if ! getent group netdev > /dev/null; then addgroup --quiet --system netdev @@ -50,9 +33,6 @@ case "$1" in if [ -x "/etc/init.d/network-manager" ]; then invoke-rc.d network-manager stop || true fi - if [ -x "/etc/init.d/network-manager-dispatcher" ]; then - invoke-rc.d network-manager-dispatcher stop || true - fi fi ;; -- cgit 1.3.0-6-gf8a5 From 2a409a8968343f9ca31f1b9a3fc81d35560a3b64 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 5 Mar 2009 12:20:17 +0000 Subject: * debian/rules - Update stop priorites for 0 1 6 from K14 to K88. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2932 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.postinst | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'debian/network-manager.postinst') diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index c7694427..7666aa1f 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -35,6 +35,15 @@ case "$1" in fi fi + # Update init script priorities + if dpkg --compare-versions "$2" lt "0.7.0.99-1"; then + for i in 0 1 6 ; do + if [ -e /etc/rc$i.d/K14network-manager ]; then + mv /etc/rc$i.d/K14network-manager /etc/rc$i.d/K88network-manager + fi + done + fi + ;; abort-upgrade|abort-deconfigure|abort-remove) -- cgit 1.3.0-6-gf8a5 From 0b0d0a2cb51ff51b1f291182043a9af13013a07b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 9 Apr 2009 07:31:00 +0000 Subject: * Use set -e instead of #!/bin/sh -e for all maintainer scripts. * debian/network-manager.dirs git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3062 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.postinst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'debian/network-manager.postinst') diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index 7666aa1f..f91886f5 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -1,4 +1,7 @@ -#!/bin/sh -e +#!/bin/sh + +set -e + # This script can be called in the following ways: # # After the package was installed: -- cgit 1.3.0-6-gf8a5 From eea01b4ae98928210c768fd90d1336a0dc8b1160 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 21 Jan 2010 23:38:07 +0000 Subject: Kill nm-system-settings on upgrades * network-manager.postinst - Kill any running nm-system-settings daemon on upgrades before the new NetworkManager daemon is started. Its functionality has been merged into NetworkManager. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3395 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.postinst | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'debian/network-manager.postinst') diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index f91886f5..f5b2cdda 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -47,8 +47,13 @@ case "$1" in done fi + # Kill nm-system-settings service as in 0.8 it is no longer a separate process + if dpkg --compare-versions "$2" lt "0.7.998-1"; then + kill `pidof /usr/sbin/nm-system-settings` 2>/dev/null || true + fi + ;; - + abort-upgrade|abort-deconfigure|abort-remove) ;; -- cgit 1.3.0-6-gf8a5 From f95bb9ace31934f1c3d60344b76f399934073d8c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 21 Jan 2010 23:38:21 +0000 Subject: Update to 0.7.999 (RC3) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3399 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.postinst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/network-manager.postinst') diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index f5b2cdda..47d06d42 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -48,7 +48,7 @@ case "$1" in fi # Kill nm-system-settings service as in 0.8 it is no longer a separate process - if dpkg --compare-versions "$2" lt "0.7.998-1"; then + if dpkg --compare-versions "$2" lt "0.7.999-1"; then kill `pidof /usr/sbin/nm-system-settings` 2>/dev/null || true fi -- cgit 1.3.0-6-gf8a5 From 4c8902d6d92495b4ee774fef6f654617a2855175 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 29 Jul 2010 23:58:25 +0000 Subject: Move configuration file /etc/NetworkManager/nm-system-settings.conf to /etc/NetworkManager/NetworkManager.conf. Update maintainer scripts to move the conffile without triggering a dpkg prompt. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3707 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.postinst | 84 ++++++++++++++++++++++++----------------- 1 file changed, 49 insertions(+), 35 deletions(-) (limited to 'debian/network-manager.postinst') diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index 47d06d42..fe0afb36 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -18,49 +18,63 @@ set -e # If prerm fails during replacement due to conflict: # abort-remove in-favour +# Move a conffile without triggering a dpkg question +mv_conffile() { + local OLDCONFFILE="$1" + local NEWCONFFILE="$2" + + [ -e "$OLDCONFFILE" ] || return 0 + + echo "Preserving user changes to $NEWCONFFILE ..." + mv -f "$NEWCONFFILE" "$NEWCONFFILE".dpkg-new + mv -f "$OLDCONFFILE" "$NEWCONFFILE" +} case "$1" in configure) - - if ! getent group netdev > /dev/null; then - addgroup --quiet --system netdev - fi - - if [ -x "/etc/init.d/dbus" ]; then - invoke-rc.d dbus force-reload || true - fi - - # Stop the service on upgrades before it is started again. - # dh_installinit -r will create the start code. - if [ -n "$2" ]; then - if [ -x "/etc/init.d/network-manager" ]; then - invoke-rc.d network-manager stop || true - fi - fi - - # Update init script priorities - if dpkg --compare-versions "$2" lt "0.7.0.99-1"; then - for i in 0 1 6 ; do - if [ -e /etc/rc$i.d/K14network-manager ]; then - mv /etc/rc$i.d/K14network-manager /etc/rc$i.d/K88network-manager - fi - done - fi - - # Kill nm-system-settings service as in 0.8 it is no longer a separate process - if dpkg --compare-versions "$2" lt "0.7.999-1"; then - kill `pidof /usr/sbin/nm-system-settings` 2>/dev/null || true - fi - - ;; + + if ! getent group netdev > /dev/null; then + addgroup --quiet --system netdev + fi + + if [ -x "/etc/init.d/dbus" ]; then + invoke-rc.d dbus force-reload || true + fi + + # Stop the service on upgrades before it is started again. + # dh_installinit -r will create the start code. + if [ -n "$2" ]; then + if [ -x "/etc/init.d/network-manager" ]; then + invoke-rc.d network-manager stop || true + fi + fi + + # Update init script priorities + if dpkg --compare-versions "$2" lt "0.7.0.99-1"; then + for i in 0 1 6 ; do + if [ -e /etc/rc$i.d/K14network-manager ]; then + mv /etc/rc$i.d/K14network-manager /etc/rc$i.d/K88network-manager + fi + done + fi + + # Kill nm-system-settings service as in 0.8 it is no longer a separate process + if dpkg --compare-versions "$2" lt "0.7.999-1"; then + kill `pidof /usr/sbin/nm-system-settings` 2>/dev/null || true + fi + + if dpkg --compare-versions "$2" lt "0.8.1-2"; then + mv_conffile "/etc/NetworkManager/nm-system-setttings.conf" "/etc/NetworkManager/NetworkManager.conf" + fi + ;; abort-upgrade|abort-deconfigure|abort-remove) - ;; + ;; *) echo "$0 called with unknown argument \`$1'" 1>&2 - exit 1 - ;; + exit 1 + ;; esac #DEBHELPER# -- cgit 1.3.0-6-gf8a5 From 6ca05706add4219eb62e00f5210f239513eaa38a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 30 Jul 2010 00:14:20 +0000 Subject: Fix a typo in postinst git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3708 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.postinst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/network-manager.postinst') diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index fe0afb36..5f372abe 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -64,7 +64,7 @@ case "$1" in fi if dpkg --compare-versions "$2" lt "0.8.1-2"; then - mv_conffile "/etc/NetworkManager/nm-system-setttings.conf" "/etc/NetworkManager/NetworkManager.conf" + mv_conffile "/etc/NetworkManager/nm-system-settings.conf" "/etc/NetworkManager/NetworkManager.conf" fi ;; -- cgit 1.3.0-6-gf8a5 From b5ea3bfdeb0b6f2e1c53d0c565fd3636375d6712 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 17 Nov 2010 21:58:42 +0000 Subject: Integrate debian/ifblacklist_migrate.sh from Ubuntu and install it in /usr/lib/NetworkManager. Improve it to disable the interfaces with a #NetworkManager# prefix and re-enable them when the package is removed. (Closes: #530024) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3768 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.postinst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'debian/network-manager.postinst') diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index 5f372abe..2535f400 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -66,6 +66,11 @@ case "$1" in if dpkg --compare-versions "$2" lt "0.8.1-2"; then mv_conffile "/etc/NetworkManager/nm-system-settings.conf" "/etc/NetworkManager/NetworkManager.conf" fi + + if [ -z "$2" ] || dpkg --compare-versions "$2" lt-nl "0.8.1-4"; then + echo "Disabling interfaces configured with plain DHCP in /etc/network/interfaces so that NetworkManager can take them over" + sh /usr/lib/NetworkManager/ifblacklist_migrate.sh + fi ;; abort-upgrade|abort-deconfigure|abort-remove) @@ -78,5 +83,4 @@ case "$1" in esac #DEBHELPER# -exit 0 -- cgit 1.3.0-6-gf8a5 From fa6a85a275e4b11ceb1a725e64a52d9c260cf2df Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 17 Nov 2010 22:10:12 +0000 Subject: Install migration script as executable shell script git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3769 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/network-manager.postinst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/network-manager.postinst') diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index 2535f400..6ef57ff7 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -69,7 +69,7 @@ case "$1" in if [ -z "$2" ] || dpkg --compare-versions "$2" lt-nl "0.8.1-4"; then echo "Disabling interfaces configured with plain DHCP in /etc/network/interfaces so that NetworkManager can take them over" - sh /usr/lib/NetworkManager/ifblacklist_migrate.sh + /usr/lib/NetworkManager/ifblacklist_migrate.sh fi ;; -- cgit 1.3.0-6-gf8a5