about summary refs log tree commit diff
path: root/debian
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2009-04-08 04:05:13 +0000
committerMichael Biebl <biebl@debian.org>2009-04-08 04:05:13 +0000
commitb3413934a91f67a78dee334adb9886e5bc2fe86c (patch)
treeece76805774df4a09de7747c5142b9366ac540b0 /debian
parenta8c1789e99842b7a0dd6ee7aeb5fec6511fb29a4 (diff)
* debian/network-manager.install
  - Install modem prober udev rules file into /lib/udev/rules.d.
* debian/network-manager.preinst
  - Remove obsolete conffile
    /etc/udev/rules.d/77-nm-probe-modem-capabilities.rules.

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3036 ceb527fc-18e6-0310-9fe2-813c157c29e7
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog5
-rw-r--r--debian/network-manager.install2
-rw-r--r--debian/network-manager.preinst3
3 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 2af5d2c4..6ae1b8d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 network-manager (0.7.0.100-1) UNRELEASED; urgency=low
 
   * New upstream release (0.7.1 rc4).
+  * debian/network-manager.install
+    - Install modem prober udev rules file into /lib/udev/rules.d.
+  * debian/network-manager.preinst
+    - Remove obsolete conffile
+      /etc/udev/rules.d/77-nm-probe-modem-capabilities.rules.
 
  -- Michael Biebl <biebl@debian.org>  Mon, 06 Apr 2009 10:13:04 +0200
 
diff --git a/debian/network-manager.install b/debian/network-manager.install
index f606770d..6340fdaf 100644
--- a/debian/network-manager.install
+++ b/debian/network-manager.install
@@ -19,5 +19,5 @@ debian/tmp/etc/dbus-1/system.d/nm-avahi-autoipd.conf
 debian/tmp/etc/NetworkManager/dispatcher.d/
 debian/tmp/etc/NetworkManager/system-connections/
 debian/nm-system-settings.conf etc/NetworkManager/
-debian/tmp/lib/udev/rules.d/77-nm-probe-modem-capabilities.rules etc/udev/rules.d/
+debian/tmp/lib/udev/rules.d/77-nm-probe-modem-capabilities.rules
 debian/tmp/lib/udev/nm-modem-probe
diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst
index 8b64b293..0dddcb3a 100644
--- a/debian/network-manager.preinst
+++ b/debian/network-manager.preinst
@@ -56,6 +56,9 @@ case "$1" in
 	    rm_conffile network-manager /etc/init.d/network-manager-dispatcher
 	    update-rc.d network-manager-dispatcher remove >/dev/null
 	fi
+	if dpkg --compare-versions "$2" lt "0.7.0.100-1"; then
+	    rm_conffile network-manager /etc/udev/rules.d/77-nm-probe-modem-capabilities.rules
+	fi
 	;;
 
     abort-upgrade)