[SCM] calf audio plugins packaging branch, master, updated. debian/0.0.18.5-1-5-g02643fa

js at users.alioth.debian.org js at users.alioth.debian.org
Mon May 17 17:30:23 UTC 2010


The following commit has been merged in the master branch:
commit 9a1fbdc26c8084f1c94975564614e34b9086aa31
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri May 14 11:30:52 2010 +0200

    Drop local CDBS snippets and locally declared DEB_MAINTAINER_MODE: All part of main CDBS now.

diff --git a/debian/cdbs/1/rules/buildinfo.mk b/debian/cdbs/1/rules/buildinfo.mk
deleted file mode 100644
index b1298cc..0000000
--- a/debian/cdbs/1/rules/buildinfo.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2004-2007 Jonas Smedegaard <dr at jones.dk>
-# Description: Generate and include build information
-#
-# 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-_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_buildinfo
-_cdbs_rules_buildinfo = 1
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), dh-buildinfo
-
-common-install-arch common-install-indep:: debian/stamp-buildinfo
-
-debian/stamp-buildinfo:
-	dh_buildinfo
-	touch debian/stamp-buildinfo
-
-clean::
-	rm -f debian/stamp-buildinfo
-
-endif
diff --git a/debian/cdbs/1/rules/copyright-check.mk b/debian/cdbs/1/rules/copyright-check.mk
deleted file mode 100644
index 511c884..0000000
--- a/debian/cdbs/1/rules/copyright-check.mk
+++ /dev/null
@@ -1,122 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2005-2010 Jonas Smedegaard <dr at jones.dk>
-# Description: Check for changes to copyright notices in source
-#
-# 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-_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_copyright_check
-_cdbs_rules_copyright_check := 1
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), devscripts (>= 2.10.7)
-
-# Set to yes to fail on changed/new hints are found
-#DEB_COPYRIGHT_CHECK_STRICT := yes
-
-# Single regular expression for files to include or ignore
-DEB_COPYRIGHT_CHECK_REGEX = .*
-#DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^(debian/.*|(.*/)?config\.(guess|sub|rpath)(\..*)?)$
-DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^debian/(changelog|copyright(|_hints|_newhints))$
-
-# number of lines from the top of each file to investigate
-DEB_COPYRIGHT_CHECK_PARSELINES = 99999
-
-pre-build:: debian/stamp-copyright-check
-
-debian/stamp-copyright-check:
-	@echo 'Scanning upstream source for new/changed copyright notices...'
-	@echo licensecheck -c '$(DEB_COPYRIGHT_CHECK_REGEX)' -r --copyright -i '$(DEB_COPYRIGHT_CHECK_IGNORE_REGEX)' -l '$(DEB_COPYRIGHT_CHECK_PARSELINES)' * \
-		"| some-output-filtering..."
-
-# Perl in shell in make requires extra care:
-#  * Single-quoting ('...') protects against shell expansion
-#  * Double-dollar ($$) expands to plain dollar ($) in make
-	@licensecheck -c '$(DEB_COPYRIGHT_CHECK_REGEX)' -r --copyright -i '$(DEB_COPYRIGHT_CHECK_IGNORE_REGEX)' -l '$(DEB_COPYRIGHT_CHECK_PARSELINES)' * \
-		| LC_ALL=C perl -e \
-	'print "Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135\n";'\
-	'print "X-Draft: Autogenerated by copyright-check.mk - do not trust as-is!\n\n";'\
-	'$$n=0; while (<>) {'\
-	'	if (/^([^:\s][^:]+):[\s]+(\S.*?)\s*$$/) {'\
-	'		$$files[$$n]{name}=$$1;'\
-	'		$$files[$$n]{license}=$$2;'\
-	'	};'\
-	'	if (/^\s*\[Copyright:\s*(\S.*?)\s*\]/) {'\
-	'		$$files[$$n]{copyright}=$$1;'\
-	'	};'\
-	'	/^$$/ and $$n++;'\
-	'};'\
-	'foreach $$file (@files) {'\
-	'	$$file->{license} =~ s/\s*\(with incorrect FSF address\)//;'\
-	'	$$file->{license} =~ s/\s+\(v([^)]+) or later\)/-$$1+/;'\
-	'	$$file->{license} =~ s/\s+\(v([^)]+)\)/-$$1/;'\
-	'	$$file->{license} =~ s/\s*(\*No copyright\*)\s*// and $$file->{copyright} = $$1;'\
-	'	$$file->{license} =~ s/^\s*(GENERATED FILE)/UNKNOWN/;'\
-	'	$$file->{license} =~ s/\s+(GENERATED FILE)//;'\
-	'	$$file->{copyright} =~ s/(?<=(\b\d{4}))(?{$$y=$$^N})\s*[,-]\s*((??{$$y+1}))\b/-$$2/g;'\
-	'	$$file->{copyright} =~ s/(?<=\b\d{4})\s*-\s*\d{4}(?=\s*-\s*(\d{4})\b)//g;'\
-	'	$$file->{copyright} =~ s/\b(\d{4}),?\s+([\S^\d])/$$1, $$2/g;'\
-	'	my @ownerlines = grep {/\w\w/} split /\s\/\s/, $$file->{copyright};'\
-	'	my %owneryears = ();'\
-	'	for $$ownerline ( @ownerlines ) {'\
-	'		my ($$owneryear, $$owner) = $$ownerline =~ /^([\d-,\s]*)\s*+(.*)/;'\
-	'		push @{ $$owneryears{"$$owner"} }, $$owneryear;'\
-	'	};'\
-	'	my @owners = sort keys %owneryears;'\
-	'	my $$pattern = join ("\n", $$file->{license}, @owners);'\
-	'	push @{ $$patternfiles{"$$pattern"} }, $$file->{name};'\
-	'	push @{ $$patternownerlines{"$$pattern"} }, @ownerlines;'\
-	'	$$patternlicense{"$$pattern"} = $$file->{license};'\
-	'};'\
-	'foreach $$pattern ( sort {'\
-	'			@{$$patternfiles{$$b}} <=> @{$$patternfiles{$$a}}'\
-	'			||'\
-	'			$$a cmp $$b'\
-	'		} keys %patternfiles ) {'\
-	'	my $$prev;'\
-	'	@ownerlines_unique = grep($$_ ne $$prev && (($$prev) = $$_), sort @{ $$patternownerlines{$$pattern} });'\
-	'	print "Files: ", join(",\n\t", sort @{ $$patternfiles{$$pattern} }), "\n";'\
-	'	print "Copyright: ", join("\n\t", @ownerlines_unique), "\n";'\
-	'	print "License: $$patternlicense{$$pattern}\n\n";'\
-	'};'\
-		> debian/copyright_newhints
-	@patterncount="`cat debian/copyright_newhints | sed 's/^[^:]*://' | LANG=C sort -u | grep . -c -`"; \
-		echo "Found $$patterncount different copyright and licensing combinations."
-	@if [ ! -f debian/copyright_hints ]; then touch debian/copyright_hints; fi
-	@newstrings=`diff -u debian/copyright_hints debian/copyright_newhints | sed '1,2d' | egrep '^\+' - | sed 's/^\+//'`; \
-		if [ -n "$$newstrings" ]; then \
-			echo "$(if $(DEB_COPYRIGHT_CHECK_STRICT),ERROR,WARNING): The following new or changed copyright notices discovered:"; \
-			echo; \
-			echo "$$newstrings" | cat -v; \
-			echo; \
-			echo "To fix the situation please do the following:"; \
-			echo "  1) Investigate the above changes and update debian/copyright as needed"; \
-			echo "  2) Replace debian/copyright_hints with debian/copyright_newhints"; \
-			$(if $(DEB_COPYRIGHT_CHECK_STRICT),exit 1,:); \
-		else \
-			echo 'No new copyright notices found - assuming no news is good news...'; \
-			rm -f debian/copyright_newhints; \
-		fi
-	touch $@
-
-clean::
-	rm -f debian/stamp-copyright-check
-
-endif
diff --git a/debian/cdbs/1/rules/package-relations.mk b/debian/cdbs/1/rules/package-relations.mk
deleted file mode 100644
index 8233f97..0000000
--- a/debian/cdbs/1/rules/package-relations.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2008 Jonas Smedegaard <dr at jones.dk>
-# Description: Resolve, cleanup and apply package relationships
-#
-# 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-_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_package_relations
-_cdbs_rules_package_relations = 1
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-# workaround for shell function choking on parens in regex
-leftparens = (
-
-# Merge build-dependencies on same packages
-# TODO: rewrite (in perl, probably) to be more generic
-CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.53)/ s/\bcdbs *\(,\|(>= \(0.4.23-1.1\|0.4.27\|0.4.39\|0.4.43\))\)/, /g')
-CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e 's/\bcdbs *\(,\|(>= \(0.4.23-1.1\|0.4.27\|0.4.39\|0.4.43\))\)/cdbs, /g')
-CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bdebhelper (>= 7.0.1)/ s/\bdebhelper *\(,\|(>= \(4.1.60\|4.2.0\|4.2.21\|4.2.28\|5\|5.0.37.2\|5.0.44\|6\))\)/, /g')
-CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bdebhelper (>= 6)/ s/\bdebhelper *\(,\|(>= \(4.1.60\|4.2.0\|4.2.21\|4.2.28\|5\|5.0.37.2\|5.0.44\))\)/, /g')
-CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bdebhelper (>= 5.0.44)/ s/\bdebhelper *\(,\|(>= \(4.1.60\|4.2.0\|4.2.21\|4.2.28\|5\|5.0.37.2\))\)/, /g')
-CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e 's/\bdebhelper *\(,\|(>= \(4.1.60\|4.2.0\|4.2.21\|4.2.28\|5\|5.0.37.2\))\)/debhelper, /g')
-
-# Strip unversioned build-dependencies if repeated (versioned or not)
-# TODO: also strip unversioned build-dependency followed by versioned one
-CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | perl -pe 's/((?<=\A)|(?<=,)) *(\w+) *,(?=([^,]*,)*? *\2 *(\$(leftparens)|,|\Z))//g')
-
-# TODO: Move these to buildcore.mk
-cdbs_curvar = $(or $($(1)_$(cdbs_curpkg)),$($1))
-cdbs_squash_commas = $(shell echo '$1' | sed -e 's/ *,[ ,]*/, /g' -e 's/^[ ,]*//' -e 's/[ ,]*$$//')
-
-# Cleanup superfluous commas and whitespace
-CDBS_BUILD_DEPENDS := $(call cdbs_squash_commas,$(CDBS_BUILD_DEPENDS))
-
-comma = ,
-cdbs_all_cur_squash_commas = $(call cdbs_squash_commas,$($(1)_ALL)$(comma) $(call cdbs_curvar,$1))
-
-# Apply CDBS-declared dependencies to binary packages
-$(patsubst %,binary-predeb/%,$(DEB_PACKAGES)) :: binary-predeb/%:
-	@echo 'Adding cdbs dependencies to debian/$(cdbs_curpkg).substvars'
-	@echo 'cdbs:Depends=$(call cdbs_all_cur_squash_commas,CDBS_DEPENDS)' >> debian/$(cdbs_curpkg).substvars
-	@echo 'cdbs:Pre-Depends=$(call cdbs_all_cur_squash_commas,CDBS_PREDEPENDS)' >> debian/$(cdbs_curpkg).substvars
-	@echo 'cdbs:Recommends=$(call cdbs_all_cur_squash_commas,CDBS_RECOMMENDS)' >> debian/$(cdbs_curpkg).substvars
-	@echo 'cdbs:Suggests=$(call cdbs_all_cur_squash_commas,CDBS_SUGGESTS)' >> debian/$(cdbs_curpkg).substvars
-	@echo 'cdbs:Breaks=$(call cdbs_all_cur_squash_commas,CDBS_BREAKS)' >> debian/$(cdbs_curpkg).substvars
-	@echo 'cdbs:Provides=$(call cdbs_all_cur_squash_commas,CDBS_PROVIDES)' >> debian/$(cdbs_curpkg).substvars
-	@echo 'cdbs:Replaces=$(call cdbs_all_cur_squash_commas,CDBS_REPLACES)' >> debian/$(cdbs_curpkg).substvars
-	@echo 'cdbs:Conflicts=$(call cdbs_all_cur_squash_commas,CDBS_CONFLICTS)' >> debian/$(cdbs_curpkg).substvars
-	@echo 'cdbs:Enhances=$(call cdbs_all_cur_squash_commas,CDBS_ENHANCES)' >> debian/$(cdbs_curpkg).substvars
-
-endif
diff --git a/debian/cdbs/1/rules/upstream-tarball.mk b/debian/cdbs/1/rules/upstream-tarball.mk
deleted file mode 100644
index be6c940..0000000
--- a/debian/cdbs/1/rules/upstream-tarball.mk
+++ /dev/null
@@ -1,150 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2007-2008 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-_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 5806357..b0548ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,16 +19,10 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 # 02111-1307 USA.
 
-ifneq (,$(DEB_MAINTAINER_MODE))
-  # Enable stuff not policy compliant (eg. unsuitable for build daemons)
-  DEB_COPYRIGHT_CHECK_STRICT = yes
-  DEB_AUTO_UPDATE_DEBIAN_CONTROL = yes
-endif
-include debian/cdbs/1/rules/upstream-tarball.mk
-include debian/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 debian/cdbs/1/rules/buildinfo.mk
 
 DEB_UPSTREAM_URL = http://downloads.sourceforge.net/calf
 
@@ -61,6 +55,3 @@ CDBS_BUILD_DEPENDS += , ladspa-sdk, dssi-dev, libjack-dev (>= 0.103.0), liblash-
 #  * devscript needed by pkgarchs.sh (only really needed for maintainer
 #    builds, but adding always as it won't hurt and avoids confusion)
 CDBS_BUILD_DEPENDS += , devscripts
-
-# Resolve, cleanup and apply CDBS-declared dependencies
-include debian/cdbs/1/rules/package-relations.mk

-- 
calf audio plugins packaging



More information about the pkg-multimedia-commits mailing list