[pulseaudio] 05/06: Do not use dh_installman to install manpages

[Felipe Sateler]

This is an automated email from the git hooks/post-receive script.

fsateler pushed a commit to branch master
in repository pulseaudio.

commit 06cbb5d46213d4d3d98d9c593f361cde182fca71
Author: Felipe Sateler <fsateler at debian.org>
Date:   Thu Jun 11 00:50:54 2015 -0300

    Do not use dh_installman to install manpages
    
    Upstream already installs it correctly, so just list them in *.install
---
 debian/pulseaudio-esound-compat.install  | 1 +
 debian/pulseaudio-esound-compat.manpages | 1 -
 debian/pulseaudio-utils.install          | 7 +++++++
 debian/pulseaudio-utils.manpages         | 7 -------
 debian/pulseaudio.install                | 6 ++++++
 debian/pulseaudio.manpages               | 5 -----
 debian/rules                             | 1 -
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/debian/pulseaudio-esound-compat.install b/debian/pulseaudio-esound-compat.install
index 1c626e1..e709f7e 100644
--- a/debian/pulseaudio-esound-compat.install
+++ b/debian/pulseaudio-esound-compat.install
@@ -4,3 +4,4 @@ usr/lib/pulse-*/modules/module-esound-compat-spawnfd.so
 usr/lib/pulse-*/modules/module-esound-compat-spawnpid.so
 usr/lib/pulse-*/modules/module-esound-protocol-tcp.so
 usr/lib/pulse-*/modules/module-esound-protocol-unix.so
+usr/share/man/man1/esdcompat.1
diff --git a/debian/pulseaudio-esound-compat.manpages b/debian/pulseaudio-esound-compat.manpages
deleted file mode 100644
index 16b1dfa..0000000
--- a/debian/pulseaudio-esound-compat.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/man/man1/esdcompat.1
diff --git a/debian/pulseaudio-utils.install b/debian/pulseaudio-utils.install
index 7139d75..d31d4d9 100644
--- a/debian/pulseaudio-utils.install
+++ b/debian/pulseaudio-utils.install
@@ -8,3 +8,10 @@ usr/bin/parecord
 usr/bin/padsp
 usr/bin/pax11publish
 usr/bin/pasuspender
+usr/share/man/man1/pacat.1
+usr/share/man/man1/pacmd.1
+usr/share/man/man1/pactl.1
+usr/share/man/man1/padsp.1
+usr/share/man/man1/paplay.1
+usr/share/man/man1/pasuspender.1
+usr/share/man/man1/pax11publish.1
diff --git a/debian/pulseaudio-utils.manpages b/debian/pulseaudio-utils.manpages
deleted file mode 100644
index d386571..0000000
--- a/debian/pulseaudio-utils.manpages
+++ /dev/null
@@ -1,7 +0,0 @@
-debian/tmp/usr/share/man/man1/pacat.1
-debian/tmp/usr/share/man/man1/pacmd.1
-debian/tmp/usr/share/man/man1/pactl.1
-debian/tmp/usr/share/man/man1/padsp.1
-debian/tmp/usr/share/man/man1/paplay.1
-debian/tmp/usr/share/man/man1/pasuspender.1
-debian/tmp/usr/share/man/man1/pax11publish.1
diff --git a/debian/pulseaudio.install b/debian/pulseaudio.install
index 2690cf8..d3756ca 100755
--- a/debian/pulseaudio.install
+++ b/debian/pulseaudio.install
@@ -80,6 +80,12 @@ usr/lib/pulse-*/modules/module-switch-on-port-available.so
 usr/lib/pulse-*/modules/module-virtual-surround-sink.so
 [linux-any] usr/lib/pulse-*/modules/module-systemd-login.so
 usr/share/locale
+usr/share/man/man1/pulseaudio.1
+usr/share/man/man5/default.pa.5
+usr/share/man/man5/pulse-cli-syntax.5
+usr/share/man/man5/pulse-client.conf.5
+usr/share/man/man5/pulse-daemon.conf.5
+usr/share/man/man1/start-pulseaudio-x11.1
 [linux-any] usr/share/pulseaudio/alsa-mixer
 usr/lib/*/libpulsecore-*.so usr/lib
 [linux-any] usr/share/alsa
diff --git a/debian/pulseaudio.manpages b/debian/pulseaudio.manpages
deleted file mode 100644
index c767547..0000000
--- a/debian/pulseaudio.manpages
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/tmp/usr/share/man/man1/pulseaudio.1
-debian/tmp/usr/share/man/man5/pulse-cli-syntax.5
-debian/tmp/usr/share/man/man5/pulse-client.conf.5
-debian/tmp/usr/share/man/man5/pulse-daemon.conf.5
-debian/tmp/usr/share/man/man1/start-pulseaudio-x11.1
diff --git a/debian/rules b/debian/rules
index cc7a51c..3205e2d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,6 @@ common-install-arch::
 	cp -a $(CURDIR)/debian/pulse.conf \
 		$(CURDIR)/debian/tmp/usr/share/alsa/alsa.conf.d
 	cp -a $(CURDIR)/debian/pulse-alsa.conf $(CURDIR)/debian/tmp/usr/share/alsa
-	dh_installman -ppulseaudio --language=C debian/tmp/usr/share/man/man5/default.pa.5
 	install -d $(CURDIR)/debian/tmp/usr/share/apport/package-hooks
 	cp $(CURDIR)/debian/apport-hook.py $(CURDIR)/debian/tmp/usr/share/apport/package-hooks/source_pulseaudio.py
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git