r22449 - in /trunk/libunix-syslog-perl/debian: cdbs/1/rules/copyright-check.mk cdbs/1/rules/upstream-tarball.mk changelog compat control control.in copyright_hints rules

js at users.alioth.debian.org js at users.alioth.debian.org
Sun Jun 29 09:26:27 UTC 2008 

Author: js
Date: Sun Jun 29 09:26:27 2008
New Revision: 22449

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=22449
Log:
* Update Vcs-* fields in debian/control(.in) to point to Perl group.
* Update local cdbs tweaks:
  + Strip non-printable chars from copyright-check.mk output.
  + Relax copyright-check.mk to only warn by default.  Closes:
    bug#487058, thanks to Lucas Nussbaum.
  + Fix update-tarball.mk wget options to work with recent wget.
  + Simplify dependency cleanup slightly (quilt isn't in use here).
  + Mirror debian/control uploaders changes to debian/control.in.
* 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
* Set urgency=medium due to FTBFS bugfix.

Modified:
    trunk/libunix-syslog-perl/debian/cdbs/1/rules/copyright-check.mk
    trunk/libunix-syslog-perl/debian/cdbs/1/rules/upstream-tarball.mk
    trunk/libunix-syslog-perl/debian/changelog
    trunk/libunix-syslog-perl/debian/compat
    trunk/libunix-syslog-perl/debian/control
    trunk/libunix-syslog-perl/debian/control.in
    trunk/libunix-syslog-perl/debian/copyright_hints
    trunk/libunix-syslog-perl/debian/rules

Modified: trunk/libunix-syslog-perl/debian/cdbs/1/rules/copyright-check.mk
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libunix-syslog-perl/debian/cdbs/1/rules/copyright-check.mk?rev=22449&op=diff
==============================================================================
--- trunk/libunix-syslog-perl/debian/cdbs/1/rules/copyright-check.mk (original)
+++ trunk/libunix-syslog-perl/debian/cdbs/1/rules/copyright-check.mk Sun Jun 29 09:26:27 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;'\
@@ -65,7 +69,7 @@
 	'			||'\
 	'			$$a cmp $$b'\
 	'		} keys %patternfiles ) {'\
-	'	print "$$pattern: ", join(", ", sort @{ $$patternfiles{$$pattern} }), "\n";'\
+	'	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 -`"; \
@@ -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/libunix-syslog-perl/debian/cdbs/1/rules/upstream-tarball.mk
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libunix-syslog-perl/debian/cdbs/1/rules/upstream-tarball.mk?rev=22449&op=diff
==============================================================================
--- trunk/libunix-syslog-perl/debian/cdbs/1/rules/upstream-tarball.mk (original)
+++ trunk/libunix-syslog-perl/debian/cdbs/1/rules/upstream-tarball.mk Sun Jun 29 09:26:27 2008
@@ -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/libunix-syslog-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libunix-syslog-perl/debian/changelog?rev=22449&op=diff
==============================================================================
--- trunk/libunix-syslog-perl/debian/changelog (original)
+++ trunk/libunix-syslog-perl/debian/changelog Sun Jun 29 09:26:27 2008
@@ -1,7 +1,20 @@
-libunix-syslog-perl (1.1-2) unstable; urgency=low
+libunix-syslog-perl (1.1-2) unstable; urgency=medium
 
   * Depend on ${misc:Depends}.
   * Update tarball md5sum hint in debian/rules.
+  * Update Vcs-* fields in debian/control(.in) to point to Perl group.
+  * Update local cdbs tweaks:
+    + Strip non-printable chars from copyright-check.mk output.
+    + Relax copyright-check.mk to only warn by default.  Closes:
+      bug#487058, thanks to Lucas Nussbaum.
+    + Fix update-tarball.mk wget options to work with recent wget.
+    + Simplify dependency cleanup slightly (quilt isn't in use here).
+    + Mirror debian/control uploaders changes to debian/control.in.
+  * 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
+  * Set urgency=medium due to FTBFS bugfix.
 
  -- Jonas Smedegaard <dr at jones.dk>  Sun, 29 jun 2008 11:18:01 +0200
 

Modified: trunk/libunix-syslog-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libunix-syslog-perl/debian/compat?rev=22449&op=diff
==============================================================================
--- trunk/libunix-syslog-perl/debian/compat (original)
+++ trunk/libunix-syslog-perl/debian/compat Sun Jun 29 09:26:27 2008
@@ -1,1 +1,1 @@
-5
+6

Modified: trunk/libunix-syslog-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libunix-syslog-perl/debian/control?rev=22449&op=diff
==============================================================================
--- trunk/libunix-syslog-perl/debian/control (original)
+++ trunk/libunix-syslog-perl/debian/control Sun Jun 29 09:26:27 2008
@@ -1,12 +1,12 @@
 Source: libunix-syslog-perl
 Section: perl
 Priority: optional
-Build-Depends: cdbs (>= 0.4.39), devscripts (>= 2.10.7), dh-buildinfo, debhelper (>= 5), perl (>= 5.6.0-16)
+Build-Depends: cdbs (>= 0.4.39), devscripts (>= 2.10.7), dh-buildinfo, debhelper (>= 5.0.44), perl (>= 5.6.0-16)
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr at jones.dk>, Gunnar Wolf <gwolf at debian.org>
 Standards-Version: 3.7.3
-Vcs-Svn: svn://svn.debian.org/collab-maint/deb-maint/libunix-syslog-perl/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/libunix-syslog-perl/trunk
+Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libunix-syslog-perl/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libunix-syslog-perl/
 Homepage: http://search.cpan.org/dist/Unix-Syslog/
 
 Package: libunix-syslog-perl

Modified: trunk/libunix-syslog-perl/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libunix-syslog-perl/debian/control.in?rev=22449&op=diff
==============================================================================
--- trunk/libunix-syslog-perl/debian/control.in (original)
+++ trunk/libunix-syslog-perl/debian/control.in Sun Jun 29 09:26:27 2008
@@ -3,10 +3,10 @@
 Priority: optional
 Build-Depends: @cdbs@
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Jonas Smedegaard <dr at jones.dk>
+Uploaders: Jonas Smedegaard <dr at jones.dk>, Gunnar Wolf <gwolf at debian.org>
 Standards-Version: 3.7.3
-Vcs-Svn: svn://svn.debian.org/collab-maint/deb-maint/libunix-syslog-perl/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/libunix-syslog-perl/trunk
+Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libunix-syslog-perl/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libunix-syslog-perl/
 Homepage: http://search.cpan.org/dist/Unix-Syslog/
 
 Package: libunix-syslog-perl

Modified: trunk/libunix-syslog-perl/debian/copyright_hints
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libunix-syslog-perl/debian/copyright_hints?rev=22449&op=diff
==============================================================================
--- trunk/libunix-syslog-perl/debian/copyright_hints (original)
+++ trunk/libunix-syslog-perl/debian/copyright_hints Sun Jun 29 09:26:27 2008
@@ -1,4 +1,9 @@
-*No copyright* UNKNOWN []: Changes, MANIFEST, META.yml, Makefile.PL, test.pl
-UNKNOWN [1999-2002,2007 Marcus Harnisch <marcus.harnisch at gmx.net>]: Syslog.pm, Syslog.xs
-UNKNOWN [and distribution / 1999-2002,2007 Marcus Harnisch]: README
-UNKNOWN [notice for the entire Package / 2000-2006, The Perl Foundation / Holder / Holder of a given Package. If the / Holder's / Holder maintains some artistic / Holder" means the individual(s) or organization(s) / Holder and seek / Holder, and derivatives of that collection and/or of]: Artistic
+*No copyright* UNKNOWN []: Changes
+	MANIFEST
+	META.yml
+	Makefile.PL
+	test.pl
+UNKNOWN [1999-2002,2007 Marcus Harnisch <marcus.harnisch at gmx.net>]: Syslog.pm
+	Syslog.xs
+UNKNOWN [1999-2002,2007 Marcus Harnisch]: README
+UNKNOWN [2000-2006, The Perl Foundation / Holder / Holder of a given Package. If the / Holder's / Holder maintains some artistic / Holder" means the individual(s) or organization(s) / Holder and seek / Holder, and derivatives of that collection and/or of]: Artistic

Modified: trunk/libunix-syslog-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libunix-syslog-perl/debian/rules?rev=22449&op=diff
==============================================================================
--- trunk/libunix-syslog-perl/debian/rules (original)
+++ trunk/libunix-syslog-perl/debian/rules Sun Jun 29 09:26:27 2008
@@ -15,4 +15,4 @@
 DEB_UPSTREAM_TARBALL_MD5 = 73d78e309fe9508ffc9a54d84d79aac9
 
 # 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\)) *,* */, /g' -e 's/^ *, *//' -e 's/ *, *$$//')

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