r22435 - in /trunk/libmail-cclient-perl/debian: cdbs/1/rules/copyright-check.mk changelog compat control control.in copyright_hints rules

js at users.alioth.debian.org js at users.alioth.debian.org
Sun Jun 29 08:46:52 UTC 2008 

Author: js
Date: Sun Jun 29 08:46:52 2008
New Revision: 22435

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=22435
Log:
* Update local cdbs tweaks:
  + Mirror debian/control Vcs-* changes in debian/control.in.
  + Strip non-printable chars from copyright-check.mk output.
  + Relax copyright-check.mk to only warn by default.  This fixes a
    potential FTBFS.
  + Update dependency cleanup to strip cdbs 0.4.27 (not 0.4.27-1).
* Update debian/copyright-hints.
* Bump debhelper compatibility level to 6.
* Semi-auto-update debian/control to update build-dependencies:
    DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean

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

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=22435&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 Sun Jun 29 08:46:52 2008
@@ -28,6 +28,9 @@
 
 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)(\..*)?)$
@@ -43,6 +46,7 @@
 	licensecheck -c '$(DEB_COPYRIGHT_CHECK_REGEX)' -r --copyright -i '$(DEB_COPYRIGHT_CHECK_IGNORE_REGEX)' * \
 		| LC_ALL=C perl -e \
 	'$$n=0; while (<>) {'\
+	'	s/[^[:print:]]//g;'\
 	'	if (/^([^:\s][^:]+):[\s]+(\S.*?)\s*$$/) {'\
 	'		$$files[$$n]{name}=$$1;'\
 	'		$$files[$$n]{license}=$$2;'\
@@ -73,18 +77,18 @@
 	@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 "ERROR: The following new or changed copyright notices discovered:"; \
+			echo "$(if $(DEB_COPYRIGHT_CHECK_STRICT),ERROR,WARNING): The following new or changed copyright notices discovered:"; \
 			echo; \
 			echo "$$newstrings"; \
 			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"; \
-			exit 1; \
+			$(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
-	
-	@echo 'No new copyright notices found - assuming no news is good news...'
-	rm -f debian/copyright_newhints
 	touch $@
 
 clean::

Modified: trunk/libmail-cclient-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmail-cclient-perl/debian/changelog?rev=22435&op=diff
==============================================================================
--- trunk/libmail-cclient-perl/debian/changelog (original)
+++ trunk/libmail-cclient-perl/debian/changelog Sun Jun 29 08:46:52 2008
@@ -1,9 +1,22 @@
 libmail-cclient-perl (1.12-8) UNRELEASED; urgency=low
 
+  [ gregor herrmann ]
   * debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
     field (source stanza). Removed: XS-Vcs-Svn fields (source stanza).
 
- -- gregor herrmann <gregoa at debian.org>  Sat, 07 Jun 2008 01:26:16 +0200
+  [ Jonas Smedegaard ]
+  * Update local cdbs tweaks:
+    + Mirror debian/control Vcs-* changes in debian/control.in.
+    + Strip non-printable chars from copyright-check.mk output.
+    + Relax copyright-check.mk to only warn by default.  This fixes a
+      potential FTBFS.
+    + Update dependency cleanup to strip cdbs 0.4.27 (not 0.4.27-1).
+  * Update debian/copyright-hints.
+  * Bump debhelper compatibility level to 6.
+  * Semi-auto-update debian/control to update build-dependencies:
+      DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
+
+ -- Jonas Smedegaard <dr at jones.dk>  Sun, 29 jun 2008 10:32:20 +0200
 
 libmail-cclient-perl (1.12-7) unstable; urgency=low
 

Modified: trunk/libmail-cclient-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmail-cclient-perl/debian/compat?rev=22435&op=diff
==============================================================================
--- trunk/libmail-cclient-perl/debian/compat (original)
+++ trunk/libmail-cclient-perl/debian/compat Sun Jun 29 08:46:52 2008
@@ -1,1 +1,1 @@
-5
+6

Modified: trunk/libmail-cclient-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmail-cclient-perl/debian/control?rev=22435&op=diff
==============================================================================
--- trunk/libmail-cclient-perl/debian/control (original)
+++ trunk/libmail-cclient-perl/debian/control Sun Jun 29 08:46:52 2008
@@ -6,7 +6,7 @@
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libmail-cclient-perl/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libmail-cclient-perl/
-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
+Build-Depends: devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), perl (>= 5.6.0-16), debhelper (>= 5.0.44), dh-buildinfo, cdbs (>= 0.4.39), libc-client-dev, libpam-dev, libssl-dev, libkrb5-dev
 Homepage: http://www.cpan.org/modules/by-module/Mail/HDIAS/
 
 Package: libmail-cclient-perl

Modified: trunk/libmail-cclient-perl/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmail-cclient-perl/debian/control.in?rev=22435&op=diff
==============================================================================
--- trunk/libmail-cclient-perl/debian/control.in (original)
+++ trunk/libmail-cclient-perl/debian/control.in Sun Jun 29 08:46:52 2008
@@ -4,9 +4,9 @@
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr at jones.dk>
 Standards-Version: 3.7.3
+Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libmail-cclient-perl/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libmail-cclient-perl/
 Build-Depends: @cdbs@
-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/
 
 Package: libmail-cclient-perl

Modified: trunk/libmail-cclient-perl/debian/copyright_hints
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmail-cclient-perl/debian/copyright_hints?rev=22435&op=diff
==============================================================================
--- trunk/libmail-cclient-perl/debian/copyright_hints (original)
+++ trunk/libmail-cclient-perl/debian/copyright_hints Sun Jun 29 08:46:52 2008
@@ -5,41 +5,6 @@
 	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
@@ -61,38 +26,6 @@
 	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
@@ -123,11 +56,6 @@
 	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
@@ -136,6 +64,6 @@
 	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
+UNKNOWN [Holder, and derivatives of that collection of files / Holder as specified below / Holder maintains some / Holder to include / notices and associated disclaimers / Holder. A Package / Holder, but only to the computing community at large / Holder" is whoever is named in the or]: Artistic
+UNKNOWN [holder saying it may be / the software, and / 1989 Free Software Foundation, Inc]: Copying

Modified: trunk/libmail-cclient-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmail-cclient-perl/debian/rules?rev=22435&op=diff
==============================================================================
--- trunk/libmail-cclient-perl/debian/rules (original)
+++ trunk/libmail-cclient-perl/debian/rules Sun Jun 29 08:46:52 2008
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003-2007 Jonas Smedegaard <dr at jones.dk>
+# Copyright © 2003-2008 Jonas Smedegaard <dr at jones.dk>
 
 # NB! Local cdbs tweaks are used: See debian/README.cdbs-tweaks
 
@@ -31,4 +31,4 @@
 CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libc-client-dev, libpam-dev, libssl-dev, libkrb5-dev
 
 # Fix double cdbs build-dependencies
-CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.39)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\|0.4.27-1\)) *,* */, /g' -e 's/^ *, *//' -e 's/ *, *$$//')
+CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.39)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\|0.4.27\)) *,* */, /g' -e 's/^ *, *//' -e 's/ *, *$$//')

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