r73956 - in /trunk/libnet-ip-perl/debian: changelog patches/ipcount.patch patches/series patches/spelling.patch rules

[periapt-guest at users.alioth.debian.org]

Author: periapt-guest
Date: Tue May  3 21:37:19 2011
New Revision: 73956

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=73956
Log:
Added patch to fix spelling errors and reviewed ipcount patch

Added:
    trunk/libnet-ip-perl/debian/patches/ipcount.patch
Modified:
    trunk/libnet-ip-perl/debian/changelog
    trunk/libnet-ip-perl/debian/patches/series
    trunk/libnet-ip-perl/debian/patches/spelling.patch
    trunk/libnet-ip-perl/debian/rules

Modified: trunk/libnet-ip-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ip-perl/debian/changelog?rev=73956&op=diff
==============================================================================
--- trunk/libnet-ip-perl/debian/changelog (original)
+++ trunk/libnet-ip-perl/debian/changelog Tue May  3 21:37:19 2011
@@ -10,7 +10,7 @@
   * Added Homepage field to debian/control
   * Added rules to fix shebang in example scripts
   * Refreshed copyright
-  * Added patch to fix spelling errors
+  * Added patch to fix spelling errors and reviewed ipcount patch
 
  -- Nicholas Bamber <nicholas at periapt.co.uk>  Tue, 03 May 2011 17:19:49 +0100
 

Added: trunk/libnet-ip-perl/debian/patches/ipcount.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ip-perl/debian/patches/ipcount.patch?rev=73956&op=file
==============================================================================
--- trunk/libnet-ip-perl/debian/patches/ipcount.patch (added)
+++ trunk/libnet-ip-perl/debian/patches/ipcount.patch Tue May  3 21:37:19 2011
@@ -1,0 +1,26 @@
+Author: Thomas Parmelan <parmelan+debian at free.fr>
+Subject: -d option causes fatal error
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=397941
+Bug: http://rt.cpan.org/Ticket/Display.html?id=19759
+Last-Update: 2011-05-03
+Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
+--- a/ipcount
++++ b/ipcount
+@@ -77,7 +77,7 @@
+ 	
+ 	while ($current->bincomp ('lt', $last))
+ 	{
+-		$new_ip->set($current->last_ip.'+'.$size) or die (Error());
++		$new_ip->set($current->last_ip.' + '.$size) or die (Error());
+ 		print $new_ip->print,"\n";
+ 		
+ 		if ($opts{r})
+@@ -85,7 +85,7 @@
+ 			print $new_ip->reverse_ip,"\n";
+ 		}
+ 		
+-		$current->set($new_ip->last_ip .'+ 1') or die (Error());
++		$current->set($new_ip->last_ip .' + 1') or die (Error());
+ 		
+ 		$count++;
+ 	}

Modified: trunk/libnet-ip-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ip-perl/debian/patches/series?rev=73956&op=diff
==============================================================================
--- trunk/libnet-ip-perl/debian/patches/series (original)
+++ trunk/libnet-ip-perl/debian/patches/series Tue May  3 21:37:19 2011
@@ -1,1 +1,2 @@
 spelling.patch
+ipcount.patch

Modified: trunk/libnet-ip-perl/debian/patches/spelling.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ip-perl/debian/patches/spelling.patch?rev=73956&op=diff
==============================================================================
--- trunk/libnet-ip-perl/debian/patches/spelling.patch (original)
+++ trunk/libnet-ip-perl/debian/patches/spelling.patch Tue May  3 21:37:19 2011
@@ -1,3 +1,7 @@
+Author: Nicholas Bamber <nicholas at periapt.co.uk>
+Subject: spelling mistakes
+Forwarded: no
+Last-Update: 2011-05-03
 --- a/IP.pm
 +++ b/IP.pm
 @@ -1201,7 +1201,7 @@

Modified: trunk/libnet-ip-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ip-perl/debian/rules?rev=73956&op=diff
==============================================================================
--- trunk/libnet-ip-perl/debian/rules (original)
+++ trunk/libnet-ip-perl/debian/rules Tue May  3 21:37:19 2011
@@ -6,13 +6,6 @@
 
 %:
 	dh $@
-
-override_dh_auto_configure:
-	! [ -e $(CURDIR)/testout/ipv4.tlog ] \
-	    || cp $(CURDIR)/testout/ipv4.tlog debian/ipv4.tlog
-	! [ -e $(CURDIR)/testout/ipv6.tlog ] \
-	    || cp $(CURDIR)/testout/ipv6.tlog debian/ipv6.tlog
-	dh_auto_configure
 
 override_dh_install:
 	dh_install
@@ -23,9 +16,11 @@
 	sed -i -e'1s|#!perl|#!/usr/bin/perl|' $(EG)/ip*
 
 override_dh_auto_test:
+	mkdir $(CURDIR)/testout
 	dh_auto_test
-	! [ -e debian/ipv4.tlog ] \
-	    || mv debian/ipv4.tlog $(CURDIR)/testout/ipv4.tlog
-	! [ -e debian/ipv6.tlog ] \
-	    || mv debian/ipv6.tlog $(CURDIR)/testout/ipv6.tlog
 
+override_dh_clean:
+	dh_clean
+	rm -rf $(CURDIR)/testout
+
+