r36211 - in /trunk/libconfig-inihash-perl/debian: changelog patches/remove-carriage-returns patches/series rules

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

Author: ryan52-guest
Date: Sat May 23 13:49:47 2009
New Revision: 36211

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=36211
Log:
replace dos2unix on the test file with proper carriage return
stripping during parsing, thanks to Franck Joncourt for the patch

Added:
    trunk/libconfig-inihash-perl/debian/patches/remove-carriage-returns
Modified:
    trunk/libconfig-inihash-perl/debian/changelog
    trunk/libconfig-inihash-perl/debian/patches/series
    trunk/libconfig-inihash-perl/debian/rules

Modified: trunk/libconfig-inihash-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-inihash-perl/debian/changelog?rev=36211&op=diff
==============================================================================
--- trunk/libconfig-inihash-perl/debian/changelog (original)
+++ trunk/libconfig-inihash-perl/debian/changelog Sat May 23 13:49:47 2009
@@ -1,3 +1,10 @@
+libconfig-inihash-perl (3.00.05-2) UNRELEASED; urgency=low
+
+  * replace dos2unix on the test file with proper carriage return
+    stripping during parsing, thanks to Franck Joncourt for the patch
+
+ -- Ryan Niebur <ryanryan52 at gmail.com>  Sat, 23 May 2009 06:47:36 -0700
+
 libconfig-inihash-perl (3.00.05-1) unstable; urgency=low
 
   [ Antonio Radici ]

Added: trunk/libconfig-inihash-perl/debian/patches/remove-carriage-returns
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-inihash-perl/debian/patches/remove-carriage-returns?rev=36211&op=file
==============================================================================
--- trunk/libconfig-inihash-perl/debian/patches/remove-carriage-returns (added)
+++ trunk/libconfig-inihash-perl/debian/patches/remove-carriage-returns Sat May 23 13:49:47 2009
@@ -1,0 +1,37 @@
+patch by Franck Joncourt to strip the carriage returns out of the lines read in
+
+--- a/IniHash.pm
++++ b/IniHash.pm
+@@ -171,7 +171,7 @@
+ 		if ($ref eq 'SCALAR') {
+ 			open $IN, '<', $file; # will read from the referenced scalar
+ 		} elsif ($ref eq 'ARRAY') {
+-			my $data = join "\n", map {chomp;$_} @$file;
++			my $data = join "\n", map {s/\r?\n/\n/;chomp;$_} @$file;
+ 			open $IN, '<', \$data; # will read from the referenced scalar
+ 		} elsif ($ref eq 'HASH') {
+ 			croak "ReadINI cannot accept a HASH reference as it's parameter!";
+@@ -227,6 +227,7 @@
+ 				my $terminator = $2;
+ 				$value = '';
+ 				while (<$IN>) {
++					s/\r?\n/\n/;
+ 					chomp;
+ 					last if $_ eq $terminator;
+ 					$value .= "\n".$_;
+@@ -249,6 +250,7 @@
+ 				my $terminator = $1;
+ 				$value = '';
+ 				while (<$IN>) {
++					s/\r?\n/\n/;
+ 					chomp;
+ 					last if $_ eq $terminator;
+ 					$value .= "\n".$_;
+@@ -405,6 +407,7 @@
+ 				my $terminator = $1;
+ 				$value = '';
+ 				while (<$IN>) {
++					s/\r?\n/\n/;
+ 					chomp;
+ 					last if $_ eq $terminator;
+ 					$value .= "\n".$_;

Modified: trunk/libconfig-inihash-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-inihash-perl/debian/patches/series?rev=36211&op=diff
==============================================================================
--- trunk/libconfig-inihash-perl/debian/patches/series (original)
+++ trunk/libconfig-inihash-perl/debian/patches/series Sat May 23 13:49:47 2009
@@ -1,1 +1,2 @@
 fix-tests
+remove-carriage-returns

Modified: trunk/libconfig-inihash-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-inihash-perl/debian/rules?rev=36211&op=diff
==============================================================================
--- trunk/libconfig-inihash-perl/debian/rules (original)
+++ trunk/libconfig-inihash-perl/debian/rules Sat May 23 13:49:47 2009
@@ -3,12 +3,3 @@
 %:
 	dh --with quilt $@
 
-override_dh_auto_configure:
-	dh_auto_configure
-	[ -f test.ini.original ] || cp -a test.ini test.ini.original
-	dos2unix test.ini
-
-override_dh_auto_clean:
-	dh_auto_clean
-	[ ! -f test.ini.original ] || mv test.ini.original test.ini
-