Author: adsb
Date: 2008-11-02 17:58:57 +0000 (Sun, 02 Nov 2008)
New Revision: 1696
Modified:
trunk/conf.default.in
trunk/debian/changelog
trunk/debian/postinst
trunk/scripts/uscan.1
trunk/scripts/uscan.pl
Log:
* uscan:
+ Add a USCAN_REPACK configuration file variable indicating that bzip
tar or zip archives should always be repacked to gzip tar archives.
(Closes: #502516)
Modified: trunk/conf.default.in
===================================================================
--- trunk/conf.default.in 2008-11-01 16:09:50 UTC (rev 1695)
+++ trunk/conf.default.in 2008-11-02 17:58:57 UTC (rev 1696)
@@ -519,6 +519,9 @@
#
# Where should downloaded files be placed?
# USCAN_DESTDIR=..
+#
+# Automatically repack bzipped tar or zip archives to gzipped tars?
+# USCAN_REPACK=no
##### uupdate
#
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-11-01 16:09:50 UTC (rev 1695)
+++ trunk/debian/changelog 2008-11-02 17:58:57 UTC (rev 1696)
@@ -33,8 +33,12 @@
operations to extract the version and architecture from the logs.
+ Allow the logs for the build with the largest version number to be
easily retrieved. Based on a patch by Jörg Sommer.
- * uscan: Document the USCAN_TIMEOUT configuration file variable.
- (Closes: #502517)
+ * uscan:
+ + Document the USCAN_TIMEOUT configuration file variable.
+ (Closes: #502517)
+ + Add a USCAN_REPACK configuration file variable indicating that bzip
+ tar or zip archives should always be repacked to gzip tar archives.
+ (Closes: #502516)
[ Christoph Berg ]
* debian/control: Remove the Dm-Upload-Allowed flag.
Modified: trunk/debian/postinst
===================================================================
--- trunk/debian/postinst 2008-11-01 16:09:50 UTC (rev 1695)
+++ trunk/debian/postinst 2008-11-02 17:58:57 UTC (rev 1696)
@@ -599,6 +599,10 @@
# semantics of this setting.
# DEBCHECKOUT_AUTH_URLS=''
+##### uscan option added in version 2.10.40
+#
+# Automatically repack bzipped tar or zip archives to gzipped tars?
+# USCAN_REPACK=no
EOF
fi
fi
Modified: trunk/scripts/uscan.1
===================================================================
--- trunk/scripts/uscan.1 2008-11-01 16:09:50 UTC (rev 1695)
+++ trunk/scripts/uscan.1 2008-11-02 17:58:57 UTC (rev 1696)
@@ -479,6 +479,10 @@
.B USCAN_DESTDIR
If set, the downloaded files will be placed in this directory. This is
equivalent to the \fB\-\-destdir\fR option.
+.B USCAN_REPACK
+If this is set to \fIyes\fR, then after having downloaded a bzip tar or
+zip archive, \fBuscan\fR will repack it to a gzip tar. This is
+equivalent to the \fB\-\-repack\fR option.
.SH "EXIT STATUS"
The exit status gives some indication of whether a newer version was
found or not; one is advised to read the output to determine exactly
Modified: trunk/scripts/uscan.pl
===================================================================
--- trunk/scripts/uscan.pl 2008-11-01 16:09:50 UTC (rev 1695)
+++ trunk/scripts/uscan.pl 2008-11-02 17:58:57 UTC (rev 1696)
@@ -186,6 +186,7 @@
'USCAN_VERBOSE' => 'no',
'USCAN_DEHS_OUTPUT' => 'no',
'USCAN_USER_AGENT' => '',
+ 'USCAN_REPACK' => 'no',
'DEVSCRIPTS_CHECK_DIRNAME_LEVEL' => 1,
'DEVSCRIPTS_CHECK_DIRNAME_REGEX' => 'PACKAGE(-.*)?',
);
@@ -221,6 +222,8 @@
or $config_vars{'USCAN_VERBOSE'}='no';
$config_vars{'USCAN_DEHS_OUTPUT'} =~ /^(yes|no)$/
or $config_vars{'USCAN_DEHS_OUTPUT'}='no';
+ $config_vars{'USCAN_REPACK'} =~ /^(yes|no)$/
+ or $config_vars{'USCAN_REPACK'}='no';
$config_vars{'DEVSCRIPTS_CHECK_DIRNAME_LEVEL'} =~ /^[012]$/
or $config_vars{'DEVSCRIPTS_CHECK_DIRNAME_LEVEL'}=1;
@@ -245,6 +248,7 @@
$check_dirname_regex = $config_vars{'DEVSCRIPTS_CHECK_DIRNAME_REGEX'};
$user_agent_string = $config_vars{'USCAN_USER_AGENT'}
if $config_vars{'USCAN_USER_AGENT'};
+ $repack = $config_vars{'USCAN_REPACK'} eq 'yes' ? 1 : 0;
}
# Now read the command line arguments
--
To unsubscribe, send mail to [EMAIL PROTECTED]
