[SCM] VLC media player packaging branch, experimental, updated. debian/1.0.6-1-46-ga5e9335

[bdrung-guest at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit a5e93354807db4749a98dcecfc3b299b3d99bb26
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Wed Jun 23 23:02:12 2010 +0200

    Change installation of man pages.

diff --git a/debian/rules b/debian/rules
index 0eb052c..e9a3f36 100755
--- a/debian/rules
+++ b/debian/rules
@@ -190,7 +190,7 @@ install: build
 	rm -f debian/tmp/usr/share/vlc/skins2/fonts/FreeSansBold.ttf
 	ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf debian/tmp/usr/share/vlc/skins2/fonts/FreeSans.ttf
 	ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf debian/tmp/usr/share/vlc/skins2/fonts/FreeSansBold.ttf
-	rm -rf debian/tmp/usr/share/man/man1
+	rm -f debian/tmp/usr/share/man/man1/vlc-config.1
 	# Install stuff
 	dh_install -si --fail-missing --sourcedir=debian/tmp
 	# move .hosts
@@ -239,8 +239,7 @@ binary-arch: build install
 	dh_buildinfo -p vlc-nox
 	dh_installmenu -s
 	dh_installmime -s
-	dh_installman doc/vlc.1 -p vlc-nox
-	dh_installman doc/vlc-wrapper.1 -p vlc-nox
+	dh_installman -s
 	dh_installchangelogs ChangeLog -p vlc
 	dh_installchangelogs ChangeLog -p vlc-nox
 	dh_lintian 
diff --git a/debian/vlc-nox.install b/debian/vlc-nox.install
index fc3cfd4..1e8a5a0 100644
--- a/debian/vlc-nox.install
+++ b/debian/vlc-nox.install
@@ -158,3 +158,4 @@ usr/lib/vlc/plugins/video_output/libvout_wrapper_plugin.so
 usr/lib/vlc/plugins/video_output/libyuv_plugin.so
 usr/lib/vlc/plugins/visualization/libvisual_plugin.so
 usr/lib/vlc/vlc-cache-gen
+usr/share/man

-- 
VLC media player packaging