[SCM] libav/experimental: Factor out binary-indep builds

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 793eb889a00a2e9681baee629f14d4fc7aa5f8ee
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon May 27 22:33:47 2013 +0200

    Factor out binary-indep builds
    
    This refactoring makes the rules file a bit easier to read, and avoids
    building Arch: all binaries in regular builds

diff --git a/debian/rules b/debian/rules
index 883eee6..05857da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -117,12 +117,6 @@ build-extra-stamp-%: configure-extra-stamp-%
 debian-shared/tools/qt-faststart: build-stamp-shared
 	$(MAKE) -C debian-shared tools/qt-faststart V=1
 
-build-doxy: build-doxy-stamp
-build-doxy-stamp:
-	dh_testdir
-	[ ! -x /usr/bin/doxygen ] || doxygen doc/Doxyfile
-	touch $@
-
 build: build-stamp build-extra
 build-stamp: $(addprefix build-stamp-, $(FLAVORS)) debian-shared/tools/qt-faststart
 	touch $@
@@ -160,22 +154,7 @@ install-common: build $(DH_INSTALL_FILES)
 	dh_testdir
 	dh_testroot
 	dh_prep
-ifeq ($(DEB_SOURCE), libav)
-	# the libav-source package does exist in some derivatives such as ubuntu, etc.
-	if grep -q 'Package: libav-source' debian/control; then \
-	  dh_installdirs -ptmp usr/src;  \
-	  tar czvf debian/tmp/usr/src/libav-source.tar.gz . \
-	  	 --exclude 'debian*' --exclude .git  --exclude .pc --exclude '*-stamp' \
-	  	 --transform 's,^./,libav/,' ; \
-	fi
-endif
-	dh_installdirs -ptmp usr/src
-	dh_installdirs -ptmp usr/share/doc/libav/html etc
-	dh_installdirs -ptmp usr/share/doc/libav-doc/html
 	$(foreach flavor,$(FLAVORS),$(call install_flavor,$(flavor)))
-	# don't fail on binary-indep only builds.
-	-cp -avf doc/doxy/html debian/tmp/usr/share/doc/libav-doc
-	install -m 644 -D debian-shared/doc/*.html debian/tmp/usr/share/doc/libav/html/
 	install -m 644 -D doc/avserver.conf debian/tmp/etc/
 	install -m 644 -D debian-shared/tools/qt-faststart debian/tmp/usr/bin/qt-faststart
 	dh_install $(addprefix -N,$(LIB_EXTRA_PKGS)) \
@@ -198,7 +177,21 @@ install-extra: build $(DH_INSTALL_FILES)
 	debian/tmp/usr/bin/avconv -codecs | tee codecs.txt
 	dh_installdocs -plibavcodec-extra-54 codecs.txt
 
-binary-indep: build-doxy install
+binary-indep:
+ifeq ($(DEB_SOURCE), libav)
+	# the libav-source package does exist in some derivatives such as ubuntu, etc.
+	if grep -q 'Package: libav-source' debian/control; then \
+	  dh_installdirs -ptmp usr/src;  \
+	  tar czvf debian/tmp/usr/src/libav-source.tar.gz . \
+	  	 --exclude 'debian*' --exclude .git  --exclude .pc --exclude '*-stamp' \
+	  	 --transform 's,^./,libav/,' ; \
+	fi
+endif
+	dh_installdirs -ptmp usr/share/doc/libav/html etc
+	dh_installdirs -ptmp usr/share/doc/libav-doc/html
+	doxygen doc/Doxyfile
+	cp -avf doc/doxy/html debian/tmp/usr/share/doc/libav-doc
+	install -m 644 -D debian-shared/doc/*.html debian/tmp/usr/share/doc/libav/html/
 
 binary-arch: build install
 	dh_testdir
@@ -244,7 +237,7 @@ endif
 
 binary: binary-indep binary-arch
 
-.PHONY: build $(addprefix build-, $(FLAVORS)) build-doxy \
+.PHONY: build $(addprefix build-, $(FLAVORS)) \
 	clean \
 	configure $(addprefix configure-, $(FLAVORS)) \
 	binary binary-indep binary-arch \

-- 
Libav/FFmpeg packaging