Author: adsb
Date: 2009-01-19 19:35:17 +0000 (Mon, 19 Jan 2009)
New Revision: 1797
Modified:
trunk/conf.default.in
trunk/debian/changelog
trunk/debian/postinst
trunk/scripts/debdiff.1
trunk/scripts/debdiff.pl
Log:
debdiff: Default to comparing source packages in the order they were
passed on the command line once more, rather than using the "automagic
version sorting" introduced in 2.10.41. The new DEBDIFF_AUTO_VER_SORT
configuration file option allows the default behaviour to be controlled.
Modified: trunk/conf.default.in
===================================================================
--- trunk/conf.default.in 2009-01-18 16:16:02 UTC (rev 1796)
+++ trunk/conf.default.in 2009-01-19 19:35:17 UTC (rev 1797)
@@ -246,6 +246,10 @@
#
# Compare control files in source packages using wdiff?
# DEBDIFF_WDIFF_SOURCE_CONTROL=no
+#
+# Always compare package in version order, rather than the order specified
+# on the command line?
+# DEBDIFF_AUTO_VER_SORT=no
##### debi
#
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-01-18 16:16:02 UTC (rev 1796)
+++ trunk/debian/changelog 2009-01-19 19:35:17 UTC (rev 1797)
@@ -13,6 +13,10 @@
changelog. (Closes: #511911)
+ Make -v and -l interoperate with NEWS files properly again.
* debcheckout: Fix a typo and perform some QA on the manpage.
+ * debdiff: Default to comparing source packages in the order they were
+ passed on the command line once more, rather than using the "automagic
+ version sorting" introduced in 2.10.41. The new DEBDIFF_AUTO_VER_SORT
+ configuration file option allows the default behaviour to be controlled.
* debsign: Add further quoting around the use and generation of temporary
directory names, in case $TMPDIR contains spaces.
* mergechanges: Correct spelling of "parameters". Thanks, Kumar Appaiah.
Modified: trunk/debian/postinst
===================================================================
--- trunk/debian/postinst 2009-01-18 16:16:02 UTC (rev 1796)
+++ trunk/debian/postinst 2009-01-19 19:35:17 UTC (rev 1797)
@@ -641,6 +641,12 @@
# default: DEBSNAP_BASE_URL/<clean dir>/source/Sources.gz
# DEBSNAP_SOURCES_GZ_PATH=source/Sources.gz
+##### debdiff option added in 2.10.45
+#
+# Always compare package in version order, rather than the order specified
+# on the command line?
+# DEBDIFF_AUTO_VER_SORT=no
+
EOF
fi
fi
Modified: trunk/scripts/debdiff.1
===================================================================
--- trunk/scripts/debdiff.1 2009-01-18 16:16:02 UTC (rev 1796)
+++ trunk/scripts/debdiff.1 2009-01-19 19:35:17 UTC (rev 1797)
@@ -133,13 +133,13 @@
setting.
.TP
.B \-\-auto\-ver\-sort
-When comparing source packages, do so in version order. This is
-the default behaviour.
+When comparing source packages, do so in version order.
.TP
.B \-\-no\-auto\-ver\-sort
Compare source packages in the order they were passed on the
command-line, even if that means comparing a package with a higher
-version against one with a lower version.
+version against one with a lower version. This is the default
+behaviour.
.TP
\fB\-\-no-conf\fR, \fB\-\-noconf\fR
Do not read any configuration files. This can only be used as the
@@ -192,6 +192,10 @@
.B DEBDIFF_WDIFF_SOURCE_CONTROL
If this is set to \fIyes\fR, then it is the same as the
\fB\-\-wdiff\-source\-control\fR command line parameter being used.
+.TP
+.B DEBDIFF_AUTO_VER_SORT
+If this is set to \fIyes\fR, then it is the same as the
+\fB\-\-auto\-ver\-sort\fR command line parameter being used.
.SH "EXIT VALUES"
Normally the exit value will be 0 if no differences are reported and 1
if any are reported. If there is some fatal error, the exit code will
Modified: trunk/scripts/debdiff.pl
===================================================================
--- trunk/scripts/debdiff.pl 2009-01-18 16:16:02 UTC (rev 1796)
+++ trunk/scripts/debdiff.pl 2009-01-19 19:35:17 UTC (rev 1797)
@@ -80,8 +80,8 @@
--diffstat Include the result of diffstat before the diff
--no-diffstat Do not do so (default)
--auto-ver-sort When comparing source packages, ensure the
- comparison is performed in version order (default)
- --no-auto-ver-sort Do not do so
+ comparison is performed in version order
+ --no-auto-ver-sort Do not do so (default)
Default settings modified by devscripts configuration files:
$modified_conf_msg
@@ -108,7 +108,7 @@
my @diff_opts = ();
my $show_diffstat = 0;
my $wdiff_source_control = 0;
-my $auto_ver_sort = 1;
+my $auto_ver_sort = 0;
my $quiet = 0;
@@ -128,6 +128,7 @@
'DEBDIFF_WDIFF_OPT' => '',
'DEBDIFF_SHOW_DIFFSTAT' => 'no',
'DEBDIFF_WDIFF_SOURCE_CONTROL' => 'no',
+ 'DEBDIFF_AUTO_VER_SORT' => 'no',
);
my %config_default = %config_vars;
@@ -154,6 +155,8 @@
or $config_vars{'DEBDIFF_SHOW_DIFFSTAT'}='no';
$config_vars{'DEBDIFF_WDIFF_SOURCE_CONTROL'} =~ /^(yes|no)$/
or $config_vars{'DEBDIFF_WDIFF_SOURCE_CONTROL'}='no';
+ $config_vars{'DEBDIFF_AUTO_VER_SORT'} =~ /^(yes|no)$/
+ or $config_vars{'DEBDIFF_AUTO_VER_SORT'}='no';
foreach my $var (sort keys %config_vars) {
if ($config_vars{$var} ne $config_default{$var}) {
@@ -171,6 +174,7 @@
$show_diffstat = $config_vars{'DEBDIFF_SHOW_DIFFSTAT'} eq 'yes' ? 1 : 0;
$wdiff_source_control = $config_vars{'DEBDIFF_WDIFF_SOURCE_CONTROL'}
eq 'yes' ? 1 : 0;
+ $auto_ver_sort = $config_vars{'DEBDIFF_AUTO_VER_SORT'} eq 'yes' ? 1 : 0;
}
--
To unsubscribe, send mail to [email protected].
