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

[js at alioth.debian.org]

Author: js
Date: 2007-05-17 20:25:59 +0000 (Thu, 17 May 2007)
New Revision: 3573

Modified:
   srtp/trunk/debian/cdbs/1/rules/upstream-tarball.mk
   srtp/trunk/debian/changelog
   srtp/trunk/debian/control.in
   srtp/trunk/debian/rules
Log:
Update and improve cdbs tweaks.

Modified: srtp/trunk/debian/cdbs/1/rules/upstream-tarball.mk
===================================================================
--- srtp/trunk/debian/cdbs/1/rules/upstream-tarball.mk	2007-05-17 20:19:54 UTC (rev 3572)
+++ srtp/trunk/debian/cdbs/1/rules/upstream-tarball.mk	2007-05-17 20:25:59 UTC (rev 3573)
@@ -28,6 +28,7 @@
 #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_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)
 #DEB_UPSTREAM_TARBALL_MD5 = 
@@ -41,7 +42,7 @@
 #DEB_UPSTREAM_REPACKAGE_EXCLUDE = CVS .cvsignore doc/rfc*.txt doc/draft*.txt
 DEB_UPSTREAM_REPACKAGE_TAG = dfsg
 
-cdbs_upstream_tarball = $(DEB_UPSTREAM_PACKAGE)-$(DEB_UPSTREAM_TARBALL_VERSION).$(DEB_UPSTREAM_TARBALL_EXTENSION)
+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

Modified: srtp/trunk/debian/changelog
===================================================================
--- srtp/trunk/debian/changelog	2007-05-17 20:19:54 UTC (rev 3572)
+++ srtp/trunk/debian/changelog	2007-05-17 20:25:59 UTC (rev 3573)
@@ -2,6 +2,10 @@
 
   * Clean PDF files to not fail in repetitive builds. Closes:
     bug#424238.
+  * Improved cdbs tweaks:
+    + Move build-dependency hints ro debian/rules.
+    + Cleanup duplicate build-dependencies, to please lintian.
+    + Minor update to upstream-tarball.mk.
 
  -- Jonas Smedegaard <dr at jones.dk>  Thu, 17 May 2007 22:15:24 +0200
 

Modified: srtp/trunk/debian/control.in
===================================================================
--- srtp/trunk/debian/control.in	2007-05-17 20:19:54 UTC (rev 3572)
+++ srtp/trunk/debian/control.in	2007-05-17 20:25:59 UTC (rev 3573)
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr at jones.dk>
-Build-Depends: @cdbs@, doxygen, texlive-latex-recommended, texlive-fonts-recommended
+Build-Depends: @cdbs@
 Standards-Version: 3.7.2
 Section: libs
 XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/

Modified: srtp/trunk/debian/rules
===================================================================
--- srtp/trunk/debian/rules	2007-05-17 20:19:54 UTC (rev 3572)
+++ srtp/trunk/debian/rules	2007-05-17 20:25:59 UTC (rev 3573)
@@ -40,3 +40,9 @@
 
 clean::
 	rm -f doc/*.pdf
+
+# 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 '/\bcdbs (>= 0.4.27-1)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\))\( *, *\)\?/\2/g' -e 's/^ *, *//')