r22031 - in /trunk/libnetwork-ipv4addr-perl/debian: changelog control patches/ patches/documentation_fixes.patch patches/series rules
thialme-guest at users.alioth.debian.org
thialme-guest at users.alioth.debian.org
Sat Jun 21 11:43:22 UTC 2008
Author: thialme-guest
Date: Sat Jun 21 11:43:21 2008
New Revision: 22031
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=22031
Log:
Added quilt framework and closed #211548.
Added:
trunk/libnetwork-ipv4addr-perl/debian/patches/
trunk/libnetwork-ipv4addr-perl/debian/patches/documentation_fixes.patch
trunk/libnetwork-ipv4addr-perl/debian/patches/series
Modified:
trunk/libnetwork-ipv4addr-perl/debian/changelog
trunk/libnetwork-ipv4addr-perl/debian/control
trunk/libnetwork-ipv4addr-perl/debian/rules
Modified: trunk/libnetwork-ipv4addr-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnetwork-ipv4addr-perl/debian/changelog?rev=22031&op=diff
==============================================================================
--- trunk/libnetwork-ipv4addr-perl/debian/changelog (original)
+++ trunk/libnetwork-ipv4addr-perl/debian/changelog Sat Jun 21 11:43:21 2008
@@ -3,6 +3,8 @@
* New maintainer (Closes: #485997).
* Removed the debian directory from the upstream source.
http://rt.cpan.org/Public/Bug/Display.html?id=36973
+ * Documentation fixes (Closes: #211548)
+ Added debian/patches/documentation_fixes.patch
-- Franck Joncourt <franck.mail at dthconnex.com> Thu, 19 Jun 2008 20:04:09 +0200
Modified: trunk/libnetwork-ipv4addr-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnetwork-ipv4addr-perl/debian/control?rev=22031&op=diff
==============================================================================
--- trunk/libnetwork-ipv4addr-perl/debian/control (original)
+++ trunk/libnetwork-ipv4addr-perl/debian/control Sat Jun 21 11:43:21 2008
@@ -1,7 +1,7 @@
Source: libnetwork-ipv4addr-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 5), quilt (>= 0.40)
Build-Depends-Indep: perl (>= 5.6.10-12)
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Franck Joncourt <franck.mail at dthconnex.com>
Added: trunk/libnetwork-ipv4addr-perl/debian/patches/documentation_fixes.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnetwork-ipv4addr-perl/debian/patches/documentation_fixes.patch?rev=22031&op=file
==============================================================================
--- trunk/libnetwork-ipv4addr-perl/debian/patches/documentation_fixes.patch (added)
+++ trunk/libnetwork-ipv4addr-perl/debian/patches/documentation_fixes.patch Sat Jun 21 11:43:21 2008
@@ -1,0 +1,127 @@
+# Documentation fixes
+# Closes #211548 thanks to 'Dagurashibanipal' von Bidder
+--- libnetwork-ipv4add-perl.orig/IPv4Addr.pm
++++ libnetwork-ipv4add-perl/IPv4Addr.pm
+@@ -227,13 +227,13 @@
+ Net::IPv4Addr provides functions for parsing IPv4 addresses both
+ in traditional address/netmask format and in the new CIDR format.
+ There are also methods for calculating the network and broadcast
+-address and also to see check if a given address is in a specific
++address and also to check if a given address is in a specific
+ network.
+
+ =head1 ADDRESSES
+
+-All of Net::IPv4Addr functions accepts addresses in many
+-format. The parsing is very liberal.
++All of Net::IPv4Addr functions accept addresses in many
++formats. The parsing is very liberal.
+
+ All these addresses would be accepted:
+
+@@ -270,28 +270,15 @@
+ my $cidr = ipv4_parse($ip_str,$msk_str);
+ my ($ip) = ipv4_parse($ip_str,$msk_str);
+
+-Parse an IPv4 address and in scalar context the address in CIDR
+-format and in an array context the address and the mask length.
++Parse an IPv4 address and return in scalar context the address in CIDR
++format, in an array context the address and the mask length.
+
+ If the parameters doesn't contains a netmask or a mask length,
+ in scalar context only the IPv4 address is returned and in an
+ array context the mask length is undefined.
+
+ If the function cannot parse its input, it croaks. Trap it using
+-C<eval> if don't like that.
+-
+-=item ipv4_network
+-
+- my $cidr = ipv4_network($ip_str);
+- my $cidr = ipv4_network($cidr_str);
+- my ($net,$msk) = ipv4_network( $net_str, $msk_str);
+-
+-In scalar context, this function returns the network in CIDR format in
+-which the address is. In array context, it returns the network address and
+-its mask length as a two elements array. If the input is an host without
+-a netmask of mask length, the default netmask is assumed.
+-
+-Again, the function croak if the input is invalid.
++C<eval> if you don't like that.
+
+ =item ipv4_broadcast
+
+@@ -299,22 +286,22 @@
+ my $broadcast = ipv4_broadcast($ip_str,$msk_str);
+
+ This function returns the broadcast address. If the input doesn't
+-contains a netmask or mask length, the default netmask is assumed.
++contain a netmask or mask length, the default netmask is assumed.
+
+ This function croaks if the input is invalid.
+
+ =item ipv4_network
+
+- my $cidr = ipv4_network($net_str);
+- my $cidr = ipv4_network($cidr_sstr);
+- my ($net,$msk) = ipv4_network( $ip_str, $mask_str);
++ my $cidr = ipv4_network($ip_str);
++ my $cidr = ipv4_network($cidr_str);
++ my ($net,$msk) = ipv4_network( $net_str, $msk_str);
+
+ In scalar context, this function returns the network in CIDR format in
+ which the address is. In array context, it returns the network address and
+-its mask length as a two elements array. If the input is an host without
++its mask length as a two elements array. If the input is a host without
+ a netmask or mask length, the default netmask is assumed.
+
+-Again, the function croak if the input is invalid.
++Again, the function croaks if the input is invalid.
+
+ =item ipv4_in_network
+
+@@ -326,15 +313,15 @@
+ the first one and it implements the following semantics :
+
+ If net1 or net2 is a magic address (0.0.0.0 or 255.255.255.255)
+- than this function returns true.
++ then this function returns true.
+
+- If net1 is an host, net2 will be in the same net only if
++ If net1 is a host, net2 will be in the same net only if
+ it is the same host.
+
+- If net2 is an host, it will be contained in net1 only if
++ If net2 is a host, it will be contained in net1 only if
+ it is part of net1.
+
+- If net2 is only part of net1 if it is entirely contained in
++ net2 is only part of net1 if it is entirely contained in
+ net1.
+
+ Trap bad input with C<eval> or else.
+@@ -346,13 +333,13 @@
+ }
+
+ Return the IPv4 address in the string or undef if the input
+-doesn't contains a valid IPv4 address.
++doesn't contain a valid IPv4 address.
+
+ =item ipv4_cidr2msk
+
+ my $netmask = ipv4_cidr2msk( $cidr );
+
+-Returns the netmask corresponding to the mask length given in input.
++Returns the netmask corresponding to the mask length given in the input.
+ As usual, croaks if it doesn't like your input (in this case a number
+ between 0 and 32).
+
+@@ -360,7 +347,7 @@
+
+ my $masklen = ipv4_msk2cidr( $msk );
+
+-Returns the mask length of the netmask in input. As usual, croaks if it
++Returns the mask length of the netmask in the input. As usual, croaks if it
+ doesn't like your input.
+
+ =back
Added: trunk/libnetwork-ipv4addr-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnetwork-ipv4addr-perl/debian/patches/series?rev=22031&op=file
==============================================================================
--- trunk/libnetwork-ipv4addr-perl/debian/patches/series (added)
+++ trunk/libnetwork-ipv4addr-perl/debian/patches/series Sat Jun 21 11:43:21 2008
@@ -1,0 +1,1 @@
+documentation_fixes.patch
Modified: trunk/libnetwork-ipv4addr-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnetwork-ipv4addr-perl/debian/rules?rev=22031&op=diff
==============================================================================
--- trunk/libnetwork-ipv4addr-perl/debian/rules (original)
+++ trunk/libnetwork-ipv4addr-perl/debian/rules Sat Jun 21 11:43:21 2008
@@ -11,19 +11,21 @@
# always return the default without waiting for user input.
export PERL_MM_USE_DEFAULT=1
+include /usr/share/quilt/quilt.make
+
PERL ?= /usr/bin/perl
PACKAGE = $(shell dh_listpackages)
TMP = $(CURDIR)/debian/$(PACKAGE)
build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
$(PERL) Makefile.PL INSTALLDIRS=vendor
$(MAKE)
$(MAKE) test
touch $@
-clean:
+clean: unpatch
dh_testdir
dh_testroot
dh_clean build-stamp install-stamp
More information about the Pkg-perl-cvs-commits
mailing list