diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 3 | ||||
| -rw-r--r-- | debian/network-manager.install | 2 | ||||
| -rw-r--r-- | debian/network-manager.maintscript | 1 |
4 files changed, 10 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index c231ef71..338d95d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,8 +17,13 @@ network-manager (0.9.4.0-1) UNRELEASED; urgency=low * Update symbols files for libnm-glib and libnm-util. * Install new nm-*-enum-types.h header files. * Add Build-Depends on libnl-genl-3-dev. + * The D-Bus policy file /etc/dbus-1/system.d/NetworkManager.conf has been + renamed to org.freedesktop.NetworkManager.conf. Update the .install file + and use the dh_install maintscript facility to move the conffile on + upgrades. This requires a newer debhelper, so bump the Build-Depends + accordingly. - -- Michael Biebl <biebl@debian.org> Sat, 24 Mar 2012 14:06:41 +0100 + -- Michael Biebl <biebl@debian.org> Sat, 24 Mar 2012 14:10:28 +0100 network-manager (0.9.2.0-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 514c930c..3c2164f9 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org> Uploaders: Michael Biebl <biebl@debian.org> Build-Depends: - debhelper (>= 8), + debhelper (>= 8.1.0), dpkg-dev (>= 1.16.1), autotools-dev, pkg-config, @@ -35,6 +35,7 @@ Homepage: http://www.gnome.org/projects/NetworkManager/ Package: network-manager Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, diff --git a/debian/network-manager.install b/debian/network-manager.install index 48a40278..35b81bee 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -12,7 +12,7 @@ usr/share/locale/ usr/share/man/ usr/share/dbus-1/system-services/ usr/share/polkit-1/ -etc/dbus-1/system.d/NetworkManager.conf +etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf etc/dbus-1/system.d/nm-dhcp-client.conf etc/dbus-1/system.d/nm-dispatcher.conf etc/dbus-1/system.d/nm-avahi-autoipd.conf diff --git a/debian/network-manager.maintscript b/debian/network-manager.maintscript new file mode 100644 index 00000000..2665d2d7 --- /dev/null +++ b/debian/network-manager.maintscript @@ -0,0 +1 @@ +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 |