[SCM] libav/experimental: Revert "Tidy rules file: Reuse package version variables already resolved by CDBS, and resolve EPOCH similarly (and without including delimiter)."

[js at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit b157a78583fb83064e6f174f71c45a9f0c20bc49
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Jan 24 17:10:26 2013 +0100

    Revert "Tidy rules file: Reuse package version variables already resolved by CDBS, and resolve EPOCH similarly (and without including delimiter)."
    
    This reverts commit 428ac7c4b244078724ce1cc68eb23e8b0b034eda.

diff --git a/debian/rules b/debian/rules
index aed7abf..151a17d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,11 @@ include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_COPYRIGHT_CHECK_MERGE_SAME_LICENSE = yes, please!
 
-EPOCH := $(shell echo $(DEB_VERSION) | cut -d: -f1)
-SHLIBS_VERSION := $(EPOCH):9.1-1
+EPOCH=6:
+DEB_SOURCE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
+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
@@ -83,7 +86,7 @@ $(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_PACKAGE),libav-extra)
+ifeq ($(DEB_SOURCE),libav-extra)
 CONFIGURE := libav/configure
 libav/configure:
 	tar xvf /usr/src/libav-source.tar.gz
@@ -161,7 +164,7 @@ install-common: build $(DH_INSTALL_FILES)
 	dh_testdir
 	dh_testroot
 	dh_prep
-ifeq ($(DEB_SOURCE_PACKAGE), libav)
+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;  \
@@ -206,7 +209,7 @@ binary-arch: build install
 	dh_testroot
 	dh_installman -plibav-tools debian/qt-faststart.1
 	dh_installdocs -A debian/README.Debian
-ifeq ($(DEB_SOURCE_PACKAGE), libav)
+ifeq ($(DEB_SOURCE), libav)
 	dh_installdocs -p libavcodec-dev -plibavdevice-dev \
 		-plibavformat-dev -plibavfilter-dev -plibavresample-dev \
 		-plibswscale-dev -plibavutil-dev -plibav-doc \
@@ -230,12 +233,12 @@ endif
 	# operate e.g. the -extra- packages, produce shlibs that have alternative dependencies
 	for pkg in $(LIB_EXTRA_PKGS); do \
 	    npkg=$$(echo "$$pkg" | sed -r 's/-extra-//'); \
-	    dh_makeshlibs -p"$$pkg" -V"$$npkg (>= $(SHLIBS_VERSION)) | $$pkg (>= $(EPOCH):$(DEB_UPSTREAM_VERSION))"; \
+	    dh_makeshlibs -p"$$pkg" -V"$$npkg (>= $(SHLIBS_VERSION)) | $$pkg (>= $(EPOCH)$(UPSTREAM_VERSION))"; \
 	done
 	# operate on packages with -extra- variants such as libavcodec54 - produce shlibs that have alternative dependencies
 	for pkg in $(LIB_PKGS2); do \
 	    upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \
-	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION)) | $$upkg (>= $(EPOCH):$(DEB_UPSTREAM_VERSION))"; \
+	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION)) | $$upkg (>= $(EPOCH)$(UPSTREAM_VERSION))"; \
 	done
 	dh_shlibdeps
 	dh_installdeb

-- 
Libav/FFmpeg packaging