[Dehs-devel] SVN devscripts commit: r398 - in trunk: . debian
Julian Gilbey
jdg at costa.debian.org
Sat Apr 15 22:42:35 UTC 2006
Author: jdg
Date: 2006-04-15 22:42:34 +0000 (Sat, 15 Apr 2006)
New Revision: 398
Modified:
trunk/debian/changelog
trunk/uscan.1
trunk/uscan.pl
Log:
* uscan: provide "versionmangle" option which does both
{u,d}versionmangle (Closes: #3503455)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-04-15 22:37:25 UTC (rev 397)
+++ trunk/debian/changelog 2006-04-15 22:42:34 UTC (rev 398)
@@ -34,6 +34,8 @@
the URL and filename before attempting to perform and save the
download respectively (Closes: #327404)
* uscan: fix manpage typo (dversionmangle) (Closes: #362202)
+ * uscan: provide "versionmangle" option which does both
+ {u,d}versionmangle (Closes: #3503455)
* uupdate: correct syntax error (Closes: #360995)
* who-uploads: new script to determine most recent uploaders of a
package to the Debian archive (Closes: #347809)
@@ -43,7 +45,7 @@
as documented on man page.
* rmadison: escape "+" in package names in http query string
- -- Julian Gilbey <jdg at debian.org> Sat, 15 Apr 2006 23:37:19 +0100
+ -- Julian Gilbey <jdg at debian.org> Sat, 15 Apr 2006 23:42:24 +0100
devscripts (2.9.16) unstable; urgency=low
Modified: trunk/uscan.1
===================================================================
--- trunk/uscan.1 2006-04-15 22:37:25 UTC (rev 397)
+++ trunk/uscan.1 2006-04-15 22:42:34 UTC (rev 398)
@@ -240,6 +240,11 @@
type version numbers. Again, the \fIrules\fR string may not contain
commas; this should not be a problem.
.TP
+\fBversionmangle=\fIrules\fR
+This is a syntactic shorthand for
+\fBuversionmangle=\fIrules\fB,dversionmangle=\fIrules\fB, applying the
+same rules to both the upstream and Debian version numbers.
+.TP
\fBfilenamemangle=\fIrules\fR
This is used to mangle the filename with which the downloaded file
will be saved, and is parsed in the same way as the
Modified: trunk/uscan.pl
===================================================================
--- trunk/uscan.pl 2006-04-15 22:37:25 UTC (rev 397)
+++ trunk/uscan.pl 2006-04-15 22:42:34 UTC (rev 398)
@@ -572,6 +572,9 @@
# opts=dversionmangle=s/\.dfsg\.\d+$// \
# http://some.site.org/some/path/foobar-(.*)\.tar\.gz
#
+# The versionmangle=... option is a shorthand for saying uversionmangle=...
+# and dversionmangle=... and applies to both upstream and Debian versions.
+#
# The option filenamemangle can be used to mangle the name under which
# the downloaded file will be saved:
# href="http://foo.bar.org/download/?path=&download=foo-0.1.1.tar.gz"
@@ -664,6 +667,10 @@
elsif ($opt =~ /^dversionmangle\s*=\s*(.+)/) {
@{$options{'dversionmangle'}} = split /;/, $1;
}
+ elsif ($opt =~ /^versionmangle\s*=\s*(.+)/) {
+ @{$options{'uversionmangle'}} = split /;/, $1;
+ @{$options{'dversionmangle'}} = split /;/, $1;
+ }
elsif ($opt =~ /^filenamemangle\s*=\s*(.+)/) {
@{$options{'filenamemangle'}} = split /;/, $1;
}
More information about the Dehs-devel
mailing list