diff options
| author | Michael Biebl <biebl@debian.org> | 2013-02-20 23:08:52 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2013-02-20 23:08:52 +0100 |
| commit | 3c0d302db0f7b349dda2c9420e3754f1536b3b48 (patch) | |
| tree | 4607984befea61703a57f6e4fe60e7b32c8b6298 | |
| parent | 418eb939856cc2c4fdfe2d73436a9ef6cde6c8fa (diff) | |
Drop 06-nm-settings-manx.patch, merged upstream.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/06-nm-settings-manx.patch | 26 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 1 insertions, 27 deletions
diff --git a/debian/changelog b/debian/changelog index b057f2e6..67d71a64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ network-manager (0.9.8.0-1) UNRELEASED; urgency=low * New upstream release. + * Drop 06-nm-settings-manx.patch, merged upstream. -- Michael Biebl <biebl@debian.org> Wed, 20 Feb 2013 23:07:16 +0100 diff --git a/debian/patches/06-nm-settings-manx.patch b/debian/patches/06-nm-settings-manx.patch deleted file mode 100644 index 18b5b83a..00000000 --- a/debian/patches/06-nm-settings-manx.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: network-manager/man/Makefile.am -=================================================================== ---- network-manager.orig/man/Makefile.am 2013-02-09 03:41:21.118828763 +0100 -+++ network-manager/man/Makefile.am 2013-02-09 03:41:21.110828660 +0100 -@@ -25,7 +25,7 @@ - nm-tool.1 \ - nm-online.1 \ - nmcli.1 \ -- $(GENERATED_FILES) -+ nm-settings.5 - - EXTRA_DIST = \ - $(man_MANS) \ -Index: network-manager/man/Makefile.in -=================================================================== ---- network-manager.orig/man/Makefile.in 2013-02-09 03:22:03.849341752 +0100 -+++ network-manager/man/Makefile.in 2013-02-09 03:41:46.763152937 +0100 -@@ -372,7 +372,7 @@ - nm-tool.1 \ - nm-online.1 \ - nmcli.1 \ -- $(GENERATED_FILES) -+ nm-settings.5 - - EXTRA_DIST = \ - $(man_MANS) \ diff --git a/debian/patches/series b/debian/patches/series index 2dc8d2aa..69e54131 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,4 +2,3 @@ 02-dbus_access_network_manager.patch 03-systemd.patch 05-force-online-with-unmanaged-devices.patch -06-nm-settings-manx.patch |