about summary refs log tree commit diff
path: root/debian/patches
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd@debian.org>2008-06-18 13:39:30 +0000
committerSjoerd Simons <sjoerd@debian.org>2008-06-18 13:39:30 +0000
commitf1aa51a3317f086454995b0eec9ec4053bffe2e3 (patch)
tree18eaa5dbbe2e8f1cf75d1e81650e56e78c3fb6cb /debian/patches
parent63242af5d6ebf808fcaff9ebb59d897646792042 (diff)
* 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
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/03-system-settings-conf.patch11
-rw-r--r--debian/patches/series1
2 files changed, 0 insertions, 12 deletions
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