[SCM] soundtouch/master: Fix FTBFS when using debhelper 7 and not building the lib32 packages.

micove-guest at users.alioth.debian.org micove-guest at users.alioth.debian.org
Sat Jan 29 02:56:03 UTC 2011


The following commit has been merged in the master branch:
commit c6232e10083f92ec4517662b2fa238b2bf4615aa
Author: Miguel Colon <debian.micove at gmail.com>
Date:   Fri Jan 28 21:40:31 2011 -0500

    Fix FTBFS when using debhelper 7 and not building the lib32 packages.
    
    The reason for depending on debhelper 8 was because it was IMO the cleanest/best
    solution for this. Since the dependency got downgraded in a previous commit then
    I'm including the "fix" I used before I upgraded the dependency. I could also
    have done dh $@ -s but it was overkill IMO. This issue mainly affects distros
    like Ubuntu Lucid that still ship with debhelper 7. This commits makes the
    package compile when using debhelper 7 or the smarter debhelper 8.

diff --git a/debian/rules b/debian/rules
index 85d044a..2832eba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,9 @@ override_dh_prep:
 	dh_prep --exclude=debian/tmp
 endif
 
+override_dh_install:
+	dh_install -s
+
 override_dh_installdocs:
 	dh_installdocs -plibsoundtouch0 -psoundstretch
 
@@ -36,5 +39,11 @@ override_dh_strip:
         endif
 	dh_strip --package=soundstretch --dbg-package=soundstretch-dbg
 
+override_dh_gencontrol:
+	dh_gencontrol -s
+
+override_dh_builddeb:
+	dh_builddeb -s
+
 %:
 	dh $@ --with autoreconf

-- 
soundtouch packaging



More information about the pkg-multimedia-commits mailing list