r73946 - in /trunk/libnet-ip-perl: debian/rules ipcount testout/

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

Author: periapt-guest
Date: Tue May  3 21:15:26 2011
New Revision: 73946

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=73946
Log:
syncing with upstream

Removed:
    trunk/libnet-ip-perl/testout/
Modified:
    trunk/libnet-ip-perl/debian/rules
    trunk/libnet-ip-perl/ipcount

Modified: trunk/libnet-ip-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ip-perl/debian/rules?rev=73946&op=diff
==============================================================================
--- trunk/libnet-ip-perl/debian/rules (original)
+++ trunk/libnet-ip-perl/debian/rules Tue May  3 21:15:26 2011
@@ -7,6 +7,13 @@
 %:
 	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
 	rm -rf $(TMP)/usr/bin
@@ -15,4 +22,10 @@
 	dh_installexamples
 	sed -i -e'1s|#!perl|#!/usr/bin/perl|' $(EG)/ip*
 
+override_dh_auto_test:
+	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
 

Modified: trunk/libnet-ip-perl/ipcount
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ip-perl/ipcount?rev=73946&op=diff
==============================================================================
--- trunk/libnet-ip-perl/ipcount (original)
+++ trunk/libnet-ip-perl/ipcount Tue May  3 21:15:26 2011
@@ -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++;
 	}