about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2013-02-09 17:11:22 +0100
committerMichael Biebl <biebl@debian.org>2013-02-09 17:12:42 +0100
commite2fc4f204e4a74e5c2827fd56df479ecdf010ad8 (patch)
tree9430dc48f15fac474dd95e73b906c94bf18d2052
parent915766a83aab3ae7d34a34b07fce9fad820bebb7 (diff)
06-nm-settings-manx.patch: Don't install generated xml file as man page.
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/06-nm-settings-manx.patch26
-rw-r--r--debian/patches/series1
3 files changed, 28 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index ed7aa4fc..de8526c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ network-manager (0.9.7.997-1) UNRELEASED; urgency=low
   * No longer install nm-crash-logger, has been removed upstream.
   * 05-force-online-with-unmanaged-devices.patch: Set correct online state on
     daemon startup.
+  * 06-nm-settings-manx.patch: Don't install generated xml file as man page.
 
  -- Michael Biebl <biebl@debian.org>  Sun, 03 Feb 2013 14:49:46 +0100
 
diff --git a/debian/patches/06-nm-settings-manx.patch b/debian/patches/06-nm-settings-manx.patch
new file mode 100644
index 00000000..18b5b83a
--- /dev/null
+++ b/debian/patches/06-nm-settings-manx.patch
@@ -0,0 +1,26 @@
+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 69e54131..2dc8d2aa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02-dbus_access_network_manager.patch
 03-systemd.patch
 05-force-online-with-unmanaged-devices.patch
+06-nm-settings-manx.patch