[SCM] libav/master: Drop the ubuntu special hack

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 81bd2e0a020946d03dfcdbf53a5b13ac13f9f8c6
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Nov 2 21:59:26 2013 -0400

    Drop the ubuntu special hack
    
    now with libav demoted to universe, there is no need for libav-extra,
    which allows to significantly simplify debian/rules

diff --git a/debian/rules b/debian/rules
index 715e503..9e5face 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,31 +6,7 @@ DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
 UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//')
 SHLIBS_VERSION := $(EPOCH)9.1-1
 
-ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
-# In Ubuntu, all -extra- packages are built from a special source
-# package called 'libav-extra', which is found in the universe section
-# of the archive because it requires extra build dependencies that are
-# not found in 'main'
-#
-# In order to ease the transition period when libav is uploaded to the
-# archive and libav-extra is not built yet, all libraries in libav
-# produce -extra variants. However, only libavcodec-extra comes with
-# additional functionality.
-VENDOR := Ubuntu
-
-# these package do not build -extra variants
-LIB_PKGS := 
-# these packages do build -extra variants
-LIB_PKGS2 := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avresample|avfilter|swscale)[0-9]+)[[:space:]]*$$/\1/p' debian/control)
-# these packages are the -extra- variants
-LIB_EXTRA_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avresample|avfilter|swscale)(-extra-)[0-9]+)[[:space:]]*$$/\1/p' debian/control)
-
-else
-# In Debian, there is no need (anymore) for a separate libav-extra
-# source package. Instead, the libavcodec-extra package is built
-# directly from the 'main' source package.
-#
-# the libavcodec-extra package is necessary because it links against
+# The libavcodec-extra package is necessary because it links against
 # libraries that are GPLv3 licensed. Make sure that you do not link
 # GPLv2 only applications against the libavcodec-extra flavor!
 #
@@ -44,7 +20,6 @@ LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avdevice|avforma
 LIB_PKGS2 := $(shell sed -nr 's/^Package:[[:space:]]*(libavcodec[0-9]+)[[:space:]]*$$/\1/p' debian/control)
 # these packages are the -extra- variants
 LIB_EXTRA_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(libavcodec-extra-[0-9]+)[[:space:]]*$$/\1/p' debian/control)
-endif
 
 
 # these are the -dev packages
@@ -87,25 +62,17 @@ $(DH_INSTALL_FILES):
 	sed 's/@DEB_HOST_MULTIARCH\(_OPT\)\?@/$(DEB_HOST_MULTIARCH)/g' $@.in > $@
 	$(foreach opt_flavor,$(OPT_FLAVORS),$(call dh_install_file_opt_flavor,$@,$(opt_flavor)))
 
-ifeq ($(DEB_SOURCE),libav-extra)
-CONFIGURE := libav/configure
-libav/configure:
-	tar xvf /usr/src/libav-source.tar.gz
-else
-CONFIGURE := configure
-endif
-
 configure-%: configure-stamp-%
-configure-stamp-%: $(CONFIGURE)
+configure-stamp-%: configure
 	dh_testdir
 	mkdir -p debian-$*
-	cd debian-$* && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/$(CONFIGURE) \
+	cd debian-$* && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/configure \
 		$($*_build_confflags) $(extra_$*_build_confflags)
 	touch $@
 configure-extra-stamp-%:
 	dh_testdir
 	mkdir -p debian-extra-$*
-	cd debian-extra-$* && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/$(CONFIGURE) \
+	cd debian-extra-$* && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/configure \
 		$($*_build_confflags) $(v3_confflags) $(extra_$*_build_confflags)
 	touch $@
 
@@ -191,18 +158,9 @@ else
 endif
 
 binary-indep:
-ifeq ($(DEB_SOURCE), libav)
 	dh_testdir
 	dh_testroot
 	dh_prep -i
-	# 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
 	doxygen doc/Doxyfile
 	mkdir -p debian/libav-doc/usr/share/doc/libav-doc
 	mv -v doc/doxy/html debian/libav-doc/usr/share/doc/libav-doc
@@ -219,11 +177,7 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installman -plibav-tools debian/qt-faststart.1
-ifeq ($(DEB_SOURCE), libav)
 	dh_strip -a --dbg-package=libav-dbg
-else
-	dh_strip -a --dbg-package=libav-extra-dbg
-endif
 	dh_lintian -a
 	dh_link -a
 	dh_compress -a

-- 
Libav/FFmpeg packaging