From f1aa51a3317f086454995b0eec9ec4053bffe2e3 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Wed, 18 Jun 2008 13:39:30 +0000 Subject: * New SVN snapshot * debian/patches/03-system-settings-conf.patch - Removed. Merged upstream git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2305 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 8 ++++++++ debian/patches/03-system-settings-conf.patch | 11 ----------- debian/patches/series | 1 - 3 files changed, 8 insertions(+), 12 deletions(-) delete mode 100644 debian/patches/03-system-settings-conf.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5449b7c4..1b20da3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +network-manager (0.7.0~svn3758-1) UNRELEASED; urgency=low + + * New SVN snapshot + * debian/patches/03-system-settings-conf.patch + - Removed. Merged upstream + + -- Sjoerd Simons Wed, 18 Jun 2008 14:39:19 +0100 + network-manager (0.7.0~svn3747-1) experimental; urgency=low * SVN snapshot of the upcoming 0.7 release. diff --git a/debian/patches/03-system-settings-conf.patch b/debian/patches/03-system-settings-conf.patch deleted file mode 100644 index 9f605930..00000000 --- a/debian/patches/03-system-settings-conf.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: NetworkManager/system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service.in -=================================================================== ---- NetworkManager.orig/system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service.in 2008-06-11 12:28:11.000000000 +0200 -+++ NetworkManager/system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service.in 2008-06-11 12:32:51.000000000 +0200 -@@ -1,5 +1,5 @@ - [D-BUS Service] - Name=org.freedesktop.NetworkManagerSystemSettings --Exec=@sbindir@/nm-system-settings --config /etc/nm-system-settings.conf -+Exec=@sbindir@/nm-system-settings --config /etc/NetworkManager/nm-system-settings.conf - User=root - diff --git a/debian/patches/series b/debian/patches/series index a7c62915..fa071840 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 02-dbus_access_network_manager.patch -03-system-settings-conf.patch 05-debian_backend.patch -- cgit 1.3.0-6-gf8a5