r22295 - in /trunk/libhtml-wikiconverter-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
Sat Jun 28 19:14:59 UTC 2008 

Author: js
Date: Sat Jun 28 19:14:59 2008
New Revision: 22295

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=22295
Log:
* Update local cdbs tweaks:
  + Various updates to copyright-check.mk, most importantly relaxing
    to only warn by default.  This fixes an FTBFS bug.
  + Fix update-tarball.mk wget options to work with recent wget.
  + 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
* Bump to urgency=medium due to FTBFS bugfix.
* Duplicate below changes to build-dependencies and uploaders in
  control.in.

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

Modified: trunk/libhtml-wikiconverter-perl/debian/cdbs/1/rules/copyright-check.mk
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-perl/debian/cdbs/1/rules/copyright-check.mk?rev=22295&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-perl/debian/cdbs/1/rules/copyright-check.mk (original)
+++ trunk/libhtml-wikiconverter-perl/debian/cdbs/1/rules/copyright-check.mk Sat Jun 28 19:14:59 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/libhtml-wikiconverter-perl/debian/cdbs/1/rules/upstream-tarball.mk
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-perl/debian/cdbs/1/rules/upstream-tarball.mk?rev=22295&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-perl/debian/cdbs/1/rules/upstream-tarball.mk (original)
+++ trunk/libhtml-wikiconverter-perl/debian/cdbs/1/rules/upstream-tarball.mk Sat Jun 28 19:14:59 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/libhtml-wikiconverter-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-perl/debian/changelog?rev=22295&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-perl/debian/changelog (original)
+++ trunk/libhtml-wikiconverter-perl/debian/changelog Sat Jun 28 19:14:59 2008
@@ -1,4 +1,4 @@
-libhtml-wikiconverter-perl (0.62-1) UNRELEASED; urgency=low
+libhtml-wikiconverter-perl (0.62-1) UNRELEASED; urgency=medium
   
   NOTE: #473304, also waiting some input from Jonas
 
@@ -6,6 +6,18 @@
   * Update debian/copyright: Debian Perl Team holds copyright for Debian
     packaging in 2008.
   * Use svn-upgrade (not default uupdate) in watch file.
+  * Update local cdbs tweaks:
+    + Various updates to copyright-check.mk, most importantly relaxing
+      to only warn by default.  This fixes an FTBFS bug.
+    + Fix update-tarball.mk wget options to work with recent wget.
+    + 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
+  * Bump to urgency=medium due to FTBFS bugfix.
+  * Duplicate below changes to build-dependencies and uploaders in
+    control.in.
 
   [ Rene Mayorga ]
   * New upstream release

Modified: trunk/libhtml-wikiconverter-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-perl/debian/compat?rev=22295&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-perl/debian/compat (original)
+++ trunk/libhtml-wikiconverter-perl/debian/compat Sat Jun 28 19:14:59 2008
@@ -1,1 +1,1 @@
-5
+6

Modified: trunk/libhtml-wikiconverter-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-perl/debian/control?rev=22295&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-perl/debian/control (original)
+++ trunk/libhtml-wikiconverter-perl/debian/control Sat Jun 28 19:14:59 2008
@@ -1,7 +1,7 @@
 Source: libhtml-wikiconverter-perl
 Section: perl
 Priority: optional
-Build-Depends: cdbs (>= 0.4.39), devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), dh-buildinfo, debhelper (>= 5), perl (>= 5.6.0-16), libhtml-tree-perl (>= 3.18), libcss-perl, liburi-perl (>= 1.35), libhtml-parser-perl, libhtml-tagset-perl, libparams-validate-perl (>= 0.77), libclass-data-accessor-perl (>= 0.02), libtest-simple-perl, libtest-pod-perl (>= 1.14), libtest-pod-coverage-perl (>= 1.04)
+Build-Depends: cdbs (>= 0.4.39), devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), dh-buildinfo, debhelper (>= 5.0.44), perl (>= 5.6.0-16), libhtml-tree-perl (>= 3.18), libcss-perl, liburi-perl (>= 1.35), libhtml-parser-perl, libhtml-tagset-perl, libparams-validate-perl (>= 0.77), libclass-data-accessor-perl (>= 0.02), libtest-simple-perl, libtest-pod-perl (>= 1.14), libtest-pod-coverage-perl (>= 1.04)
 Build-conflicts: libwww-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr at jones.dk>, Rene Mayorga <rmayorga at debian.org.sv>

Modified: trunk/libhtml-wikiconverter-perl/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-perl/debian/control.in?rev=22295&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-perl/debian/control.in (original)
+++ trunk/libhtml-wikiconverter-perl/debian/control.in Sat Jun 28 19:14:59 2008
@@ -4,7 +4,7 @@
 Build-Depends: @cdbs@
 Build-conflicts: libwww-perl
 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>, Rene Mayorga <rmayorga at debian.org.sv>
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/collab-maint/deb-maint/libhtml-wikiconverter-perl/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/libhtml-wikiconverter-perl/trunk
@@ -12,7 +12,7 @@
 
 Package: libhtml-wikiconverter-perl
 Architecture: all
-Depends: ${perl:Depends}, libhtml-tree-perl (>= 3.18), libcss-perl, liburi-perl (>= 1.35), libhtml-parser-perl, libhtml-tagset-perl, libparams-validate-perl (>= 0.77), libclass-data-accessor-perl (>= 0.02)
+Depends: ${perl:Depends}, ${misc:Depends}, libhtml-tree-perl (>= 3.18), libcss-perl, liburi-perl (>= 1.35), libhtml-parser-perl, libhtml-tagset-perl, libparams-validate-perl (>= 0.77), libclass-data-accessor-perl (>= 0.02)
 Recommends: libhtml-wikiconverter-dialect, libfile-slurp-perl
 Description:  An HTML to wiki markup converter
  HTML::WikiConverter is an HTML to wiki converter. It can convert HTML

Modified: trunk/libhtml-wikiconverter-perl/debian/copyright_hints
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-perl/debian/copyright_hints?rev=22295&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-perl/debian/copyright_hints (original)
+++ trunk/libhtml-wikiconverter-perl/debian/copyright_hints Sat Jun 28 19:14:59 2008
@@ -1,2 +1,16 @@
-*No copyright* UNKNOWN []: Changes, INSTALL, MANIFEST, META.yml, Makefile.PL, README, bin/html2wiki, lib/HTML/WikiConverter.pm, lib/HTML/WikiConverter/Dialects.pod, lib/HTML/WikiConverter/Normalizer.pm, t/00-load.t, t/01-wikiconverter.t, t/boilerplate.t, t/pod-coverage.t, t/pod.t
+*No copyright* UNKNOWN []: Changes
+	INSTALL
+	MANIFEST
+	META.yml
+	Makefile.PL
+	README
+	bin/html2wiki
+	lib/HTML/WikiConverter.pm
+	lib/HTML/WikiConverter/Dialects.pod
+	lib/HTML/WikiConverter/Normalizer.pm
+	t/00-load.t
+	t/01-wikiconverter.t
+	t/boilerplate.t
+	t/pod-coverage.t
+	t/pod.t
 UNKNOWN [1989, 1991 Free Software Foundation, Inc / the software, and]: LICENSE

Modified: trunk/libhtml-wikiconverter-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-perl/debian/rules?rev=22295&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-perl/debian/rules (original)
+++ trunk/libhtml-wikiconverter-perl/debian/rules Sat Jun 28 19:14:59 2008
@@ -27,4 +27,4 @@
 CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libtest-pod-perl (>= 1.14), libtest-pod-coverage-perl (>= 1.04)
 
 # 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