r18133 - in /trunk/libmail-cclient-perl/debian: README.cdbs-tweaks cdbs/1/rules/copyright-check.mk cdbs/1/rules/upstream-tarball.mk changelog control control.in copyright_hints

js at users.alioth.debian.org js at users.alioth.debian.org
Sat Mar 29 21:45:31 UTC 2008


Author: js
Date: Sat Mar 29 21:45:26 2008
New Revision: 18133

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=18133
Log:
* Pass over maintenance of the package to the Perl group: Change Maintainer,
  and add myself to Uploaders.
* Update local cdbs snippets:
  + Fix wget options in update-tarball.
  + Major improvements to copyright-check, including new versioned
    build-dependency on devscripts.  Update debian/copyright_hints.
  + Update debian/README.cdbs-tweaks.
* Semi-auto-update debian/control to apply changes contained in the above:
  DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean

Modified:
    trunk/libmail-cclient-perl/debian/README.cdbs-tweaks
    trunk/libmail-cclient-perl/debian/cdbs/1/rules/copyright-check.mk
    trunk/libmail-cclient-perl/debian/cdbs/1/rules/upstream-tarball.mk
    trunk/libmail-cclient-perl/debian/changelog
    trunk/libmail-cclient-perl/debian/control
    trunk/libmail-cclient-perl/debian/control.in
    trunk/libmail-cclient-perl/debian/copyright_hints

Modified: trunk/libmail-cclient-perl/debian/README.cdbs-tweaks
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmail-cclient-perl/debian/README.cdbs-tweaks?rev=18133&op=diff
==============================================================================
--- trunk/libmail-cclient-perl/debian/README.cdbs-tweaks (original)
+++ trunk/libmail-cclient-perl/debian/README.cdbs-tweaks Sat Mar 29 21:45:26 2008
@@ -18,24 +18,6 @@
 
 
 
-Improved support for cdbs-autoupdate
-------------------------------------
-
-CDBS invented a cool way to help keep build-dependencies up-to-date.
-
-It is disabled by default, as messing with debian/rules at build time
-violates Debian Policy: A build must not change conditions for building.
-
-Some consider this CDBS feature evil.
-
-Some enable the feature within a package, and gets smacked by ftp-master
-or others (there's even a lintian check to complain about it now).
-
-This tweak enables the feature when the build environment contains the
-non-default hint "cdbs-autoupdate" in the DEB_BUILD_OPTIONS variable.
-
-
-
 New buildinfo rule
 ------------------
 
@@ -48,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.
 
@@ -68,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/libmail-cclient-perl/debian/cdbs/1/rules/copyright-check.mk
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmail-cclient-perl/debian/cdbs/1/rules/copyright-check.mk?rev=18133&op=diff
==============================================================================
--- trunk/libmail-cclient-perl/debian/cdbs/1/rules/copyright-check.mk (original)
+++ trunk/libmail-cclient-perl/debian/cdbs/1/rules/copyright-check.mk Sat Mar 29 21:45:26 2008
@@ -1,5 +1,5 @@
 # -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2005-2007 Jonas Smedegaard <dr at jones.dk>
+# Copyright © 2005-2008 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
@@ -17,10 +17,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 # 02111-1307 USA.
 
-# TODO: Save scan as "file: match" (needs rewrite of main loop in perl)
-
-# TODO: Save scan as "file (license): match" (needs /usr/bin/licensecheck from kdesdk-scripts)
-
 _cdbs_scripts_path ?= /usr/lib/cdbs
 _cdbs_rules_path ?= /usr/share/cdbs/1/rules
 _cdbs_class_path ?= /usr/share/cdbs/1/class
@@ -30,28 +26,56 @@
 
 include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
 
-cdbs_copyright-check_find_opts := -not -regex 'debian/.*' -not -regex '\(.*/\)?config\.\(guess\|sub\|rpath\)\(\..*\)?'
-cdbs_copyright-check_egrep_opts := --text -rih '(copyright|\(c\) ).*[0-9]{4}'
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), devscripts (>= 2.10.7)
+
+# Single regular expression for files to include or ignore
+DEB_COPYRIGHT_CHECK_REGEX = .*
+DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^(debian/.*|(.*/)?config\.(guess|sub|rpath)(\..*)?)$
 
 pre-build:: debian/stamp-copyright-check
 
 debian/stamp-copyright-check:
 	@echo 'Scanning upstream source for new/changed copyright notices (except debian subdir!)...'
-	find * -type f $(cdbs_copyright-check_find_opts) -exec cat '{}' ';' \
-		| tr '\r' '\n' \
-		| LC_ALL=C sed -e 's/[^[:print:]]//g' \
-		| egrep $(cdbs_copyright-check_egrep_opts) \
-		| sed -e 's/^[[:space:]*#]*//' -e 's/[[:space:]]*$$//' \
-		| LC_ALL=C sort -u \
+
+# 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)' * \
+		| 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("\n\t", sort @{ $$patternfiles{$$pattern} }), "\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/^\+//'`; \
+	@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 "ERROR: The following new or changed copyright notices discovered:"; \
+			echo; \
 			echo "$$newstrings"; \
-			echo "Trying to locate the files containing the new/changed copyright notices..."; \
-			echo "(Strings part of binary data you need to resolve yourself)"; \
-			find * -type f $(cdbs_copyright-check_find_opts) -exec grep -F -l -e "$$newstrings" '{}' ';'; \
 			echo; \
 			echo "To fix the situation please do the following:"; \
 			echo "  1) Investigate the above changes and update debian/copyright as needed"; \

Modified: trunk/libmail-cclient-perl/debian/cdbs/1/rules/upstream-tarball.mk
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmail-cclient-perl/debian/cdbs/1/rules/upstream-tarball.mk?rev=18133&op=diff
==============================================================================
--- trunk/libmail-cclient-perl/debian/cdbs/1/rules/upstream-tarball.mk (original)
+++ trunk/libmail-cclient-perl/debian/cdbs/1/rules/upstream-tarball.mk Sat Mar 29 21:45:26 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
@@ -77,7 +77,7 @@
 			rm "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ; \
 		fi ; \
 		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)" ; \
+		wget -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)/$(cdbs_upstream_local_tarball)" ; \
 	fi

Modified: trunk/libmail-cclient-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmail-cclient-perl/debian/changelog?rev=18133&op=diff
==============================================================================
--- trunk/libmail-cclient-perl/debian/changelog (original)
+++ trunk/libmail-cclient-perl/debian/changelog Sat Mar 29 21:45:26 2008
@@ -1,3 +1,18 @@
+libmail-cclient-perl (1.12-7) unstable; urgency=low
+
+  * Pass over maintenance of the package to the Perl group: Change Maintainer,
+    and add myself to Uploaders.
+
+  * Update local cdbs snippets:
+    + Fix wget options in update-tarball.
+    + Major improvements to copyright-check, including new versioned
+      build-dependency on devscripts.  Update debian/copyright_hints.
+    + Update debian/README.cdbs-tweaks.
+  * Semi-auto-update debian/control to apply changes contained in the above:
+    DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
+
+ -- Jonas Smedegaard <dr at jones.dk>  Sat, 29 Mar 2008 22:44:58 +0100
+
 libmail-cclient-perl (1.12-6) unstable; urgency=low
 
   * Bump debhelper compat level and build-dependency to version 5.

Modified: trunk/libmail-cclient-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmail-cclient-perl/debian/control?rev=18133&op=diff
==============================================================================
--- trunk/libmail-cclient-perl/debian/control (original)
+++ trunk/libmail-cclient-perl/debian/control Sat Mar 29 21:45:26 2008
@@ -1,9 +1,10 @@
 Source: libmail-cclient-perl
 Section: perl
 Priority: optional
-Maintainer: Jonas Smedegaard <dr at jones.dk>
+Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
+Uploaders: Jonas Smedegaard <dr at jones.dk>
 Standards-Version: 3.7.3
-Build-Depends: quilt, patchutils (>= 0.2.25), perl (>= 5.6.0-16), debhelper (>= 5), dh-buildinfo, cdbs (>= 0.4.39), libc-client-dev, libpam-dev, libssl-dev, libkrb5-dev
+Build-Depends: devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), perl (>= 5.6.0-16), debhelper (>= 5), dh-buildinfo, cdbs (>= 0.4.39), libc-client-dev, libpam-dev, libssl-dev, libkrb5-dev
 XS-Vcs-Svn: svn://svn.debian.org/collab-maint/deb-maint/libmail-cclient-perl/trunk
 XS-Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/libmail-cclient-perl/trunk
 Homepage: http://www.cpan.org/modules/by-module/Mail/HDIAS/

Modified: trunk/libmail-cclient-perl/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmail-cclient-perl/debian/control.in?rev=18133&op=diff
==============================================================================
--- trunk/libmail-cclient-perl/debian/control.in (original)
+++ trunk/libmail-cclient-perl/debian/control.in Sat Mar 29 21:45:26 2008
@@ -1,7 +1,8 @@
 Source: libmail-cclient-perl
 Section: perl
 Priority: optional
-Maintainer: Jonas Smedegaard <dr at jones.dk>
+Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
+Uploaders: Jonas Smedegaard <dr at jones.dk>
 Standards-Version: 3.7.3
 Build-Depends: @cdbs@
 XS-Vcs-Svn: svn://svn.debian.org/collab-maint/deb-maint/libmail-cclient-perl/trunk

Modified: trunk/libmail-cclient-perl/debian/copyright_hints
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmail-cclient-perl/debian/copyright_hints?rev=18133&op=diff
==============================================================================
--- trunk/libmail-cclient-perl/debian/copyright_hints (original)
+++ trunk/libmail-cclient-perl/debian/copyright_hints Sat Mar 29 21:45:26 2008
@@ -1,4 +1,141 @@
-Copyright (C) 1989 Free Software Foundation, Inc.
-Copyright (c) 1998 - 2004 Malcolm Beattie
-Copyright (c) 1998 - 2004, Malcolm Beattie
-Copyright 2001 University of Washington.
+*No copyright* UNKNOWN []: Cclient.pod
+	Changes
+	FAQ
+	MANIFEST
+	META.yml
+	Makefile.PL
+	TODO
+	examples/.svn/entries
+	examples/.svn/format
+	examples/.svn/prop-base/fetch_body.pl.svn-base
+	examples/.svn/prop-base/fetch_structure.pl.svn-base
+	examples/.svn/prop-base/list_mailboxs.pl.svn-base
+	examples/.svn/prop-base/rfc822_date.pl.svn-base
+	examples/.svn/prop-base/rfc822_output.txt.svn-base
+	examples/.svn/prop-base/rfc822_parse_adrlist.pl.svn-base
+	examples/.svn/prop-base/rfc822_write_address.pl.svn-base
+	examples/.svn/prop-base/smtp_mail.pl.svn-base
+	examples/.svn/prop-base/smtp_mail_append.txt.svn-base
+	examples/.svn/prop-base/smtp_mail_mpart.pl.svn-base
+	examples/.svn/prop-base/thread_test.pl.svn-base
+	examples/.svn/prop-base/utf8_mime2text.pl.svn-base
+	examples/.svn/text-base/copy.txt.svn-base
+	examples/.svn/text-base/fetch_body.pl.svn-base
+	examples/.svn/text-base/fetch_structure.pl.svn-base
+	examples/.svn/text-base/imap.txt.svn-base
+	examples/.svn/text-base/list_mailboxs.pl.svn-base
+	examples/.svn/text-base/mime.txt.svn-base
+	examples/.svn/text-base/rfc822_date.pl.svn-base
+	examples/.svn/text-base/rfc822_output.txt.svn-base
+	examples/.svn/text-base/rfc822_parse_adrlist.pl.svn-base
+	examples/.svn/text-base/rfc822_write_address.pl.svn-base
+	examples/.svn/text-base/search.txt.svn-base
+	examples/.svn/text-base/search_msg.txt.svn-base
+	examples/.svn/text-base/smtp_mail.pl.svn-base
+	examples/.svn/text-base/smtp_mail_append.txt.svn-base
+	examples/.svn/text-base/smtp_mail_mpart.pl.svn-base
+	examples/.svn/text-base/sort.txt.svn-base
+	examples/.svn/text-base/struct.txt.svn-base
+	examples/.svn/text-base/summ.txt.svn-base
+	examples/.svn/text-base/thread.txt.svn-base
+	examples/.svn/text-base/thread_test.pl.svn-base
+	examples/.svn/text-base/utf8_mime2text.pl.svn-base
+	examples/copy.txt
+	examples/fetch_body.pl
+	examples/fetch_structure.pl
+	examples/imap.txt
+	examples/list_mailboxs.pl
+	examples/mime.txt
+	examples/rfc822_date.pl
+	examples/rfc822_output.txt
+	examples/rfc822_parse_adrlist.pl
+	examples/rfc822_write_address.pl
+	examples/search.txt
+	examples/search_msg.txt
+	examples/smtp_mail.pl
+	examples/smtp_mail_append.txt
+	examples/smtp_mail_mpart.pl
+	examples/sort.txt
+	examples/struct.txt
+	examples/summ.txt
+	examples/thread.txt
+	examples/thread_test.pl
+	examples/utf8_mime2text.pl
+	t/.svn/entries
+	t/.svn/format
+	t/.svn/text-base/check.t.svn-base
+	t/.svn/text-base/elt.t.svn-base
+	t/.svn/text-base/expunge.t.svn-base
+	t/.svn/text-base/fetch_body.t.svn-base
+	t/.svn/text-base/fetch_header.t.svn-base
+	t/.svn/text-base/fetch_message.t.svn-base
+	t/.svn/text-base/fetch_mime.t.svn-base
+	t/.svn/text-base/fetch_structure.t.svn-base
+	t/.svn/text-base/fetch_text.t.svn-base
+	t/.svn/text-base/list.t.svn-base
+	t/.svn/text-base/msgno.t.svn-base
+	t/.svn/text-base/nmsgs.t.svn-base
+	t/.svn/text-base/parameters.t.svn-base
+	t/.svn/text-base/ping.t.svn-base
+	t/.svn/text-base/rfc822_8bit.t.svn-base
+	t/.svn/text-base/rfc822_base64.t.svn-base
+	t/.svn/text-base/rfc822_binary.t.svn-base
+	t/.svn/text-base/rfc822_date.t.svn-base
+	t/.svn/text-base/rfc822_parse_adrlist.t.svn-base
+	t/.svn/text-base/rfc822_qprint.t.svn-base
+	t/.svn/text-base/rfc822_write_address.t.svn-base
+	t/.svn/text-base/search.t.svn-base
+	t/.svn/text-base/search_msg.t.svn-base
+	t/.svn/text-base/smtp_open.t.svn-base
+	t/.svn/text-base/sort.t.svn-base
+	t/.svn/text-base/subscribe.t.svn-base
+	t/.svn/text-base/thread.t.svn-base
+	t/.svn/text-base/uid.t.svn-base
+	t/.svn/text-base/unsubscribe.t.svn-base
+	t/.svn/text-base/utf8_mime2text.t.svn-base
+	t/check.t
+	t/elt.t
+	t/expunge.t
+	t/fetch_body.t
+	t/fetch_header.t
+	t/fetch_message.t
+	t/fetch_mime.t
+	t/fetch_structure.t
+	t/fetch_text.t
+	t/list.t
+	t/msgno.t
+	t/nmsgs.t
+	t/parameters.t
+	t/ping.t
+	t/rfc822_8bit.t
+	t/rfc822_base64.t
+	t/rfc822_binary.t
+	t/rfc822_date.t
+	t/rfc822_parse_adrlist.t
+	t/rfc822_qprint.t
+	t/rfc822_write_address.t
+	t/search.t
+	t/search_msg.t
+	t/smtp_open.t
+	t/sort.t
+	t/subscribe.t
+	t/thread.t
+	t/uid.t
+	t/unsubscribe.t
+	t/utf8_mime2text.t
+	testmbx/.svn/entries
+	testmbx/.svn/format
+	testmbx/.svn/text-base/multipart.mbox.svn-base
+	testmbx/.svn/text-base/test.mbox.svn-base
+	testmbx/.svn/text-base/test_mpart.mbox.svn-base
+	testmbx/multipart.mbox
+	testmbx/test.mbox
+	testmbx/test_mpart.mbox
+	typemap
+UNKNOWN [1998 - 2004 Malcolm Beattie]: Cclient.pm
+	Cclient.xs
+UNKNOWN [2001 University of Washington]: criteria.c
+	criteria.h
+UNKNOWN [1989 Free Software Foundation, Inc / holder saying it may be / the software, and]: Copying
+UNKNOWN [1998 - 2004, Malcolm Beattie]: README
+UNKNOWN [Holder, and derivatives of that collection of files / notices and associated disclaimers / Holder. A Package / Holder" is whoever is named in the copyright or / Holder as specified below / Holder maintains some / Holder, but only to the computing community at large / Holder to include]: Artistic




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