[SCM] pulseaudio packaging branch, master, updated. debian/2.1-2-7-gecc6224

[sjoerd at users.alioth.debian.org]

The branch, master has been updated
       via  ecc62246fb917e00f5de2360bafda8e8b2cc92e2 (commit)
      from  f9ea7581f56194eae788bc69d222cdcc521c482d (commit)


- Shortlog ------------------------------------------------------------
ecc6224 Fix installation of default.pa manpage (Closes: #690416)

Summary of changes:
 debian/pulseaudio.manpages |    1 -
 debian/rules               |    4 +---
 2 files changed, 1 insertions(+), 4 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit ecc62246fb917e00f5de2360bafda8e8b2cc92e2
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sun Nov 4 13:07:12 2012 +0100

    Fix installation of default.pa manpage (Closes: #690416)

diff --git a/debian/pulseaudio.manpages b/debian/pulseaudio.manpages
index bbe139c..b5aa8a7 100644
--- a/debian/pulseaudio.manpages
+++ b/debian/pulseaudio.manpages
@@ -1,4 +1,3 @@
-debian/tmp/usr/share/man/man5/default.pa.5
 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
diff --git a/debian/rules b/debian/rules
index a767915..448b786 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,7 @@ 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
 
 
 common-configure-arch::
@@ -28,9 +29,6 @@ ifneq (,$(findstring $(DEB_HOST_ARCH), "arm armel"))
 	make -C src libpulsecore_2.1_la-svolume_arm.lo CFLAGS+=-march=armv6
 endif
 
-pulseaudio-install-arch::
-	dh_installman --language=C debian/tmp/usr/share/man/man5/default.pa.5
-
 common-binary-post-install-arch:: list-missing
 
 clean::

-- 
pulseaudio packaging