r17829 - in /trunk/libhtml-wikiconverter-moinmoin-perl/debian: README.cdbs-tweaks cdbs/1/rules/copyright-check.mk cdbs/1/rules/upstream-tarball.mk copyright_hints

js at users.alioth.debian.org js at users.alioth.debian.org
Wed Mar 19 01:05:24 UTC 2008 

Author: js
Date: Wed Mar 19 01:05:23 2008
New Revision: 17829

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=17829
Log:
Update cdbs snippets again.

Modified:
    trunk/libhtml-wikiconverter-moinmoin-perl/debian/README.cdbs-tweaks
    trunk/libhtml-wikiconverter-moinmoin-perl/debian/cdbs/1/rules/copyright-check.mk
    trunk/libhtml-wikiconverter-moinmoin-perl/debian/cdbs/1/rules/upstream-tarball.mk
    trunk/libhtml-wikiconverter-moinmoin-perl/debian/copyright_hints

Modified: trunk/libhtml-wikiconverter-moinmoin-perl/debian/README.cdbs-tweaks
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-moinmoin-perl/debian/README.cdbs-tweaks?rev=17829&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-moinmoin-perl/debian/README.cdbs-tweaks (original)
+++ trunk/libhtml-wikiconverter-moinmoin-perl/debian/README.cdbs-tweaks Wed Mar 19 01:05:23 2008
@@ -30,14 +30,16 @@
 
 Create and clean builddir _after_ resolving per-package DEB_BUILDDIR.
 
-Honour per-package DEB_BUILDDIR in makefile class.
+Honour per-package DEB_BUILDDIR in makefile and autotools classes.
+
+Support multiple build flavors in makefile and autotools classes.
 
 
 
 Various improvements to python-distutils class
 ----------------------------------------------
 
-Use full path to python interpreter (Python Policy section 1.3.2).
+Use full path to Python interpreter (Python Policy section 1.3.2).
 
 Add CDBS_BUILD_DEPENDS to old policy method.
 
@@ -50,6 +52,20 @@
 Unify install path using new DEB_PYTHON_DESTDIR.
 
 Quote install path.
+
+
+
+New python-autotools class
+--------------------------
+
+Handle autotools-based Python packaging.
+
+
+
+New python-sugar class
+----------------------
+
+Handle packaging of Sugar activities.
 
 
 

Modified: trunk/libhtml-wikiconverter-moinmoin-perl/debian/cdbs/1/rules/copyright-check.mk
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-moinmoin-perl/debian/cdbs/1/rules/copyright-check.mk?rev=17829&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-moinmoin-perl/debian/cdbs/1/rules/copyright-check.mk (original)
+++ trunk/libhtml-wikiconverter-moinmoin-perl/debian/cdbs/1/rules/copyright-check.mk Wed Mar 19 01:05:23 2008
@@ -32,24 +32,46 @@
 DEB_COPYRIGHT_CHECK_REGEX = .*
 DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^(debian/.*|(.*/)?config\.(guess|sub|rpath)(\..*)?)$
 
-# By default sort by license and then by filename
-DEB_COPYRIGHT_CHECK_SORT_OPTS = -t : -k2,1 -k1
-
 pre-build:: debian/stamp-copyright-check
 
 debian/stamp-copyright-check:
 	@echo 'Scanning upstream source for new/changed copyright notices (except debian subdir!)...'
 
+# 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)' * \
-		| grep -v '^\(\|.*: \*No copyright\* UNKNOWN\)$$' \
-		| sed 's/\s*(with incorrect FSF address)\s*$$//; s/\s(\+v\(.\+\) or later)/-\1\+/; s/^\s*\[Copyright:\s*/ \[/' \
-		| awk '/^[^ ]/{printf "%s",$$0;next}{print}' \
-		| LC_ALL=C sort $(DEB_COPYRIGHT_CHECK_SORT_OPTS) \
+		| LC_ALL=C perl -e \
+	'$$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->{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;'\
+	'	$$pattern = "$$file->{license} [$$file->{copyright}]";'\
+	'	push @{ $$patternfiles{"$$pattern"} }, $$file->{name};'\
+	'};'\
+	'foreach $$pattern ( sort {'\
+	'			@{$$patternfiles{$$b}} <=> @{$$patternfiles{$$a}}'\
+	'			||'\
+	'			$$a cmp $$b'\
+	'		} keys %patternfiles ) {'\
+	'	print "$$pattern: ", join(", ", sort @{ $$patternfiles{$$pattern} }), "\n";'\
+	'};'\
 		> debian/copyright_newhints
-	@patterncount="`cat debian/copyright_newhints | sed 's/^[^:]*://' | LANG=C sort -u | grep . -c`"; \
+	@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/^\+//'`; \
+	@newstrings=`diff -u debian/copyright_hints debian/copyright_newhints | sed '1,2d' | egrep '^\+' - | sed 's/^\+//'`; \
 		if [ -n "$$newstrings" ]; then \
 			echo "ERROR: The following new or changed copyright notices discovered:"; \
 			echo; \

Modified: trunk/libhtml-wikiconverter-moinmoin-perl/debian/cdbs/1/rules/upstream-tarball.mk
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-moinmoin-perl/debian/cdbs/1/rules/upstream-tarball.mk?rev=17829&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-moinmoin-perl/debian/cdbs/1/rules/upstream-tarball.mk (original)
+++ trunk/libhtml-wikiconverter-moinmoin-perl/debian/cdbs/1/rules/upstream-tarball.mk Wed Mar 19 01:05:23 2008
@@ -1,5 +1,5 @@
 # -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2007 Jonas Smedegaard <dr at jones.dk>
+# 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
@@ -43,7 +43,7 @@
 #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 (withour extension) as used in upstream URL
+# Base filename (without extension) as used in upstream URL
 DEB_UPSTREAM_TARBALL_BASENAME = $(DEB_UPSTREAM_PACKAGE)-$(cdbs_upstream_tarball_version_mangled)
 
 # Base directory within tarball

Modified: trunk/libhtml-wikiconverter-moinmoin-perl/debian/copyright_hints
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-moinmoin-perl/debian/copyright_hints?rev=17829&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-moinmoin-perl/debian/copyright_hints (original)
+++ trunk/libhtml-wikiconverter-moinmoin-perl/debian/copyright_hints Wed Mar 19 01:05:23 2008
@@ -1,1 +1,2 @@
-README: UNKNOWN [AND LICENCE / 2006 David J. Iberri]
+*No copyright* UNKNOWN []: Changes, MANIFEST, META.yml, Makefile.PL, lib/HTML/WikiConverter/MoinMoin.pm, t/00-load.t, t/boilerplate.t, t/moinmoin.t, t/pod-coverage.t, t/pod.t, t/runtests.pl
+UNKNOWN [AND LICENCE / 2006 David J. Iberri]: README

More information about the Pkg-perl-cvs-commits mailing list