Package: dpkg-dev
Version: 1.14.5
Followup-For: Bug #440972
In addition to previous to patches. Here are couple more.
Jari
>From 3bef0b9b55c78121e660c48e8ac4796b475bd433 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[EMAIL PROTECTED]>
Date: Thu, 6 Sep 2007 00:05:49 +0300
Subject: [PATCH] Fix subtitution of $diff_I_opt_default_regexp to include spaces
---
scripts/dpkg-source.pl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index aaf22fe..e15a8ac 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -63,7 +63,7 @@ my $diff_I_opt_default_regexp = "
--exclude=_darcs
";
-$diff_I_opt_default_regexp =~ s/#*\s*[\r\n]+//gm;
+$diff_I_opt_default_regexp =~ s/#*\s*[\r\n]+/ /gm;
# Take out comments and newlines
$diff_ignore_default_regexp =~ s/^#.*$//mg;
--
1.5.3.rc5
>From 955eeb71a5fe0d3ae3dff4158a9eeb2c49783e0f Mon Sep 17 00:00:00 2001
From: Jari Aalto <[EMAIL PROTECTED]>
Date: Thu, 6 Sep 2007 00:08:41 +0300
Subject: [PATCH] Treat multiple -I flags only once
($flag_I_opt_done): Added new variable to keep track when the
standalone -I options was invoked.
---
scripts/dpkg-source.pl | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index e15a8ac..907b16d 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -190,6 +190,7 @@ sub handleformat {
my $opmode;
+my $flag_I_opt_done;
while (@ARGV && $ARGV[0] =~ m/^-/) {
$_=shift(@ARGV);
@@ -216,7 +217,9 @@ while (@ARGV && $ARGV[0] =~ m/^-/) {
} elsif (m/^-I(.+)$/) {
push @tar_ignore, "--exclude=$1";
} elsif (m/^-I$/) {
- push @tar_ignore, $diff_I_opt_default_regexp;
+ push @tar_ignore, $diff_I_opt_default_regexp unless $$flag_I_opt_done;
+ # Prevent adding multiple times
+ $flag_I_opt_done = "done";
} elsif (m/^-V(\w[-:0-9A-Za-z]*)[=:]/) {
$substvar{$1}= "$'";
} elsif (m/^-T/) {
--
1.5.3.rc5
-- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.6.22-1-686 (SMP w/1 CPU core)
Locale: LANG=C, LC_CTYPE=C (charmap=ISO-8859-1) (ignored: LC_ALL set to en_US)
Shell: /bin/sh linked to /bin/dash
Versions of packages dpkg-dev depends on:
ii binutils 2.18-1 The GNU assembler, linker and bina
ii cpio 2.9-3 GNU cpio -- a program to manage ar
ii dpkg 1.14.5 package maintenance system for Deb
ii make 3.81-3 The GNU version of the "make" util
ii patch 2.5.9-4 Apply a diff file to an original
ii perl [perl5] 5.8.8-7 Larry Wall's Practical Extraction
ii perl-modules 5.8.8-7 Core Perl modules
Versions of packages dpkg-dev recommends:
ii bcc [c-compiler] 0.16.17-2 16-bit x86 C compiler
ii bzip2 1.0.3-7 high-quality block-sorting file co
ii gcc [c-compiler] 4:4.2.1-5 The GNU C compiler
ii gcc-4.0 [c-compiler 4.0.3-7 The GNU C compiler
ii gcc-4.1 [c-compiler 4.1.2-16 The GNU C compiler
ii gcc-4.2 [c-compiler 4.2.1-4 The GNU C compiler
ii tcc [c-compiler] 0.9.24~cvs20070502-1 the smallest ANSI C compiler
-- no debconf information
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
