[SCM] libdvdnav/master: Revert "avoid package build failure"

rbalint at users.alioth.debian.org rbalint at users.alioth.debian.org
Thu Feb 13 17:06:07 UTC 2014


The following commit has been merged in the master branch:
commit f2b46590a8436998682bc5ccd2cb69bb2ed3aa35
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Thu Feb 13 18:04:24 2014 +0100

    Revert "avoid package build failure"
    
    This reverts commit 88b71b543783b2b96f9f2d99dbb00baf02701631.

diff --git a/debian/rules b/debian/rules
index 11eb28f..5a39c6e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,10 @@ override_dh_auto_build:
 override_dh_auto_install:
 	dh_auto_install
 	# Removing unused files
-	rm -fv debian/tmp/usr/lib/*/*.la
+	rm -f debian/tmp/usr/lib/*/*.la
+	rm -rf debian/tmp/usr/share/aclocal
+	# Remove dvdnav-config. It breaks multi-arch. Use the pkg-config file instead!
+	rm debian/tmp/usr/bin/dvdnav-config
 
 override_dh_install:
 	dh_install --fail-missing

-- 
libdvdnav packaging



More information about the pkg-multimedia-commits mailing list