[SCM] VLC media player packaging branch, sid, updated. debian/0.9.8a-3-9-g81a509f

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

The following commit has been merged in the sid branch:
commit 0e817920db764df181a1cb741f7b6e4323d7c61e
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Thu Apr 2 22:28:46 2009 +0200

    Revert "Use dh_bugfiles"
    
    I will redo it in 2 commits to ease backports
    This reverts commit 65bffb8535de570aed78714a8b177079b3dc17f4.

diff --git a/debian/vlc-nox.bug-control b/debian/bug/control
similarity index 100%
rename from debian/vlc-nox.bug-control
rename to debian/bug/control
diff --git a/debian/vlc-nox.bug-presubj b/debian/bug/presubj
similarity index 65%
rename from debian/vlc-nox.bug-presubj
rename to debian/bug/presubj
index 792ba01..88ea241 100644
--- a/debian/vlc-nox.bug-presubj
+++ b/debian/bug/presubj
@@ -10,10 +10,10 @@ at all, you need to check that the module handling it is present.
    If you have yellow warning lines at the top, that could well be the
    problem
 
- * If you have installed libraries from other repositories (e.g. to use
-   allegedly patent-encumbred encoders), revert to the official Debian 
-   libraries before reporting a bug.
+ * If you have installed libraries from other reposotories (e.g. to use
+   patent-encumbred encoders), revert to the official Debian libraries
+   before reporting a bug.
 
-The debug log of vlc ("vlc -vvv --options") is very useful for the
+The debug log of vlc ("vlc -vvv --options") is very usefull for the
 developers, do include it in your report.
 
diff --git a/debian/control b/debian/control
index 1ace2cb..b713c3a 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
            Loic Minier <lool at dooz.org>,
            Christophe Mutricy <xtophe at videolan.org>,
            Mohammed Adnène Trojette <adn+deb at diwi.org>
-Build-Depends: debhelper (>= 7.2.3~),
+Build-Depends: debhelper (>= 7),
                dh-buildinfo,
                gettext,
                quilt,
diff --git a/debian/rules b/debian/rules
index 3b218e8..033ed9b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -187,6 +187,9 @@ install: build
 	mv debian/vlc-data/usr/share/vlc/http/.hosts debian/vlc-data/etc/vlc/http
 	ln -s /etc/vlc/http/hosts debian/vlc-data/usr/share/vlc/http/.hosts
 
+	#install BTS stuff
+	mkdir -p  debian/vlc-nox/usr/share/bug/vlc-nox
+	cp debian/bug/* debian/vlc-nox/usr/share/bug/vlc-nox
 	# Clean up
 	rm -f debian/vlc/$(VIDDIR)/*.png
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
@@ -231,7 +234,6 @@ binary-arch: build install
 	dh_installchangelogs ChangeLog -p vlc-nox
 	dh_desktop
 	dh_lintian 
-	dh_bugfiles
 	dh_strip -s --dbg-package=vlc-dbg
 	dh_compress -s
 	dh_fixperms -s

-- 
VLC media player packaging