[Pkg-voip-commits] r4384 - in srtp/trunk/debian: . cdbs/1/rules

js at alioth.debian.org js at alioth.debian.org
Sun Sep 2 21:15:00 UTC 2007 

Author: js
Date: 2007-09-02 21:15:00 +0000 (Sun, 02 Sep 2007)
New Revision: 4384

Modified:
   srtp/trunk/debian/cdbs/1/rules/upstream-tarball.mk
   srtp/trunk/debian/changelog
   srtp/trunk/debian/control
   srtp/trunk/debian/rules
Log:
* Update cdbs tweaks:
  + Various improvements to update-tarball.
* Better duplicate build-dependency cleanup in debian/rules, and semi-
  auto-update debian/control:
    DEB_BUILD_OPTIONS=cdbs-autoupdate fakeroot debian/rules pre-build

Modified: srtp/trunk/debian/cdbs/1/rules/upstream-tarball.mk
===================================================================
--- srtp/trunk/debian/cdbs/1/rules/upstream-tarball.mk	2007-09-02 21:14:43 UTC (rev 4383)
+++ srtp/trunk/debian/cdbs/1/rules/upstream-tarball.mk	2007-09-02 21:15:00 UTC (rev 4384)
@@ -24,10 +24,14 @@
 ifndef _cdbs_rules_upstream_tarball
 _cdbs_rules_upstream_tarball := 1
 
+include $(_cdbs_rules_path)/buildvars.mk$(_cdbs_makefile_suffix)
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.39)
+
 # Prefix for upstream location of all upstream tarballs (mandatory!)
 #DEB_UPSTREAM_URL = 
 DEB_UPSTREAM_PACKAGE = $(DEB_SOURCE_PACKAGE)
-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_VERSION = $(if $(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE)),$(DEB_UPSTREAM_VERSION:$(DEB_UPSTREAM_REPACKAGE_DELIMITER)$(DEB_UPSTREAM_REPACKAGE_TAG)=),$(DEB_UPSTREAM_VERSION))
 DEB_UPSTREAM_TARBALL_BASENAME = $(DEB_UPSTREAM_PACKAGE)-$(DEB_UPSTREAM_TARBALL_VERSION)
 DEB_UPSTREAM_TARBALL_EXTENSION = tar.gz
 # Checksum to ensure integrity of downloadeds using get-orig-source (optional)
@@ -41,11 +45,12 @@
 # Space-delimited list of directories and files to strip (optional)
 #DEB_UPSTREAM_REPACKAGE_EXCLUDE = CVS .cvsignore doc/rfc*.txt doc/draft*.txt
 DEB_UPSTREAM_REPACKAGE_TAG = dfsg
+DEB_UPSTREAM_REPACKAGE_DELIMITER = .
 
 cdbs_upstream_tarball = $(DEB_UPSTREAM_TARBALL_BASENAME).$(DEB_UPSTREAM_TARBALL_EXTENSION)
-cdbs_upstream_local_tarball = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.$(if $(findstring $(DEB_UPSTREAM_TARBALL_EXTENSION),tgz),tar.gz,$(DEB_UPSTREAM_TARBALL_EXTENSION))
-cdbs_upstream_repackaged_tarball = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).$(DEB_UPSTREAM_REPACKAGE_TAG).orig.tar.gz
-cdbs_upstream_uncompressed_tarball = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar
+cdbs_upstream_local_tarball = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION).orig.$(if $(findstring $(DEB_UPSTREAM_TARBALL_EXTENSION),tgz),tar.gz,$(DEB_UPSTREAM_TARBALL_EXTENSION))
+cdbs_upstream_repackaged_tarball = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION)$(DEB_UPSTREAM_REPACKAGE_DELIMITER)$(DEB_UPSTREAM_REPACKAGE_TAG).orig.tar.gz
+cdbs_upstream_uncompressed_tarball = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION).orig.tar
 
 # # These variables are deprecated
 _cdbs_deprecated_vars += DEB_UPSTREAM_TARBALL DEB_UPSTREAM_LOCAL_TARBALL DEB_UPSTREAM_REPACKAGE_TARBALL
@@ -60,7 +65,10 @@
 	@@dh_testdir
 	@@mkdir -p "$(DEB_UPSTREAM_WORKDIR)"
 
-	@if [ ! -f "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ] ; then \
+	@if [ ! -s "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ] ; then \
+		if [ -f "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ] ; then \
+			rm "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ; \
+		fi ; \
 		echo "Downloading $(cdbs_upstream_local_tarball) from $(DEB_UPSTREAM_URL)/$(cdbs_upstream_tarball) ..." ; \
 		wget -N -nv -T10 -t3 -O "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" "$(DEB_UPSTREAM_URL)/$(cdbs_upstream_tarball)" ; \
 	else \
@@ -94,7 +102,7 @@
 		mkdir -p "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" && \
 		$$unpack "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" \
 			| tar -x -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(patsubst %,--exclude='%',$(DEB_UPSTREAM_REPACKAGE_EXCLUDE)) && \
-		GZIP=-9 tar -b1 -czf "$(cdbs_upstream_repackaged_tarball)" -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(DEB_UPSTREAM_TARBALL_SRCDIR) && \
+		GZIP=-9 tar -b1 -czf "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_repackaged_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)"; \
 	elif [ -n "$$uncompress" ]; then \

Modified: srtp/trunk/debian/changelog
===================================================================
--- srtp/trunk/debian/changelog	2007-09-02 21:14:43 UTC (rev 4383)
+++ srtp/trunk/debian/changelog	2007-09-02 21:15:00 UTC (rev 4384)
@@ -1,6 +1,11 @@
 srtp (1.4.2.dfsg-5) UNRELEASED; urgency=low
 
   * Fix XS-Vcs-Svn and XS-Vcs-Browser fields in debian/control.
+  * Update cdbs tweaks:
+    + Various improvements to update-tarball.
+  * Better duplicate build-dependency cleanup in debian/rules, and semi-
+    auto-update debian/control:
+      DEB_BUILD_OPTIONS=cdbs-autoupdate fakeroot debian/rules pre-build
 
  -- Jonas Smedegaard <dr at jones.dk>  Mon, 27 Aug 2007 13:21:17 +0200
 

Modified: srtp/trunk/debian/control
===================================================================
--- srtp/trunk/debian/control	2007-09-02 21:14:43 UTC (rev 4383)
+++ srtp/trunk/debian/control	2007-09-02 21:15:00 UTC (rev 4384)
@@ -2,11 +2,11 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr at jones.dk>
-Build-Depends: autotools-dev, debhelper (>= 4.2.0), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1), dh-buildinfo, doxygen, texlive-latex-recommended, texlive-fonts-recommended
+Build-Depends: autotools-dev, debhelper (>= 4.2.0), quilt, patchutils (>= 0.2.25), dh-buildinfo, cdbs (>= 0.4.39), doxygen, texlive-latex-recommended, texlive-fonts-recommended
 Standards-Version: 3.7.2
 Section: libs
-XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/
+XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/srtp/trunk
+XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/srtp/trunk
 
 Package: libsrtp1-dev
 Section: devel

Modified: srtp/trunk/debian/rules
===================================================================
--- srtp/trunk/debian/rules	2007-09-02 21:14:43 UTC (rev 4383)
+++ srtp/trunk/debian/rules	2007-09-02 21:15:00 UTC (rev 4384)
@@ -44,5 +44,5 @@
 # Needed by upstream build
 CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), doxygen, texlive-latex-recommended, texlive-fonts-recommended
 
-# Cleanup duplicate dependencies to please lintian and ftp-masters
-CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.27-1)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\))\( *, *\)\?/\2/g' -e 's/^ *, *//')
+# Fix double cdbs build-dependencies
+CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.39)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\|0.4.27-1\)) *,* */, /g' -e 's/^ *, *//' -e 's/ *, *$$//')

More information about the Pkg-voip-commits mailing list