The branch, master has been updated
via 2c22031a81b0933bd90309637a83ced532449406 (commit)
from 6233f972c4d6a5d015d825482f39c80aa757abdf (commit)
- Shortlog ------------------------------------------------------------
2c22031 dpkg-source: Fix diff generation for filenames containing spaces
Summary of changes:
ChangeLog | 8 ++++++++
debian/changelog | 3 +++
scripts/dpkg-source.pl | 9 +++++----
3 files changed, 16 insertions(+), 4 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 2c22031a81b0933bd90309637a83ced532449406
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Sun Oct 7 17:10:32 2007 +0200
dpkg-source: Fix diff generation for filenames containing spaces
Include a trailing HT character in the diff labels if
the filename contains spaces. Apparantly this is
standard but undocumented diff behaviour. Based on
a patch by Marcel Toele.
diff --git a/ChangeLog b/ChangeLog
index b1eafab..f301b1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-07 Frank Lichtenheld <[EMAIL PROTECTED]>
+ Marcel Toele <[EMAIL PROTECTED]>
+
+ * scripts/dpkg-source.pl (handleformat): Include
+ a trailing HT character in the diff labels if
+ the filename contains spaces. Apparantly this is
+ standard but undocumented diff behaviour.
+
2007-09-29 Frank Lichtenheld <[EMAIL PROTECTED]>
* scripts/dpkg-buildpackage.pl: Call checkversion()
diff --git a/debian/changelog b/debian/changelog
index 6c33f1c..139d1c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,9 @@ dpkg (1.14.7) UNRELEASED; urgency=low
Closes: #379418
* Let dpkg-buildpackage error out early if the version number from
the changelog is not a valid Debian version. Closes: #216075
+ * Fix dpkg-source to create correct diffs for files with spaces in
+ their name (apparantly we don't have many of those ;).
+ Based on a patch by Marcel Toele. Closes: #445380
[ Updated dpkg translations ]
* Basque (Piarres Beobide). Closes: #440859
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 5b7802d..da22b98 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -594,10 +594,11 @@ if ($opmode eq 'build') {
$ENV{'LC_ALL'}= 'C';
$ENV{'LANG'}= 'C';
$ENV{'TZ'}= 'UTC0';
- exec('diff','-u',
- '-L',"$basedirname.orig/$fn",
- '-L',"$basedirname/$fn",
- '--',"$ofnread","$dir/$fn") or &syserr(_g("exec
diff"));
+ my $tab = ("$basedirname/$fn" =~ / /) ? "\t" : '';
+ exec('diff','-u',
+ '-L',"$basedirname.orig/$fn$tab",
+ '-L',"$basedirname/$fn$tab",
+ '--',"$ofnread","$dir/$fn") or &syserr(_g("exec
diff"));
}
my $difflinefound = 0;
$/= "\n";
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
