r22220 - in /trunk/libconvert-uulib-perl/debian: README.cdbs-tweaks cdbs/1/rules/copyright-check.mk cdbs/1/rules/upstream-tarball.mk changelog compat control copyright_hints
js at users.alioth.debian.org
js at users.alioth.debian.org
Fri Jun 27 10:13:21 UTC 2008
Author: js
Date: Fri Jun 27 10:13:21 2008
New Revision: 22220
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=22220
Log:
* Update local cdbs tweaks:
+ Various updates to copyright-check.mk, most importantly relaxing
to only warn by default. Closes: bug#487062, thanks to Lucas
Nussbaum.
+ 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
Modified:
trunk/libconvert-uulib-perl/debian/README.cdbs-tweaks
trunk/libconvert-uulib-perl/debian/cdbs/1/rules/copyright-check.mk
trunk/libconvert-uulib-perl/debian/cdbs/1/rules/upstream-tarball.mk
trunk/libconvert-uulib-perl/debian/changelog
trunk/libconvert-uulib-perl/debian/compat
trunk/libconvert-uulib-perl/debian/control
trunk/libconvert-uulib-perl/debian/copyright_hints
Modified: trunk/libconvert-uulib-perl/debian/README.cdbs-tweaks
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconvert-uulib-perl/debian/README.cdbs-tweaks?rev=22220&op=diff
==============================================================================
--- trunk/libconvert-uulib-perl/debian/README.cdbs-tweaks (original)
+++ trunk/libconvert-uulib-perl/debian/README.cdbs-tweaks Fri Jun 27 10:13:21 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/libconvert-uulib-perl/debian/cdbs/1/rules/copyright-check.mk
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconvert-uulib-perl/debian/cdbs/1/rules/copyright-check.mk?rev=22220&op=diff
==============================================================================
--- trunk/libconvert-uulib-perl/debian/cdbs/1/rules/copyright-check.mk (original)
+++ trunk/libconvert-uulib-perl/debian/cdbs/1/rules/copyright-check.mk Fri Jun 27 10:13:21 2008
@@ -28,12 +28,12 @@
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
@@ -46,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;'\
@@ -58,17 +59,17 @@
'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}))(?{$$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 @{ $$patterns{"$$pattern"} }, $$file->{name};'\
+ ' push @{ $$patternfiles{"$$pattern"} }, $$file->{name};'\
'};'\
'foreach $$pattern ( sort {'\
- ' @{$$patterns{$$b}} <=> @{$$patterns{$$a}}'\
+ ' @{$$patternfiles{$$b}} <=> @{$$patternfiles{$$a}}'\
' ||'\
' $$a cmp $$b'\
- ' } keys %patterns ) {'\
- ' print "$$pattern: ", join(", ", sort @{ $$patterns{$$pattern} }), "\n";'\
+ ' } 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 -`"; \
@@ -76,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/libconvert-uulib-perl/debian/cdbs/1/rules/upstream-tarball.mk
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconvert-uulib-perl/debian/cdbs/1/rules/upstream-tarball.mk?rev=22220&op=diff
==============================================================================
--- trunk/libconvert-uulib-perl/debian/cdbs/1/rules/upstream-tarball.mk (original)
+++ trunk/libconvert-uulib-perl/debian/cdbs/1/rules/upstream-tarball.mk Fri Jun 27 10:13:21 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/libconvert-uulib-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconvert-uulib-perl/debian/changelog?rev=22220&op=diff
==============================================================================
--- trunk/libconvert-uulib-perl/debian/changelog (original)
+++ trunk/libconvert-uulib-perl/debian/changelog Fri Jun 27 10:13:21 2008
@@ -3,6 +3,17 @@
* New upstream release. Bugfix only - fixing "infinite-looping problem
when scanning in freestyle mode", so possibly security-related.
* Setting urgency=medium due to the possible security relation.
+ * Update local cdbs tweaks:
+ + Various updates to copyright-check.mk, most importantly relaxing
+ to only warn by default. Closes: bug#487062, thanks to Lucas
+ Nussbaum.
+ + 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> Fri, 27 Jun 2008 11:46:52 +0200
Modified: trunk/libconvert-uulib-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconvert-uulib-perl/debian/compat?rev=22220&op=diff
==============================================================================
--- trunk/libconvert-uulib-perl/debian/compat (original)
+++ trunk/libconvert-uulib-perl/debian/compat Fri Jun 27 10:13:21 2008
@@ -1,1 +1,1 @@
-5
+6
Modified: trunk/libconvert-uulib-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconvert-uulib-perl/debian/control?rev=22220&op=diff
==============================================================================
--- trunk/libconvert-uulib-perl/debian/control (original)
+++ trunk/libconvert-uulib-perl/debian/control Fri Jun 27 10:13:21 2008
@@ -1,7 +1,7 @@
Source: libconvert-uulib-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>
Standards-Version: 3.7.3
Modified: trunk/libconvert-uulib-perl/debian/copyright_hints
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconvert-uulib-perl/debian/copyright_hints?rev=22220&op=diff
==============================================================================
--- trunk/libconvert-uulib-perl/debian/copyright_hints (original)
+++ trunk/libconvert-uulib-perl/debian/copyright_hints Fri Jun 27 10:13:21 2008
@@ -1,6 +1,36 @@
-*No copyright* UNKNOWN []: COPYING, Changes, MANIFEST, META.yml, Makefile.PL, README, UUlib.pm, UUlib.xs, doc/HISTORY, doc/library.pdf, example-decoder, t/cb.t, typemap, uulib/Makefile.in, uulib/acconfig.h, uulib/aclocal.m4, uulib/config.h.in, uulib/configure.in, uulib/crc32.h, uulib/fptools.c, uulib/fptools.h, uulib/uustring.awk, uulib/uustring.h
-*No copyright* GPL-2+ []: uulib/uucheck.c, uulib/uudeview.h, uulib/uuencode.c, uulib/uuint.h, uulib/uulib.c, uulib/uunconc.c, uulib/uuscan.c, uulib/uustring.c, uulib/uuutil.c
+*No copyright* UNKNOWN []: COPYING
+ Changes
+ MANIFEST
+ META.yml
+ Makefile.PL
+ README
+ UUlib.pm
+ UUlib.xs
+ doc/HISTORY
+ example-decoder
+ t/cb.t
+ typemap
+ uulib/Makefile.in
+ uulib/acconfig.h
+ uulib/aclocal.m4
+ uulib/config.h.in
+ uulib/configure.in
+ uulib/fptools.c
+ uulib/fptools.h
+ uulib/uustring.awk
+ uulib/uustring.h
+GPL-2+ [1994-2001 by Frank Pilhofer. The author may]: uulib/uucheck.c
+ uulib/uuencode.c
+ uulib/uuint.h
+ uulib/uulib.c
+ uulib/uunconc.c
+ uulib/uuscan.c
+ uulib/uustring.c
+ uulib/uuutil.c
+GPL-2+ [1994-2001 by Frank Pilhofer. The author may / () / c]: uulib/uudeview.h
+UNKNOWN ['G9Gy]: doc/library.pdf
+UNKNOWN [() / c]: uulib/crc32.h
UNKNOWN [1989, 1991 Free Software Foundation, Inc / the software, and]: COPYING.GNU
UNKNOWN [1992, 93, 94, 95, 96 Free Software Foundation, Inc]: uulib/configure
UNKNOWN [1995-1998 Mark Adler]: uulib/crc32.c
-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]: COPYING.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]: COPYING.Artistic
More information about the Pkg-perl-cvs-commits
mailing list