The branch, master has been updated
via d72e5312894dddf9ab6112408555819a7e2ab2e9 (commit)
via 853dc7860121b8a97efc0e1756597fb9b648bbf4 (commit)
via d82b1c13dd756294c62bd05d2c37eef45bf94360 (commit)
via 20fbbf435e754cb14a84e1d49edda96f4112f0d0 (commit)
from 2b6c769da754d9c6d98a1fe2aecf566116122a0b (commit)
- Shortlog ------------------------------------------------------------
d72e531 dpkg-source.1: Some random housekeeping.
853dc78 dpkg-source: Update description of -W and -E
d82b1c1 ChangeLog police
20fbbf4 dpkg-source: Some cleanup on the -Z feature
Summary of changes:
ChangeLog | 11 ++++++++---
man/ChangeLog | 11 ++++++++++-
man/dpkg-buildpackage.1 | 8 ++++----
man/dpkg-source.1 | 31 ++++++++++++++++---------------
scripts/dpkg-buildpackage.pl | 4 ++--
scripts/dpkg-source.pl | 27 ++++++++++++++++-----------
6 files changed, 56 insertions(+), 36 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit d72e5312894dddf9ab6112408555819a7e2ab2e9
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Wed Oct 10 00:08:03 2007 +0200
dpkg-source.1: Some random housekeeping.
Fix some syntax inconsistencies. Also if a broken
sentence.
Partly suggested by Helge Kreutzmann.
diff --git a/man/dpkg-source.1 b/man/dpkg-source.1
index 5ae6c96..6eae108 100644
--- a/man/dpkg-source.1
+++ b/man/dpkg-source.1
@@ -124,12 +124,11 @@ files. Supported values are:
.BR \-i [\fIregexp\fP]
You may specify a perl regular expression to match files you want
filtered out of the list of files for the diff. (This list is
-generated by a find command.) \fB\-i\fR by itself enables the option,
+generated by a find command.) \fB\-i\fP by itself enables the option,
with a default that will filter out control files and directories of the
most common revision control systems, backup and swap files and Libtool
build output directories. There can only be one active regexp, of multiple
-\-i options only the last one will take effect.
-
+\fB\-i\fP options only the last one will take effect.
This is very helpful in cutting out extraneous files that get included
in the diff, e.g. if you maintain your source in a revision control
@@ -150,7 +149,7 @@ 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
patterns to exclude.
-\fB\-I\fR by itself adds default \-\-exclude options that will
+\fB\-I\fP by itself adds default \-\-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.
@@ -204,7 +203,7 @@ but will remove that directory after it has been used.
.TP
.B \-ss
Specifies that the original source is available both as a directory
-and as a tarfile. If will use the directory to create the diff, but
+and as a tarfile. dpkg-source will use the directory to create the diff, but
the tarfile to create the
.BR .dsc .
This option must be used with care - if the directory and tarfile do
commit 853dc7860121b8a97efc0e1756597fb9b648bbf4
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Tue Oct 9 23:59:39 2007 +0200
dpkg-source: Update description of -W and -E
-W is the default for quite some time already. Adapt the
description of -W and -E.
Also update the description of this options in dpkg-buildpackage.
diff --git a/ChangeLog b/ChangeLog
index 82ad100..5cadbaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
2007-10-09 Frank Lichtenheld <[EMAIL PROTECTED]>
+ * scripts/dpkg-source.pl (usage): -W is the default
+ for quite some time already. Adapt the description of
+ -W and -E.
+ * scripts/dpkg-buildpackage.pl (usage): likewise.
+
* scripts/dpkg-buildpackage.pl: Add -z/-Z to
passthrough opts (will be passed to dpkg-source).
diff --git a/man/ChangeLog b/man/ChangeLog
index f876f15..d92fed2 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,5 +1,10 @@
2007-10-09 Frank Lichtenheld <[EMAIL PROTECTED]>
+ * dpkg-source.1: -W is the default for quite
+ some time already. Adapt the description of
+ -W and -E.
+ * dpkg-buildpackage.1: likewise.
+
* dpkg-source.1: Change the rest of the
man page to not contain any hardcoded
.gz references.
diff --git a/man/dpkg-buildpackage.1 b/man/dpkg-buildpackage.1
index d53a52e..5041457 100644
--- a/man/dpkg-buildpackage.1
+++ b/man/dpkg-buildpackage.1
@@ -85,15 +85,15 @@ Check build dependencies and conflicts; abort if
unsatisfied.
.B \-d
Do not check build dependencies and conflicts.
.TP
-.B \-W
-Turn certain errors into warnings. Only \fBdpkg\-source\fP uses this, but
+.B \-E
+Turn certain warnings into errors. Only \fBdpkg\-source\fP uses this, but
.BR dpkg\-buildpackage
recognizes it, and passes it thru to
.BR dpkg\-source "."
.TP
-.B \-E
+.B \-W
Negates a previously set
-.BR \-W "."
+.BR \-E "."
Only \fBdpkg\-source\fP uses this, but
.BR dpkg\-buildpackage
recognizes it, and passes it thru to
diff --git a/man/dpkg-source.1 b/man/dpkg-source.1
index b526417..5ae6c96 100644
--- a/man/dpkg-source.1
+++ b/man/dpkg-source.1
@@ -101,12 +101,12 @@ Override or add an output control file field.
.BI \-U field
Remove an output control file field.
.TP
-.BI \-W
-This option turns certain errors into warnings.
-.TP
.BI \-E
+This option turns certain warnings into errors.
+.TP
+.BI \-W
This option negates a previously set
-.BR \-W "."
+.BR \-E "."
.TP
.BR \-Z \fIcompression\fP
Specify the compression to use for created files (tarballs and diffs).
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index f724544..6e83741 100644
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -66,8 +66,8 @@ Options:
-nc do not clean source tree (implies -b).
-tc clean source tree when finished.
-ap add pause before starting signature process.
- -W turn certain errors into warnings. } passed to
- -E when -W is turned on, -E turns it off. } dpkg-source
+ -E turn certain warnings into errors. } passed to
+ -W when -E is turned on, -W turns it off. } dpkg-source
-i[<regex>] ignore diffs of files matching regex. } only passed
-I[<pattern>] filter out files when building tarballs. } to dpkg-source
--admindir=<directory>
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 1a5a44a..afbd609 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -165,8 +165,8 @@ Build options:
-T<varlistfile> read variables here, not debian/substvars.
-D<field>=<value> override or add a .dsc field and value.
-U<field> remove a field.
- -W turn certain errors into warnings.
- -E when -W is enabled, -E disables it.
+ -E turn certain warnings into errors.
+ -W when -E is enabled, -W disables it.
-q quiet operation, do not print warnings.
-i[<regexp>] filter out files to ignore diffs of
(defaults to: '%s').
commit d82b1c13dd756294c62bd05d2c37eef45bf94360
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Tue Oct 9 14:46:04 2007 +0200
ChangeLog police
diff --git a/ChangeLog b/ChangeLog
index 59e378e..82ad100 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,8 +17,8 @@
can be used to specify the compression level
to use.
-2007-10-08 Raphael Hertzog <[EMAIL PROTECTED]>,
- Frank Lichtenheld <[EMAIL PROTECTED]>
+2007-10-08 Raphael Hertzog <[EMAIL PROTECTED]>
+ Frank Lichtenheld <[EMAIL PROTECTED]>
* Merge dpkg-shlibdeps-buxy branch.
commit 20fbbf435e754cb14a84e1d49edda96f4112f0d0
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Tue Oct 9 14:45:18 2007 +0200
dpkg-source: Some cleanup on the -Z feature
Use the same semantics as dpkg-deb -Z (i.e. specify
program to use, not the extension).
Update the man page to be less V1 specific.
diff --git a/ChangeLog b/ChangeLog
index ae563d7..59e378e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,7 +12,7 @@
wig&pen (aka Format: 2.0) on build:
Use .orig.tar.(bz2|lzma) if they are available
and no .gz can be found. Also let the user specify
- via -Z(gz|bz2|lzma) how files that need to be
+ via -Z(gzip|bzip2|lzma) how files that need to be
generated should be compressed. -z([1-9]|best|fast)
can be used to specify the compression level
to use.
diff --git a/man/ChangeLog b/man/ChangeLog
index 05c4e4e..f876f15 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,5 +1,9 @@
2007-10-09 Frank Lichtenheld <[EMAIL PROTECTED]>
-
+
+ * dpkg-source.1: Change the rest of the
+ man page to not contain any hardcoded
+ .gz references.
+
* dpkg-buildpackage.1: Document all
options only passed to dpkg-source.
-s[nsAkurKUR], -z, and -Z were missing.
diff --git a/man/dpkg-source.1 b/man/dpkg-source.1
index cb6699c..b526417 100644
--- a/man/dpkg-source.1
+++ b/man/dpkg-source.1
@@ -51,7 +51,9 @@ the empty string if the package is a Debian-specific one and
so has no
Debianisation diffs. If no second argument is supplied then
.B dpkg\-source
will look for the original source tarfile
-.IB package _ upstream-version .orig.tar.gz
+.IB package _ upstream-version .orig.tar. extension
+(where \fIextension\fP is one of
+.BR gz ", " bz2 ", and " lzma )
or the original source directory
.IB directory .orig
depending on the \fB\-sX\fP arguments.
@@ -110,8 +112,8 @@ This option negates a previously set
Specify the compression to use for created files (tarballs and diffs).
Note that this option will not cause existing tarballs to be recompressed,
it only affects new files. Supported values are:
-.IR gz ", " bz2 ", and " lzma .
-\fIgz\fP is the default.
+.IR gzip ", " bzip2 ", and " lzma .
+\fIgzip\fP is the default.
.TP
.BR \-z \fIlevel\fP
Compression level to use. As with \fB\-Z\fP it only affects newly created
@@ -130,7 +132,7 @@ build output directories. There can only be one active
regexp, of multiple
This is very helpful in cutting out extraneous files that get included
-in the .diff.gz, e.g. if you maintain your source in a revision control
+in the diff, e.g. if you maintain your source in a revision control
system and want to use a checkout to build a source package without
including the additional files and directories that it will usually
contain (e.g. CVS/, .cvsignore, .svn/). The default regexp is already
@@ -143,7 +145,7 @@ the neccessary anchors (e.g. '(^|/)', '($|/)') yourself.
If this option is specified, the pattern will be passed to
.BR tar (1)'s
\-\-exclude
-option when it is called to generate a .orig.tar.gz or .tar.gz file. For
+option when it is called to generate a .orig.tar or .tar 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
patterns to exclude.
@@ -178,7 +180,7 @@ should be used instead.
.TP
.BR \-sk
Specifies to expect the original source as a tarfile, by default
-.IB package _ upstream-version .orig.tar.gz\fR.
+.IB package _ upstream-version .orig.tar. extension \fR.
It will leave this original source in place as a tarfile, or copy it
to the current directory if it isn't already there.
.TP
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index b12d5d3..1a5a44a 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -75,11 +75,15 @@ my $max_dscformat = 2;
my $def_dscformat = "1.0"; # default format for -b
my $expectprefix;
-my $compression = 'gz';
-my $comp_level = '9';
-my @comp_supported = qw(gz bz2 lzma);
+
+# Compression
+my @comp_supported = qw(gzip bzip2 lzma);
my %comp_supported = map { $_ => 1 } @comp_supported;
+my %comp_ext = ( gzip => 'gz', bzip2 => 'bz2', lzma => 'lzma' );
my $comp_regex = '(?:gz|bz2|lzma)';
+my $compression = 'gzip';
+my $comp_level = '9';
+my $comp_ext = $comp_ext{$compression};
# Packages
my %remove;
@@ -176,7 +180,7 @@ Build options:
-ss trust packed & unpacked orig src are same.
-sn there is no diff, do main tarfile only.
-sA,-sK,-sP,-sU,-sR like -sa,-sk,-sp,-su,-sr but may overwrite.
- -Z<compression> select compression to use (defaults to 'gz',
+ -Z<compression> select compression to use (defaults to 'gzip',
supported are: %s).
-z<level> compression level to use (defaults to '9',
supported are: '1'-'9', 'best', 'fast')
@@ -213,6 +217,7 @@ while (@ARGV && $ARGV[0] =~ m/^-/) {
&setopmode('extract');
} elsif (m/^-Z/) {
$compression = $POSTMATCH;
+ $comp_ext = $comp_ext{$compression};
usageerr(sprintf(_g("%s is not a supported compression"), $compression))
unless $comp_supported{$compression};
} elsif (m/^-z/) {
@@ -287,7 +292,7 @@ if ($opmode eq 'build') {
parsechangelog($changelogfile, $changelogformat);
parsecontrolfile($controlfile);
- $f{"Format"}= $compression eq 'gz' ? $def_dscformat : '2.0';
+ $f{"Format"}= $compression eq 'gzip' ? $def_dscformat : '2.0';
&init_substvars;
my @sourcearch;
@@ -427,7 +432,7 @@ if ($opmode eq 'build') {
" but source handling style -s%s wants something"),
$sourcestyle));
}
} elsif ($sourcestyle =~ m/[aA]/) {
- my @origtargz = map { "$basename.orig.tar.$_" } ($compression,
@comp_supported);
+ my @origtargz = map { "$basename.orig.tar.$comp_ext{$_}" }
($compression, @comp_supported);
foreach my $origtar (@origtargz) {
if (stat($origtar)) {
-f _ || &error(sprintf(_g("packed orig `%s' exists but is not a
plain file"), $origtar));
@@ -474,14 +479,14 @@ if ($opmode eq 'build') {
$origdirname, "$basedirname.orig"));
$tardirbase= $origdirbase; $tardirname= $origdirname;
- $tarname= $origtargz || "$basename.orig.tar.$compression";
+ $tarname= $origtargz || "$basename.orig.tar.$comp_ext";
$tarname =~ /$basename.orig.tar.($comp_regex)/ ||
warning(sprintf(_g(".orig.tar name %s is not
<package>_<upstreamversion>" .
".orig.tar (wanted %s)"), $tarname,
"$basename.orig.tar.$comp_regex"));
if (($1 ne 'gz') && ($f{'Format'} < 2)) { $f{'Format'} = '2.0' };
} else {
$tardirbase= $dirbase; $tardirname= $dirname;
- $tarname= "$basenamerev.tar.$compression";
+ $tarname= "$basenamerev.tar.$comp_ext";
}
if ($sourcestyle =~ m/[nurUR]/) {
@@ -559,7 +564,7 @@ if ($opmode eq 'build') {
if ($sourcestyle =~ m/[kpursKPUR]/) {
- my $diffname = "$basenamerev.diff.$compression";
+ my $diffname = "$basenamerev.diff.$comp_ext";
printf(_g("%s: building %s in %s")."\n",
$progname, $sourcepackage, $diffname)
|| &syserr(_g("write building diff message"));
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
