r22270 - in /trunk/libhtml-lint-perl/debian: README.cdbs-tweaks cdbs/1/rules/copyright-check.mk cdbs/1/rules/upstream-tarball.mk changelog compat
js at users.alioth.debian.org
js at users.alioth.debian.org
Sat Jun 28 17:22:44 UTC 2008
Author: js
Date: Sat Jun 28 17:22:44 2008
New Revision: 22270
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=22270
Log:
* Update local cdbs tweaks:
+ Various updates to copyright-check.mk, most importantly relaxing
to only warn by default.
+ Drop wget options broken with recent versions of wget in
update-tarball.mk.
+ Cosmetic updates to README.cdbs-tweaks.
* 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
* Update local cdbs snippets:
+ Major improvements to update-tarball (but none of them affecting this
current packaging).
+ Major improvements to copyright-check, including new versioned
build-dependency on devscripts. Update debian/copyright_hints.
+ Drop buildcore.mk override. Set DEB_AUTO_UPDATE_DEBIAN_CONTROL directly
instead when needed.
+ Fix buildinfo.mk invoking dh-buildinfo only once.
+ Update debian/README.cdbs-tweaks to no longer mention buildcore.mk
override.
* Fix double cdbs build-dependencies in debian/rules.
* Semi-auto-update debian/control to apply changes contained in the above:
DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
Modified:
trunk/libhtml-lint-perl/debian/README.cdbs-tweaks
trunk/libhtml-lint-perl/debian/cdbs/1/rules/copyright-check.mk
trunk/libhtml-lint-perl/debian/cdbs/1/rules/upstream-tarball.mk
trunk/libhtml-lint-perl/debian/changelog
trunk/libhtml-lint-perl/debian/compat
Modified: trunk/libhtml-lint-perl/debian/README.cdbs-tweaks
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-lint-perl/debian/README.cdbs-tweaks?rev=22270&op=diff
==============================================================================
--- trunk/libhtml-lint-perl/debian/README.cdbs-tweaks (original)
+++ trunk/libhtml-lint-perl/debian/README.cdbs-tweaks Sat Jun 28 17:22:44 2008
@@ -30,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.
@@ -50,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/libhtml-lint-perl/debian/cdbs/1/rules/copyright-check.mk
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-lint-perl/debian/cdbs/1/rules/copyright-check.mk?rev=22270&op=diff
==============================================================================
--- trunk/libhtml-lint-perl/debian/cdbs/1/rules/copyright-check.mk (original)
+++ trunk/libhtml-lint-perl/debian/cdbs/1/rules/copyright-check.mk Sat Jun 28 17:22:44 2008
@@ -28,41 +28,67 @@
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)(\..*)?)$
-
-# By default sort by license and then by filename
-DEB_COPYRIGHT_CHECK_SORT_OPTS = -t : -k2,1 -k1
pre-build:: debian/stamp-copyright-check
debian/stamp-copyright-check:
@echo 'Scanning upstream source for new/changed copyright notices (except debian subdir!)...'
+# 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)' * \
- | grep -v '^\(\|.*: \*No copyright\* \(GENERATED FILE\|UNKNOWN\)\)$$' - \
- | sed 's/\s*(with incorrect FSF address)\s*$$//; s/\s(\+v\(.\+\) or later)/-\1\+/; s/^\s*\[Copyright:\s*/ \[/' \
- | awk '/^[^ ]/{printf "%s",$$0;next}{print}' \
- | LC_ALL=C sort $(DEB_COPYRIGHT_CHECK_SORT_OPTS) \
+ | LC_ALL=C perl -e \
+ '$$n=0; while (<>) {'\
+ ' s/[^[:print:]]//g;'\
+ ' 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/^\+//'`; \
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-lint-perl/debian/cdbs/1/rules/upstream-tarball.mk
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-lint-perl/debian/cdbs/1/rules/upstream-tarball.mk?rev=22270&op=diff
==============================================================================
--- trunk/libhtml-lint-perl/debian/cdbs/1/rules/upstream-tarball.mk (original)
+++ trunk/libhtml-lint-perl/debian/cdbs/1/rules/upstream-tarball.mk Sat Jun 28 17:22:44 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-lint-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-lint-perl/debian/changelog?rev=22270&op=diff
==============================================================================
--- trunk/libhtml-lint-perl/debian/changelog (original)
+++ trunk/libhtml-lint-perl/debian/changelog Sat Jun 28 17:22:44 2008
@@ -1,8 +1,33 @@
-libhtml-lint-perl (2.04-1) UNRELEASED; urgency=low
+libhtml-lint-perl (2.04-1) unstable; urgency=low
* New upstream release.
+ * Update local cdbs tweaks:
+ + Various updates to copyright-check.mk, most importantly relaxing
+ to only warn by default.
+ + Drop wget options broken with recent versions of wget in
+ update-tarball.mk.
+ + Cosmetic updates to README.cdbs-tweaks.
+ * 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> Sat, 28 Jun 2008 19:10:39 +0200
+
+ * Update local cdbs snippets:
+ + Major improvements to update-tarball (but none of them affecting this
+ current packaging).
+ + Major improvements to copyright-check, including new versioned
+ build-dependency on devscripts. Update debian/copyright_hints.
+ + Drop buildcore.mk override. Set DEB_AUTO_UPDATE_DEBIAN_CONTROL directly
+ instead when needed.
+ + Fix buildinfo.mk invoking dh-buildinfo only once.
+ + Update debian/README.cdbs-tweaks to no longer mention buildcore.mk
+ override.
+ * Fix double cdbs build-dependencies in debian/rules.
+ * 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, 28 Jun 2008 19:22:37 +0200
libhtml-lint-perl (2.02-3) unstable; urgency=medium
Modified: trunk/libhtml-lint-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-lint-perl/debian/compat?rev=22270&op=diff
==============================================================================
--- trunk/libhtml-lint-perl/debian/compat (original)
+++ trunk/libhtml-lint-perl/debian/compat Sat Jun 28 17:22:44 2008
@@ -1,1 +1,1 @@
-5
+6
More information about the Pkg-perl-cvs-commits
mailing list