r23939 - in /trunk/librcs-perl/debian: changelog control patches/ patches/filenames_with_spaces.patch patches/series rules

gregoa at users.alioth.debian.org gregoa at users.alioth.debian.org
Fri Aug 8 15:19:28 UTC 2008


Author: gregoa
Date: Fri Aug  8 15:19:26 2008
New Revision: 23939

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=23939
Log:
Add patch filenames_with_spaces.patch; thanks to Oliver Seufer for the bug
report and the proposed patch (closes: #488954). Add quilt framework.

Added:
    trunk/librcs-perl/debian/patches/
    trunk/librcs-perl/debian/patches/filenames_with_spaces.patch
    trunk/librcs-perl/debian/patches/series
Modified:
    trunk/librcs-perl/debian/changelog
    trunk/librcs-perl/debian/control
    trunk/librcs-perl/debian/rules

Modified: trunk/librcs-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librcs-perl/debian/changelog?rev=23939&op=diff
==============================================================================
--- trunk/librcs-perl/debian/changelog (original)
+++ trunk/librcs-perl/debian/changelog Fri Aug  8 15:19:26 2008
@@ -6,6 +6,8 @@
   * Use dist-based URL in debian/watch.
   * debian/rules: don't install empty /usr/lib/perl5 directory.
   * debian/rules: delete /usr/lib/perl5 only if it exists.
+  * Add patch filenames_with_spaces.patch; thanks to Oliver Seufer for the bug
+    report and the proposed patch (closes: #488954). Add quilt framework.
 
  -- gregor herrmann <gregor+debian at comodo.priv.at>  Tue, 09 Oct 2007 22:31:46 +0200
 

Modified: trunk/librcs-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librcs-perl/debian/control?rev=23939&op=diff
==============================================================================
--- trunk/librcs-perl/debian/control (original)
+++ trunk/librcs-perl/debian/control Fri Aug  8 15:19:26 2008
@@ -2,7 +2,7 @@
 Section: perl
 Priority: optional
 Build-Depends-Indep: perl (>= 5.8.8-7)
-Build-Depends: debhelper (>= 5.0.0), cdbs (>=0.4)
+Build-Depends: debhelper (>= 5.0.0), cdbs (>=0.4), quilt (>= 0.40)
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Deepak Tripathi <apenguinlinux at gmail.com>
 Standards-Version: 3.7.2

Added: trunk/librcs-perl/debian/patches/filenames_with_spaces.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librcs-perl/debian/patches/filenames_with_spaces.patch?rev=23939&op=file
==============================================================================
--- trunk/librcs-perl/debian/patches/filenames_with_spaces.patch (added)
+++ trunk/librcs-perl/debian/patches/filenames_with_spaces.patch Fri Aug  8 15:19:26 2008
@@ -1,0 +1,33 @@
+Authors: Oliver Seufer <debian at seufer.de>, gregor herrmann <gregoa at debian.org>
+Description: deal with filenames with spaces
+Bug: #488954
+
+--- a/Rcs.pm
++++ b/Rcs.pm
+@@ -526,7 +526,7 @@
+         unless -e $rcsdiff_prog;
+     return(_rcsError "rcsdiff program $rcsdiff_prog not executable")
+         unless -x $rcsdiff_prog;
+-    open(DIFF, "$rcsdiff_prog $param_str $arcfile $workfile |")
++    open(DIFF, "$rcsdiff_prog $param_str '$arcfile' '$workfile' |")
+         or return(_rcsError "Can't fork $rcsdiff_prog: $!");
+     my @diff_output = <DIFF>;
+ 
+@@ -619,7 +619,7 @@
+     my $archive_file = $rcsdir . $Dir_Sep . $arcfile;
+     return(_rcsError "rlog program $rlogprog not found") unless -e $rlogprog;
+     return(_rcsError "rlog program $rlogprog not executable") unless -x $rlogprog;
+-    open(RLOG, "$rlogprog $param_str $archive_file |")
++    open(RLOG, "$rlogprog $param_str '$archive_file' |")
+         or return(_rcsError "Can't fork $rlogprog: $!");
+ 
+     my @logoutput = <RLOG>;
+@@ -647,7 +647,7 @@
+     my $archive_file = $rcsdir . $Dir_Sep . $arcfile;
+     return(_rcsError "rcsmerge program $rcsmergeprog not found") unless -e $rcsmergeprog;
+     return(_rcsError "rcsmerge program $rcsmergeprog not executable") unless -x $rcsmergeprog;
+-    open(RCSMERGE, "$rcsmergeprog $param_str $archive_file |")
++    open(RCSMERGE, "$rcsmergeprog $param_str '$archive_file' |")
+         or return(_rcsError "Can't fork $rcsmergeprog $!");
+ 
+     my @logoutput = <RCSMERGE>;

Added: trunk/librcs-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librcs-perl/debian/patches/series?rev=23939&op=file
==============================================================================
--- trunk/librcs-perl/debian/patches/series (added)
+++ trunk/librcs-perl/debian/patches/series Fri Aug  8 15:19:26 2008
@@ -1,0 +1,1 @@
+filenames_with_spaces.patch

Modified: trunk/librcs-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librcs-perl/debian/rules?rev=23939&op=diff
==============================================================================
--- trunk/librcs-perl/debian/rules (original)
+++ trunk/librcs-perl/debian/rules Fri Aug  8 15:19:26 2008
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/perlmodule.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 binary-install/librcs-perl::
 	[ ! -d $(CURDIR)/debian/librcs-perl/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(CURDIR)/debian/librcs-perl/usr/lib/perl5
-	




More information about the Pkg-perl-cvs-commits mailing list