r17841 - in /trunk/libnet-netmask-perl/debian: README.cdbs-tweaks cdbs/1/rules/buildcore.mk cdbs/1/rules/copyright-check.mk cdbs/1/rules/upstream-tarball.mk changelog compat control control.in copyright copyright_hints rules watch
js at users.alioth.debian.org
js at users.alioth.debian.org
Wed Mar 19 02:20:04 UTC 2008
Author: js
Date: Wed Mar 19 02:20:03 2008
New Revision: 17841
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=17841
Log:
* Pass over maintenance of the package to the Perl group: Change Maintainer,
and add myself to Uploaders.
* Rewrite debian/copyright:
+ Conform to proposed new format at
http://wiki.debian.org/Proposals/CopyrightFormat .
+ Extend upstream copyright years to 2006.
+ Debian Perl Team holds copyright for Debian packaging in 2008.
* Add Vcs-Svn and Vcs-Browser fields to debian/control.
* Move Homepage to own field (from pseudo-field in long description).
* Bump debhelper compat level and build-dependency to version 5.
* Update debian/watch:
+ Use svn-upgrade (not uupdate).
+ Use by-dist upstream URL.
* Bump up standards-version to 3.7.3 (no changes needed).
* 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.
+ Update debian/README.cdbs-tweaks to no longer mention buildcore.mk
override.
* Semi-auto-update debian/control to apply changes contained in the above:
DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
Removed:
trunk/libnet-netmask-perl/debian/cdbs/1/rules/buildcore.mk
Modified:
trunk/libnet-netmask-perl/debian/README.cdbs-tweaks
trunk/libnet-netmask-perl/debian/cdbs/1/rules/copyright-check.mk
trunk/libnet-netmask-perl/debian/cdbs/1/rules/upstream-tarball.mk
trunk/libnet-netmask-perl/debian/changelog
trunk/libnet-netmask-perl/debian/compat
trunk/libnet-netmask-perl/debian/control
trunk/libnet-netmask-perl/debian/control.in
trunk/libnet-netmask-perl/debian/copyright
trunk/libnet-netmask-perl/debian/copyright_hints
trunk/libnet-netmask-perl/debian/rules
trunk/libnet-netmask-perl/debian/watch
Modified: trunk/libnet-netmask-perl/debian/README.cdbs-tweaks
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-netmask-perl/debian/README.cdbs-tweaks?rev=17841&op=diff
==============================================================================
--- trunk/libnet-netmask-perl/debian/README.cdbs-tweaks (original)
+++ trunk/libnet-netmask-perl/debian/README.cdbs-tweaks Wed Mar 19 02:20:03 2008
@@ -18,24 +18,6 @@
-Improved support for cdbs-autoupdate
-------------------------------------
-
-CDBS invented a cool way to help keep build-dependencies up-to-date.
-
-It is disabled by default, as messing with debian/rules at build time
-violates Debian Policy: A build must not change conditions for building.
-
-Some consider this CDBS feature evil.
-
-Some enable the feature within a package, and gets smacked by ftp-master
-or others (there's even a lintian check to complain about it now).
-
-This tweak enables the feature when the build environment contains the
-non-default hint "cdbs-autoupdate" in the DEB_BUILD_OPTIONS variable.
-
-
-
New buildinfo rule
------------------
@@ -48,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.
@@ -68,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.
@@ -104,3 +102,10 @@
Include BTS control info found in debian/*.bts files, or alternatively
redirect bug reports to the email address defined in DEB_BTS_EMAIL.
+
+
+
+New dict class
+--------------
+
+Rules for packaging ispell, aspell, myspell and wordlist dictionaries.
Modified: trunk/libnet-netmask-perl/debian/cdbs/1/rules/copyright-check.mk
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-netmask-perl/debian/cdbs/1/rules/copyright-check.mk?rev=17841&op=diff
==============================================================================
--- trunk/libnet-netmask-perl/debian/cdbs/1/rules/copyright-check.mk (original)
+++ trunk/libnet-netmask-perl/debian/cdbs/1/rules/copyright-check.mk Wed Mar 19 02:20:03 2008
@@ -1,5 +1,5 @@
# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2005-2007 Jonas Smedegaard <dr at jones.dk>
+# Copyright © 2005-2008 Jonas Smedegaard <dr at jones.dk>
# Description: Check for changes to copyright notices in source
#
# This program is free software; you can redistribute it and/or
@@ -17,10 +17,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
# 02111-1307 USA.
-# TODO: Save scan as "file: match" (needs rewrite of main loop in perl)
-
-# TODO: Save scan as "file (license): match" (needs /usr/bin/licensecheck from kdesdk-scripts)
-
_cdbs_scripts_path ?= /usr/lib/cdbs
_cdbs_rules_path ?= /usr/share/cdbs/1/rules
_cdbs_class_path ?= /usr/share/cdbs/1/class
@@ -30,28 +26,56 @@
include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-cdbs_copyright-check_find_opts := -not -regex 'debian/.*' -not -regex '\(.*/\)?config\.\(guess\|sub\|rpath\)\(\..*\)?'
-cdbs_copyright-check_egrep_opts := --text -rih '(copyright|\(c\) ).*[0-9]{4}'
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), devscripts (>= 2.10.7)
+
+# Single regular expression for files to include or ignore
+DEB_COPYRIGHT_CHECK_REGEX = .*
+DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^(debian/.*|(.*/)?config\.(guess|sub|rpath)(\..*)?)$
pre-build:: debian/stamp-copyright-check
debian/stamp-copyright-check:
@echo 'Scanning upstream source for new/changed copyright notices (except debian subdir!)...'
- find * -type f $(cdbs_copyright-check_find_opts) -exec cat '{}' ';' \
- | tr '\r' '\n' \
- | LC_ALL=C sed -e 's/[^[:print:]]//g' \
- | egrep $(cdbs_copyright-check_egrep_opts) \
- | sed -e 's/^[[:space:]*#]*//' -e 's/[[:space:]]*$$//' \
- | LC_ALL=C sort -u \
+
+# 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)' * \
+ | LC_ALL=C perl -e \
+ '$$n=0; while (<>) {'\
+ ' 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(", ", 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/^\+//'`; \
+ @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 "ERROR: The following new or changed copyright notices discovered:"; \
+ echo; \
echo "$$newstrings"; \
- echo "Trying to locate the files containing the new/changed copyright notices..."; \
- echo "(Strings part of binary data you need to resolve yourself)"; \
- find * -type f $(cdbs_copyright-check_find_opts) -exec grep -F -l -e "$$newstrings" '{}' ';'; \
echo; \
echo "To fix the situation please do the following:"; \
echo " 1) Investigate the above changes and update debian/copyright as needed"; \
Modified: trunk/libnet-netmask-perl/debian/cdbs/1/rules/upstream-tarball.mk
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-netmask-perl/debian/cdbs/1/rules/upstream-tarball.mk?rev=17841&op=diff
==============================================================================
--- trunk/libnet-netmask-perl/debian/cdbs/1/rules/upstream-tarball.mk (original)
+++ trunk/libnet-netmask-perl/debian/cdbs/1/rules/upstream-tarball.mk Wed Mar 19 02:20:03 2008
@@ -1,5 +1,5 @@
# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2007 Jonas Smedegaard <dr at jones.dk>
+# Copyright © 2007-2008 Jonas Smedegaard <dr at jones.dk>
# Description: Convenience rules for dealing with upstream tarballs
#
# This program is free software; you can redistribute it and/or
@@ -24,27 +24,40 @@
ifndef _cdbs_rules_upstream_tarball
_cdbs_rules_upstream_tarball := 1
+include $(_cdbs_rules_path)/buildvars.mk$(_cdbs_makefile_suffix)
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.39)
+
# Prefix for upstream location of all upstream tarballs (mandatory!)
#DEB_UPSTREAM_URL =
+
DEB_UPSTREAM_PACKAGE = $(DEB_SOURCE_PACKAGE)
-DEB_UPSTREAM_TARBALL_VERSION = $(if $(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE)),$(shell basename '$(DEB_UPSTREAM_VERSION)' '.$(DEB_UPSTREAM_REPACKAGE_TAG)'),$(DEB_UPSTREAM_VERSION))
+DEB_UPSTREAM_TARBALL_VERSION = $(if $(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE)),$(DEB_UPSTREAM_VERSION:$(DEB_UPSTREAM_REPACKAGE_DELIMITER)$(DEB_UPSTREAM_REPACKAGE_TAG)=),$(DEB_UPSTREAM_VERSION))
DEB_UPSTREAM_TARBALL_EXTENSION = tar.gz
# Checksum to ensure integrity of downloadeds using get-orig-source (optional)
#DEB_UPSTREAM_TARBALL_MD5 =
DEB_UPSTREAM_WORKDIR = ../tarballs
+# Perl regexp to change locally used string into that in upstream URL and srcdir
+#DEB_UPSTREAM_TARBALL_VERSION_MANGLE
+cdbs_upstream_tarball_version_mangled = $(if $(strip $(DEB_UPSTREAM_TARBALL_VERSION_MANGLE)),$(shell echo '$(DEB_UPSTREAM_TARBALL_VERSION)' | perl -pe '$(DEB_UPSTREAM_TARBALL_VERSION_MANGLE)'),$(DEB_UPSTREAM_TARBALL_VERSION))
+
+# Base filename (without extension) as used in upstream URL
+DEB_UPSTREAM_TARBALL_BASENAME = $(DEB_UPSTREAM_PACKAGE)-$(cdbs_upstream_tarball_version_mangled)
+
# Base directory within tarball
-DEB_UPSTREAM_TARBALL_SRCDIR = $(DEB_UPSTREAM_PACKAGE)-$(DEB_UPSTREAM_TARBALL_VERSION)
+DEB_UPSTREAM_TARBALL_SRCDIR = $(DEB_UPSTREAM_PACKAGE)-$(cdbs_upstream_tarball_version_mangled)
# Space-delimited list of directories and files to strip (optional)
#DEB_UPSTREAM_REPACKAGE_EXCLUDE = CVS .cvsignore doc/rfc*.txt doc/draft*.txt
DEB_UPSTREAM_REPACKAGE_TAG = dfsg
+DEB_UPSTREAM_REPACKAGE_DELIMITER = ~
-cdbs_upstream_tarball = $(DEB_UPSTREAM_PACKAGE)-$(DEB_UPSTREAM_TARBALL_VERSION).$(DEB_UPSTREAM_TARBALL_EXTENSION)
-cdbs_upstream_uncompressed_tarball = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar
-cdbs_upstream_local_tarball = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.$(if $(findstring $(DEB_UPSTREAM_TARBALL_EXTENSION),tgz),tar.gz,$(DEB_UPSTREAM_TARBALL_EXTENSION))
-cdbs_upstream_repackaged_tarball = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).$(DEB_UPSTREAM_REPACKAGE_TAG).orig.tar.gz
+cdbs_upstream_tarball = $(DEB_UPSTREAM_TARBALL_BASENAME).$(DEB_UPSTREAM_TARBALL_EXTENSION)
+cdbs_upstream_local_tarball = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION).orig.$(if $(findstring $(DEB_UPSTREAM_TARBALL_EXTENSION),tgz),tar.gz,$(DEB_UPSTREAM_TARBALL_EXTENSION))
+cdbs_upstream_repackaged_basename = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION)$(DEB_UPSTREAM_REPACKAGE_DELIMITER)$(DEB_UPSTREAM_REPACKAGE_TAG).orig
+cdbs_upstream_uncompressed_tarball = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION).orig.tar
# # These variables are deprecated
_cdbs_deprecated_vars += DEB_UPSTREAM_TARBALL DEB_UPSTREAM_LOCAL_TARBALL DEB_UPSTREAM_REPACKAGE_TARBALL
@@ -59,7 +72,10 @@
@@dh_testdir
@@mkdir -p "$(DEB_UPSTREAM_WORKDIR)"
- @if [ ! -f "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ] ; then \
+ @if [ ! -s "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ] ; then \
+ if [ -f "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ] ; then \
+ 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)" ; \
else \
@@ -81,25 +97,41 @@
echo "Upstream tarball NOT trusted (current md5sum is $$md5current)!" ; \
fi
- @case "$(cdbs_upstream_local_tarball)" in \
+# TODO: Rewrite using make variables like cdbs_upstream_unpack_cmd and
+# DEB_UPSTREAM_SUPPORTED_COMPRESSIONS (recent dpkg supports bz2)
+ @untar="tar -x -C"; \
+ case "$(cdbs_upstream_local_tarball)" in \
*.tar.gz) unpack="gunzip -c";; \
*.tar.bz2) unpack="bunzip2 -c"; uncompress="bunzip2";; \
*.tar.Z) unpack="uncompress -c"; uncompress="uncompress";; \
+ *.zip) unpack="unzip -q"; uncompress="false"; untar="-d"; nopipe="true";; \
*.tar) unpack="cat"; uncompress="true";; \
*) echo "Unknown extension for upstream tarball $(cdbs_upstream_local_tarball)"; false;; \
esac && \
- if [ -n "$(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE))" ]; then \
+ if [ -n "$(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE))" ] || [ "$$uncompress" = "false" ]; then \
echo "Repackaging tarball ..." && \
mkdir -p "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" && \
- $$unpack "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" \
- | tar -x -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(patsubst %,--exclude='%',$(DEB_UPSTREAM_REPACKAGE_EXCLUDE)) && \
- GZIP=-9 tar -b1 -czf "$(cdbs_upstream_repackaged_tarball)" -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(DEB_UPSTREAM_TARBALL_SRCDIR) && \
+ if [ -n "$$nopipe" ]; then \
+ $$unpack "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" \
+ $$untar "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(patsubst %,--exclude='%',$(DEB_UPSTREAM_REPACKAGE_EXCLUDE)); \
+ else \
+ $$unpack "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" \
+ | $$untar "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(patsubst %,--exclude='%',$(DEB_UPSTREAM_REPACKAGE_EXCLUDE)); \
+ fi && \
+ if [ "$(DEB_UPSTREAM_TARBALL_SRCDIR)" != "$(cdbs_upstream_repackaged_basename)" ]; then \
+ mv -T "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)/$(DEB_UPSTREAM_TARBALL_SRCDIR)" "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)/$(cdbs_upstream_repackaged_basename)"; \
+ fi && \
+ if [ -n "$(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE))" ]; then \
+ GZIP=-9 tar -b1 -czf "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_repackaged_basename).tar.gz" -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" "$(cdbs_upstream_repackaged_basename)"; \
+ else \
+ GZIP=-9 tar -b1 -czf "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_uncompressed_tarball).gz" -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" "$(cdbs_upstream_repackaged_basename)"; \
+ fi && \
echo "Cleaning up" && \
rm -rf "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)"; \
elif [ -n "$$uncompress" ]; then \
echo "Recompressing tarball ..." && \
$$uncompress "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)"; \
- bzip -9 "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_uncompressed_tarball)"; \
+ gzip -9 "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_uncompressed_tarball)"; \
fi
DEB_PHONY_RULES += print-version get-orig-source
Modified: trunk/libnet-netmask-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-netmask-perl/debian/changelog?rev=17841&op=diff
==============================================================================
--- trunk/libnet-netmask-perl/debian/changelog (original)
+++ trunk/libnet-netmask-perl/debian/changelog Wed Mar 19 02:20:03 2008
@@ -1,8 +1,36 @@
-libnet-netmask-perl (1.9015-2) UNRELEASED; urgency=low
+libnet-netmask-perl (1.9015-2) unstable; urgency=low
+ [ Gunnar Wolf ]
* Fixed typo in long description (Closes: #300016)
- -- Gunnar Wolf <gwolf at debian.org> Mon, 10 Mar 2008 09:52:12 -0600
+ [ Jonas Smedegaard ]
+ * Pass over maintenance of the package to the Perl group: Change Maintainer,
+ and add myself to Uploaders.
+ * Rewrite debian/copyright:
+ + Conform to proposed new format at
+ http://wiki.debian.org/Proposals/CopyrightFormat .
+ + Extend upstream copyright years to 2006.
+ + Debian Perl Team holds copyright for Debian packaging in 2008.
+ * Add Vcs-Svn and Vcs-Browser fields to debian/control.
+ * Move Homepage to own field (from pseudo-field in long description).
+ * Bump debhelper compat level and build-dependency to version 5.
+ * Update debian/watch:
+ + Use svn-upgrade (not uupdate).
+ + Use by-dist upstream URL.
+ * Bump up standards-version to 3.7.3 (no changes needed).
+ * 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.
+ + Update debian/README.cdbs-tweaks to no longer mention buildcore.mk
+ override.
+ * 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> Wed, 19 Mar 2008 03:00:53 +0100
libnet-netmask-perl (1.9015-1) unstable; urgency=low
Modified: trunk/libnet-netmask-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-netmask-perl/debian/compat?rev=17841&op=diff
==============================================================================
--- trunk/libnet-netmask-perl/debian/compat (original)
+++ trunk/libnet-netmask-perl/debian/compat Wed Mar 19 02:20:03 2008
@@ -1,1 +1,1 @@
-4
+5
Modified: trunk/libnet-netmask-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-netmask-perl/debian/control?rev=17841&op=diff
==============================================================================
--- trunk/libnet-netmask-perl/debian/control (original)
+++ trunk/libnet-netmask-perl/debian/control Wed Mar 19 02:20:03 2008
@@ -1,9 +1,13 @@
Source: libnet-netmask-perl
Section: perl
Priority: optional
-Maintainer: Jonas Smedegaard <dr at jones.dk>
-Build-Depends: , cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), dh-buildinfo, perl (>= 5.6.0-16)
-Standards-Version: 3.7.2
+Build-Depends: cdbs (>= 0.4.39), devscripts (>= 2.10.7), dh-buildinfo, debhelper (>= 5), 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
+Vcs-Svn: svn://svn.debian.org/collab-maint/deb-maint/libnet-netmask-perl/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/libnet-netmask-perl/trunk
+Homepage: http://search.cpan.org/dist/Net-Netmask/
Package: libnet-netmask-perl
Architecture: all
@@ -22,5 +26,3 @@
are functions to turn a list of CIDR blocks into a list of IP addresses.
.
There is a function for sorting by text IP address.
- .
- Homepage: http://search.cpan.org/dist/Net-Netmask/
Modified: trunk/libnet-netmask-perl/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-netmask-perl/debian/control.in?rev=17841&op=diff
==============================================================================
--- trunk/libnet-netmask-perl/debian/control.in (original)
+++ trunk/libnet-netmask-perl/debian/control.in Wed Mar 19 02:20:03 2008
@@ -1,9 +1,13 @@
Source: libnet-netmask-perl
Section: perl
Priority: optional
-Maintainer: Jonas Smedegaard <dr at jones.dk>
Build-Depends: @cdbs@
-Standards-Version: 3.7.2
+Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
+Uploaders: Jonas Smedegaard <dr at jones.dk>
+Standards-Version: 3.7.3
+Vcs-Svn: svn://svn.debian.org/collab-maint/deb-maint/libnet-netmask-perl/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/libnet-netmask-perl/trunk
+Homepage: http://search.cpan.org/dist/Net-Netmask/
Package: libnet-netmask-perl
Architecture: all
@@ -18,9 +22,7 @@
.
There are also functions to put a network block into a table and then
later lookup network blocks by IP address in that table. There are
- functions to turn a IP address range into a list of CIDR blocks. There
+ functions to turn an IP address range into a list of CIDR blocks. There
are functions to turn a list of CIDR blocks into a list of IP addresses.
.
There is a function for sorting by text IP address.
- .
- Homepage: http://search.cpan.org/dist/Net-Netmask/
Modified: trunk/libnet-netmask-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-netmask-perl/debian/copyright?rev=17841&op=diff
==============================================================================
--- trunk/libnet-netmask-perl/debian/copyright (original)
+++ trunk/libnet-netmask-perl/debian/copyright Wed Mar 19 02:20:03 2008
@@ -1,11 +1,18 @@
-This is Net::Netmask packaged for Debian GNU systems.
+This is Net::Netmask Perl module packaged for Debian GNU systems.
+
+Upstream author: David Muir Sharnoff <muir at idiom.com>.
Upstream source: http://www.cpan.org/modules/by-module/Net/
-Upstream Author: David Muir Sharnoff <muir at idiom.com>.
+Files: debian/*
+Copyright: © 2001-2008 Jonas Smedegaard <dr at jones.dk>
+ © 2008 Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
+License: GPL-2+
+ The Debian packaging information is under the GPL, version 2 or later
-Copyright and license:
-
-Copyright (C) 1998-2003 David Muir Sharnoff. License hereby
-granted for anyone to use, modify or redistribute this module at
-their own risk. Please feed useful changes back to muir at idiom.com.
+Files: *
+Copyright: © 1998-2006 David Muir Sharnoff.
+License: Other
+ Copyright (C) 1998-2006 David Muir Sharnoff. License hereby granted for
+ anyone to use, modify or redistribute this module at their own risk.
+ Please feed useful changes back to <muir at idiom.com>.
Modified: trunk/libnet-netmask-perl/debian/copyright_hints
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-netmask-perl/debian/copyright_hints?rev=17841&op=diff
==============================================================================
--- trunk/libnet-netmask-perl/debian/copyright_hints (original)
+++ trunk/libnet-netmask-perl/debian/copyright_hints Wed Mar 19 02:20:03 2008
@@ -1,3 +1,2 @@
-Copyright (C) 1998-2006 David Muir Sharnoff. License hereby
-Copyright (C) 1998-2006 David Muir Sharnoff. License hereby granted for
-Copyright (C) 1998-2006, David Muir Sharnoff <muir at idiom.com>
+*No copyright* UNKNOWN []: CHANGELOG, MANIFEST, META.yml, Makefile.PL, Netmask.pod, README, t/badnets.t, t/netmasks.t, t/sortspeed-blocks.t, t/sortspeed-ip.t
+UNKNOWN [1998-2006, David Muir Sharnoff <muir at idiom.com>]: Netmask.pm
Modified: trunk/libnet-netmask-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-netmask-perl/debian/rules?rev=17841&op=diff
==============================================================================
--- trunk/libnet-netmask-perl/debian/rules (original)
+++ trunk/libnet-netmask-perl/debian/rules Wed Mar 19 02:20:03 2008
@@ -1,9 +1,8 @@
#!/usr/bin/make -f
# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003-2007 Jonas Smedegaard <dr at jones.dk>
+# Copyright © 2003-2008 Jonas Smedegaard <dr at jones.dk>
# See debian/README.cdbs-tweaks for info on local overrides
-include debian/cdbs/1/rules/buildcore.mk
include debian/cdbs/1/rules/upstream-tarball.mk
include debian/cdbs/1/rules/copyright-check.mk
include debian/cdbs/1/rules/buildinfo.mk
@@ -15,3 +14,6 @@
DEB_UPSTREAM_URL = http://www.cpan.org/modules/by-module/Net
DEB_UPSTREAM_TARBALL_VERSION := $(shell echo '$(DEB_UPSTREAM_VERSION)' | awk -F. '{print $$1"."$$2$$3$$4$$5}')
DEB_UPSTREAM_TARBALL_MD5 = 90298105cd17a5c2a4059297e09f1546
+
+# 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/ *, *$$//')
Modified: trunk/libnet-netmask-perl/debian/watch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-netmask-perl/debian/watch?rev=17841&op=diff
==============================================================================
--- trunk/libnet-netmask-perl/debian/watch (original)
+++ trunk/libnet-netmask-perl/debian/watch Wed Mar 19 02:20:03 2008
@@ -1,3 +1,4 @@
# Run the "uscan" command to check for upstream updates and more.
version=3
-http://www.cpan.org/modules/by-module/Net/Net-Netmask-([\d+\.]+|\d+)\.tar\.gz debian uupdate
+http://search.cpan.org/dist/Net-Netmask/ \
+ .*/Net-Netmask-(\d.+).tar.gz debian svn-upgrade
More information about the Pkg-perl-cvs-commits
mailing list