r13302 - in /trunk/libnetaddr-ip-perl: ./ Lite/ debian/ debian/patches/
dmn at users.alioth.debian.org
dmn at users.alioth.debian.org
Wed Jan 23 14:23:22 UTC 2008
Author: dmn
Date: Wed Jan 23 14:23:21 2008
New Revision: 13302
URL: http://svn.debian.org/wsvn/?sc=1&rev=13302
Log:
* debian/rules:
+ move test suite from install to build target
+ use "$@" when touching stamps
+ clean stamps before realclean
+ make install target depend only on install-stamp and that - on
build-stamp
+ drop unneeded calls to dh_installman and dh_link
* debian/copyright:
+ use dist-based upstream URL
* Convert in-diff patches to quilt
+ use UTF-8-encoded chars instead of E<ntilde>
Added:
trunk/libnetaddr-ip-perl/debian/patches/
trunk/libnetaddr-ip-perl/debian/patches/10_special-chars-to-utf8.patch
trunk/libnetaddr-ip-perl/debian/patches/20_no-rfc1884.txt-in-MANIFEST.patch
trunk/libnetaddr-ip-perl/debian/patches/series
Modified:
trunk/libnetaddr-ip-perl/IP.pm
trunk/libnetaddr-ip-perl/Lite/Lite.pm
trunk/libnetaddr-ip-perl/Lite/README
trunk/libnetaddr-ip-perl/MANIFEST
trunk/libnetaddr-ip-perl/debian/changelog
trunk/libnetaddr-ip-perl/debian/control
trunk/libnetaddr-ip-perl/debian/copyright
trunk/libnetaddr-ip-perl/debian/rules
Modified: trunk/libnetaddr-ip-perl/IP.pm
URL: http://svn.debian.org/wsvn/trunk/libnetaddr-ip-perl/IP.pm?rev=13302&op=diff
==============================================================================
--- trunk/libnetaddr-ip-perl/IP.pm (original)
+++ trunk/libnetaddr-ip-perl/IP.pm Wed Jan 23 14:23:21 2008
@@ -1695,7 +1695,7 @@
=head1 AUTHORS
-Luis E. MuE<ntilde>oz E<lt>luismunoz at cpan.orgE<gt>,
+Luis E. Muñoz E<lt>luismunoz at cpan.orgE<gt>,
Michael Robinton E<lt>michael at bizsystems.comE<gt>
=head1 WARRANTY
@@ -1705,7 +1705,7 @@
=head1 LICENSE
-This software is (c) Luis E. MuE<ntilde>oz, 1999 - 2007, and (c) Michael
+This software is (c) Luis E. Muñoz, 1999 - 2007, and (c) Michael
Robinton, 2006 - 2007. It can be used under the terms of the Perl
artistic license provided that proper credit for the work of the
authors is preserved in the form of this copyright notice and license
Modified: trunk/libnetaddr-ip-perl/Lite/Lite.pm
URL: http://svn.debian.org/wsvn/trunk/libnetaddr-ip-perl/Lite/Lite.pm?rev=13302&op=diff
==============================================================================
--- trunk/libnetaddr-ip-perl/Lite/Lite.pm (original)
+++ trunk/libnetaddr-ip-perl/Lite/Lite.pm Wed Jan 23 14:23:21 2008
@@ -1037,7 +1037,7 @@
=head1 AUTHOR
-Luis E. MuE<ntilde>oz E<lt>luismunoz at cpan.orgE<gt>,
+Luis E. Muñoz E<lt>luismunoz at cpan.orgE<gt>,
Michael Robinton E<lt>michael at bizsystems.comE<gt>
=head1 WARRANTY
@@ -1047,7 +1047,7 @@
=head1 LICENSE
-This software is (c) Luis E. MuE<ntilde>oz, 1999 - 2005, and (c) Michael Robinton, 2006.
+This software is (c) Luis E. Muñoz, 1999 - 2005, and (c) Michael Robinton, 2006.
It can be used under the terms of the perl artistic license provided that
proper credit for the work of the author is preserved in the form of this
copyright notice and license for this module.
Modified: trunk/libnetaddr-ip-perl/Lite/README
URL: http://svn.debian.org/wsvn/trunk/libnetaddr-ip-perl/Lite/README?rev=13302&op=diff
==============================================================================
--- trunk/libnetaddr-ip-perl/Lite/README (original)
+++ trunk/libnetaddr-ip-perl/Lite/README Wed Jan 23 14:23:21 2008
@@ -344,7 +344,7 @@
:old_nth
AUTHOR
- Luis E. Muñoz <luismunoz at cpan.org>, Michael Robinton
+ Luis E. Muñoz <luismunoz at cpan.org>, Michael Robinton
<michael at bizsystems.com>
WARRANTY
@@ -352,7 +352,7 @@
by using it you accept any and all the liability.
LICENSE
- This software is (c) Luis E. Muñoz, 1999 - 2005, and (c) Michael
+ This software is (c) Luis E. Muñoz, 1999 - 2005, and (c) Michael
Robinton, 2006. It can be used under the terms of the perl artistic
license provided that proper credit for the work of the author is
preserved in the form of this copyright notice and license for this
Modified: trunk/libnetaddr-ip-perl/MANIFEST
URL: http://svn.debian.org/wsvn/trunk/libnetaddr-ip-perl/MANIFEST?rev=13302&op=diff
==============================================================================
--- trunk/libnetaddr-ip-perl/MANIFEST (original)
+++ trunk/libnetaddr-ip-perl/MANIFEST Wed Jan 23 14:23:21 2008
@@ -1,4 +1,5 @@
Changes
+docs/rfc1884.txt
IP.pm
Lite/Changes
Lite/Lite.pm
Modified: trunk/libnetaddr-ip-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libnetaddr-ip-perl/debian/changelog?rev=13302&op=diff
==============================================================================
--- trunk/libnetaddr-ip-perl/debian/changelog (original)
+++ trunk/libnetaddr-ip-perl/debian/changelog Wed Jan 23 14:23:21 2008
@@ -15,7 +15,17 @@
* debian/watch: use such mangling that thhe package version ends up with
+dfsg
+ call debian/repack.sh on downloading upstream source
-
+ * debian/rules:
+ + move test suite from install to build target
+ + use "$@" when touching stamps
+ + clean stamps before realclean
+ + make install target depend only on install-stamp and that - on
+ build-stamp
+ + drop unneeded calls to dh_installman and dh_link
+ * debian/copyright:
+ + use dist-based upstream URL
+ * Convert in-diff patches to quilt
+ + use UTF-8-encoded chars instead of E<ntilde>
-- gregor herrmann <gregor+debian at comodo.priv.at> Tue, 09 Oct 2007 22:31:19 +0200
Modified: trunk/libnetaddr-ip-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libnetaddr-ip-perl/debian/control?rev=13302&op=diff
==============================================================================
--- trunk/libnetaddr-ip-perl/debian/control (original)
+++ trunk/libnetaddr-ip-perl/debian/control Wed Jan 23 14:23:21 2008
@@ -1,7 +1,7 @@
Source: libnetaddr-ip-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 5), perl (>= 5.6.0-17), libtest-pod-perl
+Build-Depends: debhelper (>= 5), perl (>= 5.6.0-17), libtest-pod-perl, quilt
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Julian Mehnle <julian at mehnle.net>, Gunnar Wolf <gwolf at debian.org>
Standards-Version: 3.7.2
Modified: trunk/libnetaddr-ip-perl/debian/copyright
URL: http://svn.debian.org/wsvn/trunk/libnetaddr-ip-perl/debian/copyright?rev=13302&op=diff
==============================================================================
--- trunk/libnetaddr-ip-perl/debian/copyright (original)
+++ trunk/libnetaddr-ip-perl/debian/copyright Wed Jan 23 14:23:21 2008
@@ -3,7 +3,7 @@
As of June 2007, it is now maintained by the Debian Perl Group
<pkg-perl-maintainers at lists.alioth.debian.org>
-It was downloaded from http://www.cpan.org/modules/by-module/NetAddr/
+It was downloaded from http://search.cpan.org/dist/NetAddr/
The upstream authors are:
Luis E. Muñoz <luismunoz at cpan.org>
Added: trunk/libnetaddr-ip-perl/debian/patches/10_special-chars-to-utf8.patch
URL: http://svn.debian.org/wsvn/trunk/libnetaddr-ip-perl/debian/patches/10_special-chars-to-utf8.patch?rev=13302&op=file
==============================================================================
--- trunk/libnetaddr-ip-perl/debian/patches/10_special-chars-to-utf8.patch (added)
+++ trunk/libnetaddr-ip-perl/debian/patches/10_special-chars-to-utf8.patch Wed Jan 23 14:23:21 2008
@@ -1,0 +1,44 @@
+Index: libnetaddr-ip-perl/Lite/README
+===================================================================
+--- libnetaddr-ip-perl.orig/Lite/README 2008-01-23 16:10:26.000000000 +0200
++++ libnetaddr-ip-perl/Lite/README 2008-01-23 16:17:32.000000000 +0200
+@@ -344,7 +344,7 @@
+ :old_nth
+
+ AUTHOR
+- Luis E. Muñoz <luismunoz at cpan.org>, Michael Robinton
++ Luis E. Muñoz <luismunoz at cpan.org>, Michael Robinton
+ <michael at bizsystems.com>
+
+ WARRANTY
+@@ -352,7 +352,7 @@
+ by using it you accept any and all the liability.
+
+ LICENSE
+- This software is (c) Luis E. Muñoz, 1999 - 2005, and (c) Michael
++ This software is (c) Luis E. Muñoz, 1999 - 2005, and (c) Michael
+ Robinton, 2006. It can be used under the terms of the perl artistic
+ license provided that proper credit for the work of the author is
+ preserved in the form of this copyright notice and license for this
+Index: libnetaddr-ip-perl/Lite/Lite.pm
+===================================================================
+--- libnetaddr-ip-perl.orig/Lite/Lite.pm 2008-01-23 16:10:26.000000000 +0200
++++ libnetaddr-ip-perl/Lite/Lite.pm 2008-01-23 16:19:09.000000000 +0200
+@@ -1037,7 +1037,7 @@
+
+ =head1 AUTHOR
+
+-Luis E. Muñoz E<lt>luismunoz at cpan.orgE<gt>,
++Luis E. Muñoz E<lt>luismunoz at cpan.orgE<gt>,
+ Michael Robinton E<lt>michael at bizsystems.comE<gt>
+
+ =head1 WARRANTY
+@@ -1047,7 +1047,7 @@
+
+ =head1 LICENSE
+
+-This software is (c) Luis E. Muñoz, 1999 - 2005, and (c) Michael Robinton, 2006.
++This software is (c) Luis E. Muñoz, 1999 - 2005, and (c) Michael Robinton, 2006.
+ It can be used under the terms of the perl artistic license provided that
+ proper credit for the work of the author is preserved in the form of this
+ copyright notice and license for this module.
Added: trunk/libnetaddr-ip-perl/debian/patches/20_no-rfc1884.txt-in-MANIFEST.patch
URL: http://svn.debian.org/wsvn/trunk/libnetaddr-ip-perl/debian/patches/20_no-rfc1884.txt-in-MANIFEST.patch?rev=13302&op=file
==============================================================================
--- trunk/libnetaddr-ip-perl/debian/patches/20_no-rfc1884.txt-in-MANIFEST.patch (added)
+++ trunk/libnetaddr-ip-perl/debian/patches/20_no-rfc1884.txt-in-MANIFEST.patch Wed Jan 23 14:23:21 2008
@@ -1,0 +1,8 @@
+--- libnetaddr-ip-perl-4.007+dfsg.orig/MANIFEST
++++ libnetaddr-ip-perl-4.007+dfsg/MANIFEST
+@@ -1,5 +1,4 @@
+ Changes
+-docs/rfc1884.txt
+ IP.pm
+ Lite/Changes
+ Lite/Lite.pm
Added: trunk/libnetaddr-ip-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libnetaddr-ip-perl/debian/patches/series?rev=13302&op=file
==============================================================================
--- trunk/libnetaddr-ip-perl/debian/patches/series (added)
+++ trunk/libnetaddr-ip-perl/debian/patches/series Wed Jan 23 14:23:21 2008
@@ -1,0 +1,2 @@
+10_special-chars-to-utf8.patch
+20_no-rfc1884.txt-in-MANIFEST.patch
Modified: trunk/libnetaddr-ip-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libnetaddr-ip-perl/debian/rules?rev=13302&op=diff
==============================================================================
--- trunk/libnetaddr-ip-perl/debian/rules (original)
+++ trunk/libnetaddr-ip-perl/debian/rules Wed Jan 23 14:23:21 2008
@@ -10,6 +10,8 @@
# If set to a true value then MakeMaker's prompt function will
# always return the default without waiting for user input.
export PERL_MM_USE_DEFAULT=1
+
+include /usr/share/quilt/quilt.make
PACKAGE=$(shell dh_listpackages)
@@ -29,32 +31,32 @@
endif
build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
# Add commands to compile the package here
$(PERL) Makefile.PL INSTALLDIRS=vendor
$(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
+ $(MAKE) test
- touch build-stamp
+ touch $@
-clean:
+clean: unpatch
dh_testdir
dh_testroot
+
+ dh_clean build-stamp install-stamp
# Add commands to clean up after the build process here
[ ! -f Makefile ] || $(MAKE) realclean
- dh_clean build-stamp install-stamp
-
-install: build install-stamp
-install-stamp:
+install: install-stamp
+install-stamp: build-stamp
dh_testdir
dh_testroot
dh_clean -k
- # Add commands to install the package into debian/$PACKAGE_NAME here
- $(MAKE) test
+ # Add commands to install the package into $(TMP) here
$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
# As this is a architecture dependent package, we are not
@@ -62,7 +64,7 @@
# the dirs, we delete them from the deb:
[ ! -d $(TMP)/usr/share/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/share/perl5
- touch install-stamp
+ touch $@
# Build architecture-independent files here.
binary-indep: build install
@@ -72,19 +74,17 @@
binary-arch: build install
dh_testdir
dh_testroot
- dh_installdocs README
+ dh_installdocs README
cp Lite/README $(TMP)/usr/share/doc/$(PACKAGE)/README.NetAddr-IP-Lite
cp Lite/Util/README $(TMP)/usr/share/doc/$(PACKAGE)/README.NetAddr-IP-Lite-Util
- dh_installman
dh_installchangelogs Changes
cp Lite/Changes $(TMP)/usr/share/doc/$(PACKAGE)/changelog.Lite
cp Lite/Util/Changes $(TMP)/usr/share/doc/$(PACKAGE)/changelog.Util
- dh_link
dh_strip
dh_compress
dh_fixperms
dh_installdeb
- dh_perl
+ dh_perl
dh_shlibdeps
dh_gencontrol
dh_md5sums
More information about the Pkg-perl-cvs-commits
mailing list