Your message dated Mon, 08 Oct 2007 05:17:03 +0000 with message-id <[EMAIL PROTECTED]> and subject line Bug#440972: fixed in dpkg 1.14.7 has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what I am talking about this indicates a serious mail system misconfiguration somewhere. Please contact me immediately.) Debian bug tracking system administrator (administrator, Debian Bugs database)
--- Begin Message ---Package: dpkg-dev Version: 1.14.5 Severity: wishlist Tags: patch Here is patch to make -I behave like -i, that is to supply default option of given standalone. Available from git repository git://git.cante.net/debian-dpkg.git Branch: dpkg-source+option-I--default-value Jari >From ecd6426c05129a17b07d70f400c380e6b82b1040 Mon Sep 17 00:00:00 2001 From: Jari Aalto <[EMAIL PROTECTED]> Date: Wed, 5 Sep 2007 22:17:55 +0300 Subject: [PATCH] Make option -I like option -i with default values - (top level): Introduce variable $diff_I_opt_default_regexp to hold similar ignore patters for tar(1) as used for option -i. - (usage): Updated documentation of option -I, which now can not take optional arguments. - (while @ARGV): Added case to check alone -I options to ustilize $diff_I_opt_default_regexp. --- scripts/dpkg-source.pl | 40 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 37 insertions(+), 3 deletions(-) diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl index 70b4682..aaf22fe 100755 --- a/scripts/dpkg-source.pl +++ b/scripts/dpkg-source.pl @@ -31,9 +31,40 @@ my $diff_ignore_default_regexp = ' (?:^|/)(?:DEADJOE|\.cvsignore|\.arch-inventory|\.bzrignore|\.gitignore)$| # File or directory names that should be ignored (?:^|/)(?:CVS|RCS|\.deps|\{arch\}|\.arch-ids|\.svn|\.hg|_darcs|\.git| -\.shelf|\.bzr(?:\.backup|tags)?)(?:$|/.*$) +_MTN|\.shelf|\.bzr(?:\.backup|tags)?)(?:$|/.*$) '; +my $diff_I_opt_default_regexp = " +--exclude=.[#~]* +--exclude=*[#~] +--exclude='{arch}' +--exclude=.a +--exclude=.arch-ids +--exclude=.arch-inventory +--exclude=.bzr +--exclude=.bzr.backup +--exclude=.bzr.tags +--exclude=.bzrignore +--exclude=.cvsignore +--exclude=.deps +--exclude=.git +--exclude=.gitignore +--exclude=.hg +--exclude=.la +--exclude=.o +--exclude=.shelf +--exclude=.so +--exclude=.svn +--exclude=.swp +--exclude=CVS +--exclude=DEADJOE +--exclude=RCS +--exclude=_MTN +--exclude=_darcs +"; + +$diff_I_opt_default_regexp =~ s/#*\s*[\r\n]+//gm; + # Take out comments and newlines $diff_ignore_default_regexp =~ s/^#.*$//mg; $diff_ignore_default_regexp =~ s/\n//sg; @@ -129,7 +160,8 @@ Build options: -q quiet operation, do not print warnings. -i[<regexp>] filter out files to ignore diffs of (defaults to: '%s'). - -I<filename> filter out files when building tarballs. + -I[<filename>] filter out files when building tarballs + (defaults to: '%s'). -sa auto select orig source (-sA is default). -sk use packed orig source (unpack & keep). -sp use packed orig source (unpack & remove). @@ -147,7 +179,7 @@ Extract options: General options: -h, --help show this help message. --version show the version. -"), $progname, $diff_ignore_default_regexp; +"), $progname, $diff_ignore_default_regexp, $diff_I_opt_default_regexp; } sub handleformat { @@ -183,6 +215,8 @@ while (@ARGV && $ARGV[0] =~ m/^-/) { $diff_ignore_regexp = $1 ? $1 : $diff_ignore_default_regexp; } elsif (m/^-I(.+)$/) { push @tar_ignore, "--exclude=$1"; + } elsif (m/^-I$/) { + push @tar_ignore, $diff_I_opt_default_regexp; } elsif (m/^-V(\w[-:0-9A-Za-z]*)[=:]/) { $substvar{$1}= "$'"; } elsif (m/^-T/) { -- 1.5.3.rc5 >From 40ace6ceb9af98862f886bec91d1f7325a7e13ce Mon Sep 17 00:00:00 2001 From: Jari Aalto <[EMAIL PROTECTED]> Date: Wed, 5 Sep 2007 22:23:15 +0300 Subject: [PATCH] Document new -I option behavior (standalone) --- man/dpkg-source.1 | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/man/dpkg-source.1 b/man/dpkg-source.1 index e83156f..527179b 100644 --- a/man/dpkg-source.1 +++ b/man/dpkg-source.1 @@ -126,12 +126,19 @@ from the ones in your working directory, thus causing them to be unnecessarily included in every .diff.gz, unless you use the \fB\-i\fR switch. .TP -.BI \-I filename -If this option is specified, the filename will be passed to tar's \-\-exclude -option when it is called to generate a .orig.tar.gz or .tar.gz file. For -example, \-ICVS will make tar skip over CVS directories when generating -a .tar.gz file. The option may be repeated multiple times to list multiple -filenames to exclude. +.BI \-I[\fIfile-pattern\fP] + +If this option is specified, the filename pattern will be passed to +tar's \-\-exclude option when it is called to generate a .orig.tar.gz +or .tar.gz file. For example, \-ICVS will make tar skip over CVS +directories when generating a .tar.gz file. The option may be repeated +multiple times to list multiple filenames to exclude. If this option +is givel + +\fB\-I\fR by itself adds default tar(1) \-\-exclude options that will +filter out control files and directories of the most common revision +control systems, backup and swap files and Libtool build output +directories. .PP All the .BI \-s X -- 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
--- End Message ---
--- Begin Message ---Source: dpkg Source-Version: 1.14.7 We believe that the bug you reported is fixed in the latest version of dpkg, which is due to be installed in the Debian FTP archive: dpkg-dev_1.14.7_all.deb to pool/main/d/dpkg/dpkg-dev_1.14.7_all.deb dpkg_1.14.7.dsc to pool/main/d/dpkg/dpkg_1.14.7.dsc dpkg_1.14.7.tar.gz to pool/main/d/dpkg/dpkg_1.14.7.tar.gz dpkg_1.14.7_i386.deb to pool/main/d/dpkg/dpkg_1.14.7_i386.deb dselect_1.14.7_i386.deb to pool/main/d/dpkg/dselect_1.14.7_i386.deb A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to [EMAIL PROTECTED], and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Guillem Jover <[EMAIL PROTECTED]> (supplier of updated dpkg package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing [EMAIL PROTECTED]) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Format: 1.7 Date: Mon, 08 Oct 2007 07:31:34 +0300 Source: dpkg Binary: dpkg dselect dpkg-dev Architecture: source i386 all Version: 1.14.7 Distribution: unstable Urgency: low Maintainer: Dpkg Developers <[EMAIL PROTECTED]> Changed-By: Guillem Jover <[EMAIL PROTECTED]> Description: dpkg - package maintenance system for Debian dpkg-dev - package building tools for Debian dselect - user tool to manage Debian packages Closes: 173463 216075 323911 379418 427210 432893 437825 440502 440537 440636 440859 440956 440962 440972 440973 441051 441106 441113 443190 443191 443276 444362 445380 Changes: dpkg (1.14.7) unstable; urgency=low . [ Guillem Jover ] * Add back $dpkglib into @INC, needed by the controllib.pl require in 822-date. Closes: #440962 * Document in dpkg-scanpackages that apt now requires Packages.bz2 in preference to Packages.gz. Closes: #440973 * Stop recognizing the obsolete Optional field when building packages. * Use fakeroot, if present, by default to gain root privileges in dpkg-buildpackage. * Fix typos in dpkg-deb.1 and start-stop-daemon.8. Closes: #441051 Thanks to A. Costa. * After '<prerm> remove' fails and while doing the error unwinding, if the '<postinst> abort-remove' call succeeds, preserve the old status instead of unconditionally setting it to 'Installed'. Closes: #432893 Thanks to Brian M. Carlson. * Add Vcs-Browser and Vcs-Git fields to debian/control. * Add a Homepage field to debian/control (to be changed later when there's a more formal site). * Allow comparing unsupported architectures for equality and identity. Based on a patch by Frank Lichtenheld. Closes: #427210 * Document Origin and Bugs fields in deb-control.5. Closes: #173463 * Do not replace substvars for build dependencies (it was not supported anyway). . [ Frank Lichtenheld ] * Add _MTN to dpkg-source -i default regex. Suggested by Jari Aalto. * Convert dpkg-buildpackage to a Perl script. Fix some bugs in the new script detected in experimental: Closes: #444362 * dpkg-buildpackage accepts a -j<n> option now which will set MAKEFLAGS(-j<n>) and DEB_BUILD_OPTIONS(parallel=<n>) accordingly. parallel=<n> in DEB_BUILD_OPTIONS will be passed to MAKEFLAGS as well. Based on an idea by Robert Millan. Closes: #440636 * Allow dpkg-source -I without a pattern which will load a default list of pattern similar to -i without regexp. Patch by Jari Aalto. Closes: #440972 * Rework documentation of dpkg-source's -i and -I options. Closes: #323911, #440956 * Add --utf8-strings to gpg call in dpkg-buildpackage since that seems to be the better default. Suggested by Székelyi Szabolcs. 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 * Danish (Claus Hindsgaul). Closes: #441106 * French (Frédéric Bothamy). * German (Sven Joachim). Closes: #440537 * Nepali (Shiva Prasad Pokharel). Closes: #437825 * Portuguese (Miguel Figueiredo). Closes: #441113 * Romanian (Eddy Petri?or). * Vietnamese (Clytie Siddall). Closes: #440502 * Korean (Sunjae Park). Closes: #443190 . [ Updated man pages translations ] * German (Helge Kreutzmann). * Swedish (Peter Karlsson). * Korean (Sunjae Park). Closes: #443191 . [ Updated scripts translations ] * Correct a typo in the French translation. Closes: #443276 * Swedish (Peter Karlsson). Files: 95f1bea363e91623bff37c6ca6f7ac27 995 admin required dpkg_1.14.7.dsc 909dbcbab6d77d1af18430336b7cb256 5935888 admin required dpkg_1.14.7.tar.gz e36cfe7a3c85bb13a8e7458696e12fff 2093642 admin required dpkg_1.14.7_i386.deb 99e739b9c8f50f1773555227efcae534 510314 admin required dselect_1.14.7_i386.deb c7af636e7bbea0ee19aaccc8c2c39715 228114 utils optional dpkg-dev_1.14.7_all.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQFHCbhduW9ciZ2SjJsRAhc0AKC1pZsD622xHuJoR6xaaFVLd8arKACg+G/y 3l/y6E2FB470Q6PsZ1bhoVY= =XsVF -----END PGP SIGNATURE-----
--- End Message ---
