summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2012-05-15 01:50:25 +0200
committerMichael Biebl <biebl@debian.org>2012-05-15 01:51:23 +0200
commit6ff5a9c4f09243524e2a5e88b48a8a727f5e0643 (patch)
tree13a1831e2fba68b5d68f575c4dda735f65b89783
parent1172eee6b28024c9f1983f9295fdddb3264c61bc (diff)
debian/network-manager.maintscript: Use new versioning scheme
as recommended by dpkg-maintscript-helper which better handles local
modifications and (bin)NMUs.
-rw-r--r--debian/changelog3
-rw-r--r--debian/network-manager.maintscript10
2 files changed, 8 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index a6a6398a..9cc8ecaf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ network-manager (0.9.4.0-4) UNRELEASED; urgency=low
     This directory needs to exist so NetworkManager can monitor it for changes
     (via inotify) to automatically detect newly installed VPN plugins.
     (Closes: #672963)
+  * debian/network-manager.maintscript: Use new versioning scheme as
+    recommended by dpkg-maintscript-helper which better handles local
+    modifications and (bin)NMUs.
 
  -- Michael Biebl <biebl@debian.org>  Tue, 15 May 2012 01:46:40 +0200
 
diff --git a/debian/network-manager.maintscript b/debian/network-manager.maintscript
index cc66dea0..b5c3f356 100644
--- a/debian/network-manager.maintscript
+++ b/debian/network-manager.maintscript
@@ -1,5 +1,5 @@
-rm_conffile /etc/init.d/network-manager-dispatcher 0.6.6-3 network-manager
-rm_conffile /etc/udev/rules.d/77-nm-probe-modem-capabilities.rules 0.7.0.99-1 network-manager
-rm_conffile /etc/dbus-1/system.d/nm-system-settings.conf 0.7.2-2 network-manager
-mv_conffile /etc/NetworkManager/nm-system-settings.conf /etc/NetworkManager/NetworkManager.conf 0.8.1-1 network-manager
-mv_conffile /etc/dbus-1/system.d/NetworkManager.conf /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf 0.9.2.0-2 network-manager
+rm_conffile /etc/init.d/network-manager-dispatcher 0.7.0~svn4191-1~ network-manager
+rm_conffile /etc/udev/rules.d/77-nm-probe-modem-capabilities.rules 0.7.0.100-1~ network-manager
+rm_conffile /etc/dbus-1/system.d/nm-system-settings.conf 0.7.999-1~ network-manager
+mv_conffile /etc/NetworkManager/nm-system-settings.conf /etc/NetworkManager/NetworkManager.conf 0.8.1-2~ network-manager
+mv_conffile /etc/dbus-1/system.d/NetworkManager.conf /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf 0.9.4.0-1~ network-manager