about summary refs log tree commit diff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog8
-rw-r--r--debian/patches/03-system-settings-conf.patch11
-rw-r--r--debian/patches/series1
3 files changed, 8 insertions, 12 deletions
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 <sjoerd@debian.org>  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