[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#605386: unblock: network-manager/0.8.1-5



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: freeze-exception

Please unblock package network-manager

Changelog:

network-manager (0.8.1-5) unstable; urgency=low

  * Update Vcs-* fields: Move packaging from svn to git.
  * Don't try the interfaces migration if /etc/network/interfaces does not
    exist. This avoids a failure on remove. (Closes: #605360)

 -- Michael Biebl <biebl@debian.org>  Mon, 29 Nov 2010 15:06:21 +0100

Debdiff attached.

Cheers,
Michael

unblock network-manager/0.8.1-5

-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (200, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.32-5-686 (SMP w/1 CPU core)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff --git a/debian/changelog b/debian/changelog
index f8484b9..11dbc92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+network-manager (0.8.1-5) unstable; urgency=low
+
+  * Update Vcs-* fields: Move packaging from svn to git.
+  * Don't try the interfaces migration if /etc/network/interfaces does not
+    exist. This avoids a failure on remove. (Closes: #605360)
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 29 Nov 2010 15:06:21 +0100
+
 network-manager (0.8.1-4) unstable; urgency=low
 
   [ Raphaël Hertzog ]
diff --git a/debian/control b/debian/control
index fbd2183..0e7c5ff 100644
--- a/debian/control
+++ b/debian/control
@@ -21,8 +21,8 @@ Build-Depends:
  libudev-dev,
  libgudev-1.0-dev
 Standards-Version: 3.9.1
-Vcs-Svn: svn://svn.debian.org/pkg-utopia/packages/unstable/networkmanager/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/
+Vcs-Git: git://git.debian.org/git/pkg-utopia/network-manager.git
+Vcs-Browser: http://git.debian.org/?p=pkg-utopia/network-manager.git;a=summary
 Homepage: http://www.gnome.org/projects/NetworkManager/
 
 Package: network-manager
diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst
index 6ef57ff..87fee6e 100644
--- a/debian/network-manager.postinst
+++ b/debian/network-manager.postinst
@@ -68,8 +68,10 @@ case "$1" in
         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"
-            /usr/lib/NetworkManager/ifblacklist_migrate.sh
+            if [ -f /etc/network/interfaces ]; then
+                echo "Disabling interfaces configured with plain DHCP in /etc/network/interfaces so that NetworkManager can take them over"
+                /usr/lib/NetworkManager/ifblacklist_migrate.sh
+            fi
         fi
         ;;
 
diff --git a/debian/network-manager.postrm b/debian/network-manager.postrm
index cf67e43..f2c3ee0 100644
--- a/debian/network-manager.postrm
+++ b/debian/network-manager.postrm
@@ -30,7 +30,9 @@ case "$1" in
         while test -e /etc/network/interfaces.bak-${backup_suffix}; do
             backup_suffix=$(($backup_suffix + 1))
         done
-        sed -i.bak-${backup_suffix} -e "s/^#NetworkManager#//g" /etc/network/interfaces
+        if [ -f /etc/network/interfaces ]; then
+            sed -i.bak-${backup_suffix} -e "s/^#NetworkManager#//g" /etc/network/interfaces
+        fi
         ;;
     upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
         ;;

Reply to: