[SCM] csound/master: Fix building indep-only or arch-only

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Tue Jul 19 00:39:27 UTC 2016


The following commit has been merged in the master branch:
commit 224e7c64fd983497aefee01d38531f3374765551
Author: Felipe Sateler <fsateler at debian.org>
Date:   Mon Jul 18 20:39:15 2016 -0400

    Fix building indep-only or arch-only

diff --git a/debian/rules b/debian/rules
index 4aaa2ee..8c4f4de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -131,7 +131,12 @@ override_dh_auto_configure:
 		Custom.cmake
 	dh_auto_configure -- $(DEB_CMAKE_EXTRA_FLAGS)
 
+override_dh_auto_build-arch:
+	dh_auto_build
+
 override_dh_auto_build-indep:
+	# we need this to install headers
+	dh_auto_build
 	mkdir -p doc/doxygen
 	cd doc && doxygen
 	rm -f doc/csound/html/*.md5 doc/csound/html/*.map doc/csound/html/*.dot
@@ -141,14 +146,13 @@ override_dh_auto_clean:
 	rm -f Custom.cmake
 	rm -rf doc/doxygen
 
-override_dh_auto_install: override_dh_auto_install-arch override_dh_auto_install-indep
-
 override_dh_auto_install-indep:
-
-override_dh_auto_install-arch:
 	dh_auto_install
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/csound/hrtf
 	cp samples/*.dat $(CURDIR)/debian/tmp/usr/share/csound/hrtf
+
+override_dh_auto_install-arch:
+	dh_auto_install
 	mv $(CURDIR)/debian/tmp/usr/bin/extract \
 		$(CURDIR)/debian/tmp/usr/bin/csound_extract
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib/pd/extra
@@ -168,10 +172,12 @@ override_dh_installdocs:
 	dh_installdocs
 	dh_installdocs -A README.md AUTHORS
 
-override_dh_install:
+override_dh_install-indep:
+override_dh_install-arch:
 	dh_install --fail-missing
 
-override_dh_installexamples:
+override_dh_installexamples-indep:
+override_dh_installexamples-arch:
 	dh_installexamples
 	find debian/*/usr/share/doc/*/examples -type f -executable -print0 \
 		| xargs -0 chmod -v a-x

-- 
csound packaging



More information about the pkg-multimedia-commits mailing list