r24540 - in /trunk/libhtml-wikiconverter-phpwiki-perl/debian: README.cdbs-tweaks cdbs/1/rules/copyright-check.mk changelog control control.in copyright_hints rules

js at users.alioth.debian.org js at users.alioth.debian.org
Sat Aug 23 19:44:57 UTC 2008


Author: js
Date: Sat Aug 23 19:44:54 2008
New Revision: 24540

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=24540
Log:
* Initial(!) official release. Closes: bug#448912.
* Update CDBS snippets:
  + Update copyright-check.mk to closer match new proposed copyright
    format, optionally break on changes, and cleaup properly.  Update
    copyright-hints.
  + Use new local package-relations.mk to resolve, cleanup and apply
    CDBS-declared (build-)dependencies.
  + Update README.cdbs-tweaks.
* Add DEB_MAINTAINER_MODE in debian/rules (thanks to Romain Beauxis).
* Semi-auto-update debian/control to update dependencies:
    DEB_MAINTAINER_MODE=1 fakeroot debian/rules clean

Modified:
    trunk/libhtml-wikiconverter-phpwiki-perl/debian/README.cdbs-tweaks
    trunk/libhtml-wikiconverter-phpwiki-perl/debian/cdbs/1/rules/copyright-check.mk
    trunk/libhtml-wikiconverter-phpwiki-perl/debian/changelog
    trunk/libhtml-wikiconverter-phpwiki-perl/debian/control
    trunk/libhtml-wikiconverter-phpwiki-perl/debian/control.in
    trunk/libhtml-wikiconverter-phpwiki-perl/debian/copyright_hints
    trunk/libhtml-wikiconverter-phpwiki-perl/debian/rules

Modified: trunk/libhtml-wikiconverter-phpwiki-perl/debian/README.cdbs-tweaks
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-phpwiki-perl/debian/README.cdbs-tweaks?rev=24540&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-phpwiki-perl/debian/README.cdbs-tweaks (original)
+++ trunk/libhtml-wikiconverter-phpwiki-perl/debian/README.cdbs-tweaks Sat Aug 23 19:44:54 2008
@@ -69,6 +69,13 @@
 
 
 
+New perl-build class
+--------------------
+
+Handle Perl modules using Module::Build.
+
+
+
 New copyright-check rule
 ------------------------
 
@@ -81,6 +88,16 @@
 ----------------------
 
 Small wrapper around dh-kpatches, taking care of build-dependencies too.
+
+
+
+New package-relations rule
+--------------------------
+
+Improved build-dependency handling (merging multiple dependencies on
+same packages), and add dependency handling for binary packages (to ease
+maintaining identical build-dependencies and dependencies for eg. Perl
+modules meeding runtime stuff for buildtime tests).
 
 
 

Modified: trunk/libhtml-wikiconverter-phpwiki-perl/debian/cdbs/1/rules/copyright-check.mk
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-phpwiki-perl/debian/cdbs/1/rules/copyright-check.mk?rev=24540&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-phpwiki-perl/debian/cdbs/1/rules/copyright-check.mk (original)
+++ trunk/libhtml-wikiconverter-phpwiki-perl/debian/cdbs/1/rules/copyright-check.mk Sat Aug 23 19:44:54 2008
@@ -38,13 +38,17 @@
 pre-build:: debian/stamp-copyright-check
 
 debian/stamp-copyright-check:
-	@echo 'Scanning upstream source for new/changed copyright notices (except debian subdir!)...'
+	@echo 'Scanning upstream source for new/changed copyright notices...'
+	@echo licensecheck -c '$(DEB_COPYRIGHT_CHECK_REGEX)' -r --copyright -i '$(DEB_COPYRIGHT_CHECK_IGNORE_REGEX)' * \
+		"| some-output-filtering..."
 
 # 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)' * \
+	@licensecheck -c '$(DEB_COPYRIGHT_CHECK_REGEX)' -r --copyright -i '$(DEB_COPYRIGHT_CHECK_IGNORE_REGEX)' * \
 		| LC_ALL=C perl -e \
+	'print "Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=XXX\n";'\
+	'print "Upstream-Name: Untrusted draft - double-check copyrights yourself!\n\n";'\
 	'$$n=0; while (<>) {'\
 	'	s/[^[:print:]]//g;'\
 	'	if (/^([^:\s][^:]+):[\s]+(\S.*?)\s*$$/) {'\
@@ -59,8 +63,15 @@
 	'foreach $$file (@files) {'\
 	'	$$file->{license} =~ s/\s*\(with incorrect FSF address\)//;'\
 	'	$$file->{license} =~ s/\s+\(v([^)]+) or later\)/-$$1+/;'\
+	'	$$file->{license} =~ s/\s*(\*No copyright\*)\s*// and $$file->{copyright} = $$1;'\
+	'	$$file->{license} =~ s/^\s*(GENERATED FILE)/UNKNOWN ($$1)/;'\
+	'	$$file->{license} =~ s/\s+(GENERATED FILE)/ ($$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;'\
+	'	$$file->{copyright} =~ s/\b(\d{4})\s+([\S^\d])/$$1, $$2/g;'\
+	'	$$file->{copyright} =~ s/^\W*\s+\/\s+//g;'\
+	'	$$file->{copyright} =~ s/\s+\/\s+\W*$$//;'\
+	'	$$file->{copyright} =~ s/\s+\/\s+/\n\t/g;'\
 	'	$$pattern = "$$file->{license} [$$file->{copyright}]";'\
 	'	push @{ $$patternfiles{"$$pattern"} }, $$file->{name};'\
 	'};'\
@@ -69,7 +80,10 @@
 	'			||'\
 	'			$$a cmp $$b'\
 	'		} keys %patternfiles ) {'\
-	'	print "$$pattern: ", join("\n\t", sort @{ $$patternfiles{$$pattern} }), "\n";'\
+	'	($$license, $$copyright) = $$pattern =~ /(.*) \[(.*)\]/s;'\
+	'	print "Files: ", join("\n\t", sort @{ $$patternfiles{$$pattern} }), "\n";'\
+	'	print "Copyright: $$copyright\n";'\
+	'	print "License: $$license\n\n";'\
 	'};'\
 		> debian/copyright_newhints
 	@patterncount="`cat debian/copyright_newhints | sed 's/^[^:]*://' | LANG=C sort -u | grep . -c -`"; \

Modified: trunk/libhtml-wikiconverter-phpwiki-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-phpwiki-perl/debian/changelog?rev=24540&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-phpwiki-perl/debian/changelog (original)
+++ trunk/libhtml-wikiconverter-phpwiki-perl/debian/changelog Sat Aug 23 19:44:54 2008
@@ -1,11 +1,22 @@
-libhtml-wikiconverter-phpwiki-perl (0.51-2) UNRELEASED; urgency=low
+libhtml-wikiconverter-phpwiki-perl (0.51-2) unstable; urgency=low
 
+  * Initial(!) official release. Closes: bug#448912.
   * Relax build-dependency on libhtml-wikiconverter-perl, to match
     dependency.
   * Depend on ${misc:Depends}.
   * Drop bogus dependencies on libparams-validate-perl and liburi-perl.
+  * Update CDBS snippets:
+    + Update copyright-check.mk to closer match new proposed copyright
+      format, optionally break on changes, and cleaup properly.  Update
+      copyright-hints.
+    + Use new local package-relations.mk to resolve, cleanup and apply
+      CDBS-declared (build-)dependencies.
+    + Update README.cdbs-tweaks.
+  * Add DEB_MAINTAINER_MODE in debian/rules (thanks to Romain Beauxis).
+  * Semi-auto-update debian/control to update dependencies:
+      DEB_MAINTAINER_MODE=1 fakeroot debian/rules clean
 
- -- Jonas Smedegaard <dr at jones.dk>  Sun, 29 Jun 2008 00:06:25 +0200
+ -- Jonas Smedegaard <dr at jones.dk>  Sat, 23 Aug 2008 21:44:03 +0200
 
 libhtml-wikiconverter-phpwiki-perl (0.51-1) unstable; urgency=low
 

Modified: trunk/libhtml-wikiconverter-phpwiki-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-phpwiki-perl/debian/control?rev=24540&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-phpwiki-perl/debian/control (original)
+++ trunk/libhtml-wikiconverter-phpwiki-perl/debian/control Sat Aug 23 19:44:54 2008
@@ -1,7 +1,7 @@
 Source: libhtml-wikiconverter-phpwiki-perl
 Section: perl
 Priority: optional
-Build-Depends: cdbs (>= 0.4.39), devscripts (>= 2.10.7), dh-buildinfo, debhelper (>= 5.0.44), perl (>= 5.6.0-16), libhtml-wikiconverter-perl (>= 0.60), libparams-validate-perl, liburi-perl, libtest-simple-perl, libfile-spec-perl, libhtml-parser-perl, libtest-pod-perl (>= 1.14), libtest-pod-coverage-perl (>= 1.04)
+Build-Depends: cdbs (>= 0.4.39), devscripts (>= 2.10.7), dh-buildinfo, debhelper (>= 5.0.44), perl (>= 5.6.0-16), libhtml-wikiconverter-perl (>= 0.52), libtest-simple-perl, libfile-spec-perl, libhtml-parser-perl, libtest-pod-perl (>= 1.14), libtest-pod-coverage-perl (>= 1.04)
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr at jones.dk>
 Standards-Version: 3.7.3
@@ -11,7 +11,7 @@
 
 Package: libhtml-wikiconverter-phpwiki-perl
 Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, libhtml-wikiconverter-perl (>= 0.52)
+Depends: ${perl:Depends}, ${misc:Depends}, ${cdbs:Depends}
 Provides: libhtml-wikiconverter-dialect
 Conflicts: libhtml-wikiconverter-perl (<< 0.50)
 Replaces: libhtml-wikiconverter-perl (<< 0.50)

Modified: trunk/libhtml-wikiconverter-phpwiki-perl/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-phpwiki-perl/debian/control.in?rev=24540&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-phpwiki-perl/debian/control.in (original)
+++ trunk/libhtml-wikiconverter-phpwiki-perl/debian/control.in Sat Aug 23 19:44:54 2008
@@ -11,7 +11,7 @@
 
 Package: libhtml-wikiconverter-phpwiki-perl
 Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, libhtml-wikiconverter-perl (>= 0.52)
+Depends: ${perl:Depends}, ${misc:Depends}, ${cdbs:Depends}
 Provides: libhtml-wikiconverter-dialect
 Conflicts: libhtml-wikiconverter-perl (<< 0.50)
 Replaces: libhtml-wikiconverter-perl (<< 0.50)

Modified: trunk/libhtml-wikiconverter-phpwiki-perl/debian/copyright_hints
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-phpwiki-perl/debian/copyright_hints?rev=24540&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-phpwiki-perl/debian/copyright_hints (original)
+++ trunk/libhtml-wikiconverter-phpwiki-perl/debian/copyright_hints Sat Aug 23 19:44:54 2008
@@ -1,4 +1,7 @@
-*No copyright* UNKNOWN []: Changes
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=XXX
+Upstream-Name: Untrusted draft - double-check copyrights yourself!
+
+Files: Changes
 	MANIFEST
 	META.yml
 	Makefile.PL
@@ -10,3 +13,6 @@
 	t/pod-coverage.t
 	t/pod.t
 	t/runtests.pl
+Copyright: *No copyright*
+License: UNKNOWN
+

Modified: trunk/libhtml-wikiconverter-phpwiki-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-phpwiki-perl/debian/rules?rev=24540&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-phpwiki-perl/debian/rules (original)
+++ trunk/libhtml-wikiconverter-phpwiki-perl/debian/rules Sat Aug 23 19:44:54 2008
@@ -1,8 +1,13 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2007 Jonas Smedegaard <dr at jones.dk>
+# Copyright © 2007-2008 Jonas Smedegaard <dr at jones.dk>
 
 # See debian/README.cdbs-tweaks for info on local overrides
+ifneq (,$(DEB_MAINTAINER_MODE))
+  # Enable stuff not policy compliant (eg. unsuitable for build daemons)
+  DEB_COPYRIGHT_CHECK_STRICT = yes
+  DEB_AUTO_UPDATE_DEBIAN_CONTROL = yes
+endif
 include debian/cdbs/1/rules/upstream-tarball.mk
 include debian/cdbs/1/rules/copyright-check.mk
 include debian/cdbs/1/rules/buildinfo.mk
@@ -15,13 +20,13 @@
 DEB_UPSTREAM_TARBALL_MD5 = 91780bb300046e59edc99605bcdc658e
 
 # Needed both by upstream build process and at runtime
-#TODO: Automatically include these as dependencies to debian/control
-dependencies = libhtml-wikiconverter-perl (>= 0.52)
+CDBS_DEPENDS = libhtml-wikiconverter-perl (>= 0.52)
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), $(CDBS_DEPENDS)
 
 # Needed by upstream build process
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), $(dependencies), libtest-simple-perl
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libtest-simple-perl
 # Additional undocumented upstream needs
 CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libfile-spec-perl, libhtml-parser-perl, 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\)) *,* */, /g' -e 's/^ *, *//' -e 's/ *, *$$//')
+# Resolve, cleanup and apply CDBS-declared dependencies
+include debian/cdbs/1/rules/package-relations.mk




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