[SCM] vlc/master: Install all docs into /usr/share/doc/vlc-nox and link the vlc doc dir to it.

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

The following commit has been merged in the master branch:
commit c3eb84facc8b4e103eb4da33b8ca2546530cc844
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sun Nov 14 01:08:00 2010 +0100

    Install all docs into /usr/share/doc/vlc-nox and link the vlc doc dir to it.

diff --git a/debian/rules b/debian/rules
index 1f8a17d..a86b418 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,7 @@ confflags += \
 	--disable-update-check \
 	--enable-fast-install \
 	--prefix=/usr \
+	--docdir=/usr/share/doc/vlc-nox \
 	--sysconfdir=/etc \
 	--with-binary-version=$(DEBIAN_VERSION) \
 	$(NULL)
@@ -222,11 +223,9 @@ override_dh_strip:
 	dh_strip --dbg-package=vlc-dbg
 
 override_dh_installdocs:
-	dh_installdocs -p vlc
 	dh_installdocs -p vlc-data
 	dh_installdocs -p vlc-nox
 
 override_dh_installchangelogs:
-	dh_installchangelogs ChangeLog -p vlc
 	dh_installchangelogs ChangeLog -p vlc-data
 	dh_installchangelogs ChangeLog -p vlc-nox
diff --git a/debian/vlc.links b/debian/vlc.links
index 37b1ca5..726f71d 100644
--- a/debian/vlc.links
+++ b/debian/vlc.links
@@ -1,8 +1,4 @@
 /usr/share/bug/vlc-nox /usr/share/bug/vlc
+/usr/share/doc/vlc-nox /usr/share/doc/vlc
 /usr/share/man/man1/vlc.1.gz /usr/share/man/man1/svlc.1.gz
 /usr/share/man/man1/vlc.1.gz /usr/share/man/man1/qvlc.1.gz
-/usr/share/doc/vlc-nox/AUTHORS.gz /usr/share/doc/vlc/AUTHORS.gz
-/usr/share/doc/vlc-nox/MAINTAINERS /usr/share/doc/vlc/MAINTAINERS
-/usr/share/doc/vlc-nox/NEWS.gz /usr/share/doc/vlc/NEWS.gz
-/usr/share/doc/vlc-nox/README /usr/share/doc/vlc/README
-/usr/share/doc/vlc-nox/THANKS.gz /usr/share/doc/vlc/THANKS.gz

-- 
VLC media player packaging