[SCM] liblo packaging branch, master, updated. debian/0.26.repack-2-7-gc2732a1

js at users.alioth.debian.org js at users.alioth.debian.org
Tue Mar 9 10:22:31 UTC 2010


The following commit has been merged in the master branch:
commit 02cb08a86deb570bb1a0acb0d0e6fa6737866a53
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Mar 9 10:40:43 2010 +0100

    Tighten and relax CDBS includes, to both use very newest features and be backports-friendly. Closes: bug#573131, thanks to Adam D. Barratt.

diff --git a/debian/cdbs/1/rules/upstream-tarball.mk b/debian/cdbs/1/rules/upstream-tarball.mk
deleted file mode 100644
index 2e8c73a..0000000
--- a/debian/cdbs/1/rules/upstream-tarball.mk
+++ /dev/null
@@ -1,148 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2007-2010 Jonas Smedegaard <dr at jones.dk>
-# Description: Convenience rules for dealing with upstream tarballs
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-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
-
-# 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)),$(DEB_UPSTREAM_VERSION:$(DEB_UPSTREAM_REPACKAGE_DELIMITER)$(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 filename (without extension) as used in upstream URL
-DEB_UPSTREAM_TARBALL_BASENAME = $(DEB_UPSTREAM_PACKAGE)-$(DEB_UPSTREAM_TARBALL_VERSION)
-
-# Perl regexp to change locally used string into that in upstream URL and srcdir
-#DEB_UPSTREAM_TARBALL_BASENAME_MANGLE =
-
-# Base directory within tarball
-DEB_UPSTREAM_TARBALL_SRCDIR = $(cdbs_upstream_tarball_basename)
-
-# 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 = ~
-
-# TODO: Move this to buildcore.mk
-cdbs_findargs-path-or-name = $(if $(findstring /,$(firstword $(1))),-path './$(patsubst ./%,%,$(firstword $(1)))',-name '$(firstword $(1))') $(foreach obj,$(wordlist 2,$(words $(1)),$(1)),-or $(if $(findstring /,$(obj)),-path './$(obj:./%=%)',-name '$(obj)'))
-
-cdbs_upstream_tarball_basename = $(if $(strip $(DEB_UPSTREAM_TARBALL_BASENAME_MANGLE)),$(shell echo '$(DEB_UPSTREAM_TARBALL_BASENAME)' | perl -pe '$(DEB_UPSTREAM_TARBALL_BASENAME_MANGLE)'),$(DEB_UPSTREAM_TARBALL_BASENAME))
-cdbs_upstream_tarball = $(cdbs_upstream_tarball_basename).$(DEB_UPSTREAM_TARBALL_EXTENSION)
-cdbs_upstream_received_tarball = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION).orig.$(if $(findstring $(DEB_UPSTREAM_TARBALL_EXTENSION),tgz),tar.gz,$(DEB_UPSTREAM_TARBALL_EXTENSION))
-cdbs_upstream_local_basename = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION)$(if $(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE)),$(DEB_UPSTREAM_REPACKAGE_DELIMITER)$(DEB_UPSTREAM_REPACKAGE_TAG))
-cdbs_upstream_local_srcdir = $(cdbs_upstream_tarball_basename)$(if $(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE)),$(DEB_UPSTREAM_REPACKAGE_DELIMITER)$(DEB_UPSTREAM_REPACKAGE_TAG))
-
-# # These variables are deprecated
-_cdbs_deprecated_vars += DEB_UPSTREAM_TARBALL DEB_UPSTREAM_LOCAL_TARBALL DEB_UPSTREAM_REPACKAGE_TARBALL DEB_UPSTREAM_TARBALL_VERSION_MANGLE
-_cdbs_deprecated_vars += DEB_UPSTREAM_REPACKAGE_EXCLUDES
-DEB_UPSTREAM_REPACKAGE_EXCLUDE += $(DEB_UPSTREAM_REPACKAGE_EXCLUDES)
-
-print-version:
-	@@echo "Debian version:          $(DEB_VERSION)"
-	@@echo "Upstream version:        $(DEB_UPSTREAM_TARBALL_VERSION)"
-
-get-orig-source:
-	@@dh_testdir
-	@@mkdir -p "$(DEB_UPSTREAM_WORKDIR)"
-
-	@if [ ! -s "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)" ] ; then \
-		if [ -f "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)" ] ; then \
-			rm "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)" ; \
-		fi ; \
-		echo "Downloading $(cdbs_upstream_received_tarball) from $(DEB_UPSTREAM_URL)/$(cdbs_upstream_tarball) ..." ; \
-		wget -nv -T10 -t3 -O "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)" "$(DEB_UPSTREAM_URL)/$(cdbs_upstream_tarball)" ; \
-	else \
-		echo "Upstream source tarball have been already downloaded: $(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)" ; \
-	fi
-
-	@md5current=`md5sum "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_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)/$(cdbs_upstream_received_tarball)" ; \
-			false ; \
-		else \
-			echo "Upstream tarball is trusted!" ; \
-		fi; \
-	else \
-		echo "Upstream tarball NOT trusted (current md5sum is $$md5current)!" ; \
-	fi
-
-# TODO: Rewrite using make variables like cdbs_upstream_unpack_cmd and
-# DEB_UPSTREAM_SUPPORTED_COMPRESSIONS (recent dpkg supports bz2)
-# TODO: Add .orig suffix to top folder inside tarball when only
-# recompressing (when $uncompress set and ...REPACKAGE_EXCLUDE unset)
-	@untar="tar -x -C"; \
-	case "$(cdbs_upstream_received_tarball)" in \
-	    *.tar.gz)  unpack="gunzip -c";; \
-	    *.tar.bz2) unpack="bunzip2 -c"; grep -q '3.0 (quilt)' debian/source/format || uncompress="bunzip2";; \
-	    *.tar.Z)   unpack="uncompress -c"; uncompress="uncompress";; \
-	    *.zip)     unpack="unzip -q";      uncompress="false";       untar="-d"; nopipe="true";; \
-	    *.tar)     unpack="cat";           uncompress="true";; \
-	    *) echo "Unknown extension for upstream tarball $(cdbs_upstream_received_tarball)"; false;; \
-	esac && \
-	if [ -n "$(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE))" ] || [ "$$uncompress" = "false" ]; then \
-		echo "Repackaging tarball ..." && \
-		mkdir -p "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" && \
-		if [ -n "$$nopipe" ]; then \
-			$$unpack "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)" \
-				$$untar "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(patsubst %,--exclude='%',$(DEB_UPSTREAM_REPACKAGE_EXCLUDE)); \
-		else \
-			$$unpack "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)" \
-				| $$untar "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(patsubst %,--exclude='%',$(DEB_UPSTREAM_REPACKAGE_EXCLUDE)); \
-		fi && \
-		if [ "$(DEB_UPSTREAM_TARBALL_SRCDIR)" != "$(cdbs_upstream_local_srcdir)" ]; then \
-			mv -T "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)/$(DEB_UPSTREAM_TARBALL_SRCDIR)" "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)/$(cdbs_upstream_local_srcdir)"; \
-		fi && \
-		GZIP=-9 tar -b1 -czf "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_basename).orig.tar.gz" -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" "$(cdbs_upstream_local_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_received_tarball)"; \
-		gzip -9 "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_basename).orig.tar"; \
-	fi
-
-fail-source-not-repackaged:
-	@if find . $(call cdbs_findargs-path-or-name,$(DEB_UPSTREAM_REPACKAGE_EXCLUDE)) | grep '.*'; then \
-		echo; \
-		echo 'ERROR: Source contains the files/paths listed above'; \
-		echo '       which was intended to not be distributed with the source.'; \
-		echo '       Please repackage source with these items stripped!'; \
-		echo '       (get-orig-source target can automate this - see README.source)'; \
-		exit 1; \
-	fi
-
-DEB_PHONY_RULES += print-version get-orig-source fail-source-not-repackaged
-
-endif
diff --git a/debian/rules b/debian/rules
index 5e9eb37..129fb8b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,11 +18,15 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-include debian/cdbs/1/rules/upstream-tarball.mk
-include /usr/share/cdbs/1/rules/copyright-check.mk
+-include /usr/share/cdbs/1/rules/upstream-tarball.mk
+include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/buildinfo.mk
+#include /usr/share/cdbs/1/rules/buildinfo.mk
+
+# suppress optional build-dependencies
+CDBS_BUILD_DEPENDS_upstream-tarball =
+CDBS_BUILD_DEPENDS_rules_buildinfo =
 
 DEB_UPSTREAM_URL = http://downloads.sourceforge.net/liblo
 

-- 
liblo packaging



More information about the pkg-multimedia-commits mailing list