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

[Jonas Smedegaard]

Author: js
Date: 2007-03-21 10:39:28 +0000 (Wed, 21 Mar 2007)
New Revision: 3269

Modified:
   srtp/trunk/debian/cdbs/1/rules/upstream-tarball.mk
Log:
Whoops - actually use the very newest upstream-tarball.mk (deprecating DEB_UPSTREAM_REPACKAGE_EXCLUDES) in favor of DEB_UPSTREAM_REPACKAGE_EXCLUDE.

Modified: srtp/trunk/debian/cdbs/1/rules/upstream-tarball.mk
===================================================================
--- srtp/trunk/debian/cdbs/1/rules/upstream-tarball.mk	2007-03-21 10:37:36 UTC (rev 3268)
+++ srtp/trunk/debian/cdbs/1/rules/upstream-tarball.mk	2007-03-21 10:39:28 UTC (rev 3269)
@@ -30,15 +30,9 @@
 # Base URL for downloading upstream tarballs
 #DEB_UPSTREAM_URL = 
 
-# Suffix to add to repackaged tarball
-#DEB_UPSTREAM_REPACKAGE_TAG = dfsg
-
-# Space-delimited list of directories and files to strip from repackaged tarball
-#DEB_UPSTREAM_REPACKAGE_EXCLUDES = CVS .cvsignore doc/rfc*.txt doc/draft*.txt
-
 # Upstream may package their software using different naming scehems
 DEB_UPSTREAM_PACKAGE = $(DEB_SOURCE_PACKAGE)
-DEB_UPSTREAM_TARBALL_VERSION = $(shell basename '$(DEB_UPSTREAM_VERSION)' '.$(DEB_UPSTREAM_REPACKAGE_TAG)')
+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_SRCDIR = $(DEB_UPSTREAM_PACKAGE)-$(DEB_UPSTREAM_TARBALL_VERSION)
 DEB_UPSTREAM_TARBALL_EXTENSION = tar.gz
@@ -46,8 +40,15 @@
 DEB_UPSTREAM_TARBALL = $(DEB_UPSTREAM_PACKAGE)-$(DEB_UPSTREAM_TARBALL_VERSION).$(DEB_UPSTREAM_TARBALL_EXTENSION)
 cdbs_upstream_tarball_base = $(basename $(DEB_UPSTREAM_TARBALL))
 DEB_UPSTREAM_LOCAL_TARBALL = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION).orig.$(DEB_UPSTREAM_TARBALL_EXTENSION)
+
+# Provide a space-delimited list of directories and files to strip them in new repackaged tarball
+#DEB_UPSTREAM_REPACKAGE_EXCLUDE = CVS .cvsignore doc/rfc*.txt doc/draft*.txt
+DEB_UPSTREAM_REPACKAGE_TAG = dfsg
 DEB_UPSTREAM_REPACKAGE_TARBALL = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION).$(DEB_UPSTREAM_REPACKAGE_TAG).orig.tar.gz
 
+# # This variable is deprecated
+_cdbs_deprecated_vars += DEB_UPSTREAM_REPACKAGE_EXCLUDES
+
 DEB_UPSTREAM_WORKDIR = ../tarballs
 
 print-version:
@@ -80,7 +81,7 @@
 		echo "Upstream tarball NOT trusted (current md5sum is $$md5current)!" ; \
 	fi
 
-	@if [ -n "$(DEB_UPSTREAM_REPACKAGE_TAG)" ]; then \
+	@if [ -n "$(strip $(#DEB_UPSTREAM_REPACKAGE_EXCLUDES))" ]; then \
 		echo "Repackaging tarball ..." && \
 		mkdir -p "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" && \
 		case "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_LOCAL_TARBALL)" in \