[Pkg-voip-commits] r3272 - srtp/trunk/debian/cdbs/1/rules

[Jonas Smedegaard]

Author: js
Date: 2007-03-21 11:45:56 +0000 (Wed, 21 Mar 2007)
New Revision: 3272

Modified:
   srtp/trunk/debian/cdbs/1/rules/upstream-tarball.mk
Log:
Update upstream-tarball.mk fixing broken deprecaction of DEB_UPSTREAM_REPACKAGE_EXCLUDES.

Modified: srtp/trunk/debian/cdbs/1/rules/upstream-tarball.mk
===================================================================
--- srtp/trunk/debian/cdbs/1/rules/upstream-tarball.mk	2007-03-21 10:50:55 UTC (rev 3271)
+++ srtp/trunk/debian/cdbs/1/rules/upstream-tarball.mk	2007-03-21 11:45:56 UTC (rev 3272)
@@ -32,7 +32,7 @@
 
 # Upstream may package their software using different naming scehems
 DEB_UPSTREAM_PACKAGE = $(DEB_SOURCE_PACKAGE)
-DEB_UPSTREAM_TARBALL_VERSION = $(if $(strip $($(DEB_UPSTREAM_REPACKAGE_EXCLUDES))),$(shell basename '$(DEB_UPSTREAM_VERSION)' '.$(DEB_UPSTREAM_REPACKAGE_TAG)'),$(DEB_UPSTREAM_VERSION))
+DEB_UPSTREAM_TARBALL_VERSION = $(if $(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE)),$(shell basename '$(DEB_UPSTREAM_VERSION)' '.$(DEB_UPSTREAM_REPACKAGE_TAG)'),$(DEB_UPSTREAM_VERSION))
 
 DEB_UPSTREAM_TARBALL_SRCDIR = $(DEB_UPSTREAM_PACKAGE)-$(DEB_UPSTREAM_TARBALL_VERSION)
 DEB_UPSTREAM_TARBALL_EXTENSION = tar.gz
@@ -48,6 +48,7 @@
 
 # # This variable is deprecated
 _cdbs_deprecated_vars += DEB_UPSTREAM_REPACKAGE_EXCLUDES
+DEB_UPSTREAM_REPACKAGE_EXCLUDE += $(DEB_UPSTREAM_REPACKAGE_EXCLUDES)
 
 DEB_UPSTREAM_WORKDIR = ../tarballs
 
@@ -81,15 +82,17 @@
 		echo "Upstream tarball NOT trusted (current md5sum is $$md5current)!" ; \
 	fi
 
-	@if [ -n "$(strip $(#DEB_UPSTREAM_REPACKAGE_EXCLUDES))" ]; then \
+	@if [ -n "$(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE))" ]; then \
 		echo "Repackaging tarball ..." && \
 		mkdir -p "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" && \
-		case "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_LOCAL_TARBALL)" in \
-		    *.tar.Z) uncompress -c "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_LOCAL_TARBALL)" | tar -x -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(patsubst %,--exclude='%',$(DEB_UPSTREAM_REPACKAGE_EXCLUDES));; \
-		    *.tar.bz2) tar --bzip2 -xf "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_LOCAL_TARBALL)" -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(patsubst %,--exclude='%',$(DEB_UPSTREAM_REPACKAGE_EXCLUDES));; \
-		    *.tar.gz|tgz) tar -xzf "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_LOCAL_TARBALL)" -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(patsubst %,--exclude='%',$(DEB_UPSTREAM_REPACKAGE_EXCLUDES));; \
-		    *) echo "Unknown extension for upstream tarball $(DEB_UPSTREAM_LOCAL_TARBALL)";; \
+		case "$(DEB_UPSTREAM_LOCAL_TARBALL)" in \
+		    *.tar.Z) unpack="uncompress -c";; \
+		    *.tar.bz2) unpack="bunzip2 -c";; \
+		    *.tar.gz|*.tgz) unpack="gunzip -c";; \
+		    *) echo "Unknown extension for upstream tarball $(DEB_UPSTREAM_LOCAL_TARBALL)"; false;; \
 		esac && \
+		$$unpack "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_LOCAL_TARBALL)" \
+			| tar -x -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(patsubst %,--exclude='%',$(DEB_UPSTREAM_REPACKAGE_EXCLUDE)) && \
 		GZIP=-9 tar -b1 -czf "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TARBALL)" -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(DEB_UPSTREAM_TARBALL_SRCDIR) && \
 		echo "Cleaning up" && \
 		rm -rf "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)"; \