r30071 - in /trunk/libconfig-inifiles-perl/debian: README.cdbs-tweaks cdbs/1/rules/buildinfo.mk cdbs/1/rules/copyright-check.mk cdbs/1/rules/upstream-tarball.mk changelog
js at users.alioth.debian.org
js at users.alioth.debian.org
Sat Jan 24 20:29:30 UTC 2009
Author: js
Date: Sat Jan 24 20:29:26 2009
New Revision: 30071
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=30071
Log:
* Update CDBS snippets:
+ Update copyright-check output to more closely match proposed new
copyright file format
+ Simplify internal variables
+ Ignore no files by default in copyright-check.mk
+ Correct and update copyright hints of the snippets themselves
Modified:
trunk/libconfig-inifiles-perl/debian/README.cdbs-tweaks
trunk/libconfig-inifiles-perl/debian/cdbs/1/rules/buildinfo.mk
trunk/libconfig-inifiles-perl/debian/cdbs/1/rules/copyright-check.mk
trunk/libconfig-inifiles-perl/debian/cdbs/1/rules/upstream-tarball.mk
trunk/libconfig-inifiles-perl/debian/changelog
Modified: trunk/libconfig-inifiles-perl/debian/README.cdbs-tweaks
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-inifiles-perl/debian/README.cdbs-tweaks?rev=30071&op=diff
==============================================================================
--- trunk/libconfig-inifiles-perl/debian/README.cdbs-tweaks (original)
+++ trunk/libconfig-inifiles-perl/debian/README.cdbs-tweaks Sat Jan 24 20:29:26 2009
@@ -69,6 +69,13 @@
+New perl-build class
+--------------------
+
+Handle Perl modules using Module::Build.
+
+
+
New copyright-check rule
------------------------
@@ -81,6 +88,16 @@
----------------------
Small wrapper around dh-kpatches, taking care of build-dependencies too.
+
+
+
+New package-relations rule
+--------------------------
+
+Improved build-dependency handling (merging multiple dependencies on
+same packages), and add dependency handling for binary packages (to ease
+maintaining identical build-dependencies and dependencies for eg. Perl
+modules meeding runtime stuff for buildtime tests).
Modified: trunk/libconfig-inifiles-perl/debian/cdbs/1/rules/buildinfo.mk
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-inifiles-perl/debian/cdbs/1/rules/buildinfo.mk?rev=30071&op=diff
==============================================================================
--- trunk/libconfig-inifiles-perl/debian/cdbs/1/rules/buildinfo.mk (original)
+++ trunk/libconfig-inifiles-perl/debian/cdbs/1/rules/buildinfo.mk Sat Jan 24 20:29:26 2009
@@ -1,5 +1,5 @@
# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2004-2006 Jonas Smedegaard <dr at jones.dk>
+# 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
Modified: trunk/libconfig-inifiles-perl/debian/cdbs/1/rules/copyright-check.mk
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-inifiles-perl/debian/cdbs/1/rules/copyright-check.mk?rev=30071&op=diff
==============================================================================
--- trunk/libconfig-inifiles-perl/debian/cdbs/1/rules/copyright-check.mk (original)
+++ trunk/libconfig-inifiles-perl/debian/cdbs/1/rules/copyright-check.mk Sat Jan 24 20:29:26 2009
@@ -21,8 +21,8 @@
_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
+ifndef _cdbs_rules_copyright_check
+_cdbs_rules_copyright_check := 1
include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
@@ -33,18 +33,23 @@
# 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/.*|(.*/)?config\.(guess|sub|rpath)(\..*)?)$
+DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^debian/(changelog|copyright(|_hints|_newhints))$
pre-build:: debian/stamp-copyright-check
debian/stamp-copyright-check:
- @echo 'Scanning upstream source for new/changed copyright notices (except debian subdir!)...'
+ @echo 'Scanning upstream source for new/changed copyright notices...'
+ @echo licensecheck -c '$(DEB_COPYRIGHT_CHECK_REGEX)' -r --copyright -i '$(DEB_COPYRIGHT_CHECK_IGNORE_REGEX)' * \
+ "| 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)' * \
+ @licensecheck -c '$(DEB_COPYRIGHT_CHECK_REGEX)' -r --copyright -i '$(DEB_COPYRIGHT_CHECK_IGNORE_REGEX)' * \
| LC_ALL=C perl -e \
+ 'print "Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=XXX\n";'\
+ 'print "Upstream-Name: Untrusted draft - double-check copyrights yourself!\n\n";'\
'$$n=0; while (<>) {'\
' s/[^[:print:]]//g;'\
' if (/^([^:\s][^:]+):[\s]+(\S.*?)\s*$$/) {'\
@@ -59,8 +64,16 @@
'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 ($$1)/;'\
+ ' $$file->{license} =~ s/\s+(GENERATED FILE)/ ($$1)/;'\
' $$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;'\
+ ' $$file->{copyright} =~ s/^\W*\s+\/\s+//g;'\
+ ' $$file->{copyright} =~ s/\s+\/\s+\W*$$//;'\
+ ' $$file->{copyright} =~ s/\s+\/\s+/\n\t/g;'\
' $$pattern = "$$file->{license} [$$file->{copyright}]";'\
' push @{ $$patternfiles{"$$pattern"} }, $$file->{name};'\
'};'\
@@ -69,7 +82,10 @@
' ||'\
' $$a cmp $$b'\
' } keys %patternfiles ) {'\
- ' print "$$pattern: ", join("\n\t", sort @{ $$patternfiles{$$pattern} }), "\n";'\
+ ' ($$license, $$copyright) = $$pattern =~ /(.*) \[(.*)\]/s;'\
+ ' print "Files: ", join("\n\t", sort @{ $$patternfiles{$$pattern} }), "\n";'\
+ ' print "Copyright: $$copyright\n";'\
+ ' print "License: $$license\n\n";'\
'};'\
> debian/copyright_newhints
@patterncount="`cat debian/copyright_newhints | sed 's/^[^:]*://' | LANG=C sort -u | grep . -c -`"; \
Modified: trunk/libconfig-inifiles-perl/debian/cdbs/1/rules/upstream-tarball.mk
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-inifiles-perl/debian/cdbs/1/rules/upstream-tarball.mk?rev=30071&op=diff
==============================================================================
--- trunk/libconfig-inifiles-perl/debian/cdbs/1/rules/upstream-tarball.mk (original)
+++ trunk/libconfig-inifiles-perl/debian/cdbs/1/rules/upstream-tarball.mk Sat Jan 24 20:29:26 2009
@@ -39,28 +39,28 @@
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_VERSION_MANGLE
-cdbs_upstream_tarball_version_mangled = $(if $(strip $(DEB_UPSTREAM_TARBALL_VERSION_MANGLE)),$(shell echo '$(DEB_UPSTREAM_TARBALL_VERSION)' | perl -pe '$(DEB_UPSTREAM_TARBALL_VERSION_MANGLE)'),$(DEB_UPSTREAM_TARBALL_VERSION))
-
-# Base filename (without extension) as used in upstream URL
-DEB_UPSTREAM_TARBALL_BASENAME = $(DEB_UPSTREAM_PACKAGE)-$(cdbs_upstream_tarball_version_mangled)
+#DEB_UPSTREAM_TARBALL_BASENAME_MANGLE =
# Base directory within tarball
-DEB_UPSTREAM_TARBALL_SRCDIR = $(DEB_UPSTREAM_PACKAGE)-$(cdbs_upstream_tarball_version_mangled)
+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 = ~
-cdbs_upstream_tarball = $(DEB_UPSTREAM_TARBALL_BASENAME).$(DEB_UPSTREAM_TARBALL_EXTENSION)
-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_basename = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION)$(DEB_UPSTREAM_REPACKAGE_DELIMITER)$(DEB_UPSTREAM_REPACKAGE_TAG).orig
-cdbs_upstream_uncompressed_tarball = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION).orig.tar
+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
+_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)
@@ -72,23 +72,23 @@
@@dh_testdir
@@mkdir -p "$(DEB_UPSTREAM_WORKDIR)"
- @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)" ; \
+ @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_local_tarball) from $(DEB_UPSTREAM_URL)/$(cdbs_upstream_tarball) ..." ; \
- wget -nv -T10 -t3 -O "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" "$(DEB_UPSTREAM_URL)/$(cdbs_upstream_tarball)" ; \
+ 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_local_tarball)" ; \
+ echo "Upstream source tarball have been already downloaded: $(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)" ; \
fi
- @md5current=`md5sum "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" | sed -e 's/ .*//'`; \
+ @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_local_tarball)" ; \
+ rm -f "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)" ; \
false ; \
else \
echo "Upstream tarball is trusted!" ; \
@@ -99,39 +99,37 @@
# 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_local_tarball)" in \
+ case "$(cdbs_upstream_received_tarball)" in \
*.tar.gz) unpack="gunzip -c";; \
*.tar.bz2) unpack="bunzip2 -c"; 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_local_tarball)"; false;; \
+ *) 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_local_tarball)" \
+ $$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_local_tarball)" \
+ $$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_repackaged_basename)" ]; then \
- mv -T "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)/$(DEB_UPSTREAM_TARBALL_SRCDIR)" "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)/$(cdbs_upstream_repackaged_basename)"; \
+ 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 && \
- if [ -n "$(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE))" ]; then \
- GZIP=-9 tar -b1 -czf "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_repackaged_basename).tar.gz" -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" "$(cdbs_upstream_repackaged_basename)"; \
- else \
- GZIP=-9 tar -b1 -czf "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_uncompressed_tarball).gz" -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" "$(cdbs_upstream_repackaged_basename)"; \
- 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_local_tarball)"; \
- gzip -9 "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_uncompressed_tarball)"; \
+ $$uncompress "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_received_tarball)"; \
+ gzip -9 "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_basename).orig.tar"; \
fi
DEB_PHONY_RULES += print-version get-orig-source
Modified: trunk/libconfig-inifiles-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-inifiles-perl/debian/changelog?rev=30071&op=diff
==============================================================================
--- trunk/libconfig-inifiles-perl/debian/changelog (original)
+++ trunk/libconfig-inifiles-perl/debian/changelog Sat Jan 24 20:29:26 2009
@@ -4,6 +4,12 @@
* New upstream release. Closes: bug#430426, #380280.
* Depend on ${misc:Depends}.
* Fix Vcs-* fields to point to refer to correct package.
+ * Update CDBS snippets:
+ + Update copyright-check output to more closely match proposed new
+ copyright file format
+ + Simplify internal variables
+ + Ignore no files by default in copyright-check.mk
+ + Correct and update copyright hints of the snippets themselves
[ gregor herrmann ]
* debian/watch: use dist-based URL.
More information about the Pkg-perl-cvs-commits
mailing list