[Pkg-voip-commits] r3449 - in srtp/trunk/debian: . cdbs/1/rules
Jonas Smedegaard
js at alioth.debian.org
Sun Apr 22 23:32:02 UTC 2007
Author: js
Date: 2007-04-22 23:32:02 +0000 (Sun, 22 Apr 2007)
New Revision: 3449
Modified:
srtp/trunk/debian/README.cdbs-tweaks
srtp/trunk/debian/cdbs/1/rules/upstream-tarball.mk
srtp/trunk/debian/changelog
Log:
Update local cdbs snippets.
Modified: srtp/trunk/debian/README.cdbs-tweaks
===================================================================
--- srtp/trunk/debian/README.cdbs-tweaks 2007-04-22 23:28:46 UTC (rev 3448)
+++ srtp/trunk/debian/README.cdbs-tweaks 2007-04-22 23:32:02 UTC (rev 3449)
@@ -46,7 +46,7 @@
Improved support for multiple compilations
------------------------------------------
-Create and clean builddir _after_ resolvong per-package DEB_BUILDDIR.
+Create and clean builddir _after_ resolving per-package DEB_BUILDDIR.
Honour per-package DEB_BUILDDIR in makefile class.
@@ -104,3 +104,10 @@
Include BTS control info found in debian/*.bts files, or alternatively
redirect bug reports to the email address defined in DEB_BTS_EMAIL.
+
+
+
+New dict class
+--------------
+
+Rules for packaging ispell, aspell, myspell and wordlist dictionaries.
Modified: srtp/trunk/debian/cdbs/1/rules/upstream-tarball.mk
===================================================================
--- srtp/trunk/debian/cdbs/1/rules/upstream-tarball.mk 2007-04-22 23:28:46 UTC (rev 3448)
+++ srtp/trunk/debian/cdbs/1/rules/upstream-tarball.mk 2007-04-22 23:32:02 UTC (rev 3449)
@@ -24,34 +24,33 @@
ifndef _cdbs_rules_upstream_tarball
_cdbs_rules_upstream_tarball := 1
-# Write the md5sum of the downloaded tarball, to ensure all build from identical source
-#DEB_UPSTREAM_TARBALL_MD5 =
-
-# Base URL for downloading upstream tarballs
+# Prefix for upstream location of all upstream tarballs (mandatory!)
#DEB_UPSTREAM_URL =
-
-# Upstream may package their software using different naming scehems
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_EXTENSION = tar.gz
+# Checksum to ensure integrity of downloadeds using get-orig-source (optional)
+#DEB_UPSTREAM_TARBALL_MD5 =
+DEB_UPSTREAM_WORKDIR = ../tarballs
+
+# Base directory within tarball
DEB_UPSTREAM_TARBALL_SRCDIR = $(DEB_UPSTREAM_PACKAGE)-$(DEB_UPSTREAM_TARBALL_VERSION)
-DEB_UPSTREAM_TARBALL_EXTENSION = tar.gz
-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
+# 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_TARBALL = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION).$(DEB_UPSTREAM_REPACKAGE_TAG).orig.tar.gz
-# # This variable is deprecated
+cdbs_upstream_tarball = $(DEB_UPSTREAM_PACKAGE)-$(DEB_UPSTREAM_TARBALL_VERSION).$(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
+
+# # These variables are deprecated
+_cdbs_deprecated_vars += DEB_UPSTREAM_TARBALL DEB_UPSTREAM_LOCAL_TARBALL DEB_UPSTREAM_REPACKAGE_TARBALL
_cdbs_deprecated_vars += DEB_UPSTREAM_REPACKAGE_EXCLUDES
DEB_UPSTREAM_REPACKAGE_EXCLUDE += $(DEB_UPSTREAM_REPACKAGE_EXCLUDES)
-DEB_UPSTREAM_WORKDIR = ../tarballs
-
print-version:
@@echo "Debian version: $(DEB_VERSION)"
@@echo "Upstream version: $(DEB_UPSTREAM_TARBALL_VERSION)"
@@ -60,20 +59,20 @@
@@dh_testdir
@@mkdir -p "$(DEB_UPSTREAM_WORKDIR)"
- @if [ ! -f "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_LOCAL_TARBALL)" ] ; then \
- echo "Downloading $(DEB_UPSTREAM_LOCAL_FILENAME) from $(DEB_UPSTREAM_URL)/$(DEB_UPSTREAM_TARBALL) ..." ; \
- wget -N -nv -T10 -t3 -O "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_LOCAL_TARBALL)" "$(DEB_UPSTREAM_URL)/$(DEB_UPSTREAM_TARBALL)" ; \
+ @if [ ! -f "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ] ; then \
+ 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 \
- echo "Upstream source tarball have been already downloaded: $(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_LOCAL_TARBALL)" ; \
+ echo "Upstream source tarball have been already downloaded: $(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ; \
fi
- @md5current=`md5sum "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_LOCAL_TARBALL)" | sed -e 's/ .*//'`; \
+ @md5current=`md5sum "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" | sed -e 's/ .*//'`; \
if [ -n "$(DEB_UPSTREAM_TARBALL_MD5)" ] ; then \
if [ "$$md5current" != "$(DEB_UPSTREAM_TARBALL_MD5)" ] ; then \
echo "Expecting upstream tarball md5sum $(DEB_UPSTREAM_TARBALL_MD5), but $$md5current found" ; \
echo "Upstream tarball md5sum is NOT trusted! Possible upstream tarball forge!" ; \
echo "Purging downloaded file. Try new download." ; \
- rm -f "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_LOCAL_TARBALL)" ; \
+ rm -f "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ; \
false ; \
else \
echo "Upstream tarball is trusted!" ; \
@@ -82,20 +81,25 @@
echo "Upstream tarball NOT trusted (current md5sum is $$md5current)!" ; \
fi
- @if [ -n "$(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE))" ]; then \
+ @case "$(cdbs_upstream_local_tarball)" in \
+ *.tar.gz) unpack="gunzip -c";; \
+ *.tar.bz2) unpack="bunzip2 -c"; uncompress="bunzip2";; \
+ *.tar.Z) unpack="uncompress -c"; uncompress="uncompress";; \
+ *.tar) unpack="cat"; uncompress="true";; \
+ *) echo "Unknown extension for upstream tarball $(cdbs_upstream_local_tarball)"; false;; \
+ esac && \
+ if [ -n "$(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE))" ]; then \
echo "Repackaging tarball ..." && \
mkdir -p "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" && \
- 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)" \
+ $$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 "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TARBALL)" -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(DEB_UPSTREAM_TARBALL_SRCDIR) && \
+ GZIP=-9 tar -b1 -czf "$(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 \
+ echo "Recompressing tarball ..." && \
+ $$uncompress "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)"; \
+ bzip -9 "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_uncompressed_tarball)"; \
fi
DEB_PHONY_RULES += print-version get-orig-source
Modified: srtp/trunk/debian/changelog
===================================================================
--- srtp/trunk/debian/changelog 2007-04-22 23:28:46 UTC (rev 3448)
+++ srtp/trunk/debian/changelog 2007-04-22 23:32:02 UTC (rev 3449)
@@ -2,6 +2,7 @@
* Avoid useless Build-Depends-Indep (use Build-Depends always).
Closes: bug#420517, thanks to Kurt Roeckx.
+ * Update local cdbs snippets.
-- Jonas Smedegaard <dr at jones.dk> Wed, 21 Mar 2007 14:57:31 +0100
More information about the Pkg-voip-commits
mailing list