Author: jamessan
Date: 2009-11-21 23:12:45 +0000 (Sat, 21 Nov 2009)
New Revision: 2035
Modified:
trunk/conf.default.in
trunk/debian/changelog
trunk/debian/postinst
trunk/scripts/debc.1
trunk/scripts/debchange.1
trunk/scripts/debchange.pl
trunk/scripts/debclean.1
trunk/scripts/debclean.sh
trunk/scripts/debi.1
trunk/scripts/debi.pl
trunk/scripts/debrelease.1
trunk/scripts/debrelease.sh
trunk/scripts/debuild.1
trunk/scripts/debuild.pl
trunk/scripts/nmudiff.sh
trunk/scripts/uscan.1
trunk/scripts/uscan.pl
Log:
Tighten default dirname regex to match a version only if it contains at least
one character: ‘PACKAGE(-.+)?’. (Closes: #521126)
Modified: trunk/conf.default.in
===================================================================
--- trunk/conf.default.in 2009-11-21 15:29:02 UTC (rev 2034)
+++ trunk/conf.default.in 2009-11-21 23:12:45 UTC (rev 2035)
@@ -42,7 +42,7 @@
#
# The default settings are:
# DEVSCRIPTS_CHECK_DIRNAME_LEVEL=1
-# DEVSCRIPTS_CHECK_DIRNAME_REGEX='PACKAGE(-.*)?'
+# DEVSCRIPTS_CHECK_DIRNAME_REGEX='PACKAGE(-.+)?'
##### annotate-output
#
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-11-21 15:29:02 UTC (rev 2034)
+++ trunk/debian/changelog 2009-11-21 23:12:45 UTC (rev 2035)
@@ -1,8 +1,13 @@
devscripts (2.10.57) UNRELEASED; urgency=low
+ [ James Vega ]
* debcommit: Fix gathering of "Closes" with dpkg >= 1.15.5.2. (Closes:
#557318)
+ [ Ben Finney ]
+ * Tighten default dirname regex to match a version only if it contains
+ at least one character: ‘PACKAGE(-.+)?’. (Closes: #521126)
+
-- James Vega <[email protected]> Fri, 20 Nov 2009 00:37:03 -0500
devscripts (2.10.56) unstable; urgency=low
Modified: trunk/debian/postinst
===================================================================
--- trunk/debian/postinst 2009-11-21 15:29:02 UTC (rev 2034)
+++ trunk/debian/postinst 2009-11-21 23:12:45 UTC (rev 2035)
@@ -73,7 +73,7 @@
#
# The default settings are:
# DEVSCRIPTS_CHECK_DIRNAME_LEVEL=1
-# DEVSCRIPTS_CHECK_DIRNAME_REGEX='PACKAGE(-.*)?'
+# DEVSCRIPTS_CHECK_DIRNAME_REGEX='PACKAGE(-.+)?'
EOF
fi
Modified: trunk/scripts/debc.1
===================================================================
--- trunk/scripts/debc.1 2009-11-21 15:29:02 UTC (rev 2034)
+++ trunk/scripts/debc.1 2009-11-21 23:12:45 UTC (rev 2035)
@@ -59,7 +59,7 @@
match the full directory name. If \fIregex\fR contains the string
\'PACKAGE', this will be replaced by the source package name, as
determined from the changelog. The default value for the regex is:
-\'PACKAGE(-.*)?', thus matching directory names such as PACKAGE and
+\'PACKAGE(-.+)?', thus matching directory names such as PACKAGE and
PACKAGE-version.
.SH OPTIONS
.TP
Modified: trunk/scripts/debchange.1
===================================================================
--- trunk/scripts/debchange.1 2009-11-21 15:29:02 UTC (rev 2034)
+++ trunk/scripts/debchange.1 2009-11-21 23:12:45 UTC (rev 2035)
@@ -137,7 +137,7 @@
match the full directory name. If \fIregex\fR contains the string
\'PACKAGE', this will be replaced by the source package name, as
determined from the changelog. The default value for the regex is:
-\'PACKAGE(-.*)?', thus matching directory names such as PACKAGE and
+\'PACKAGE(-.+)?', thus matching directory names such as PACKAGE and
PACKAGE-version.
.PP
The default changelog to be edited is \fIdebian/changelog\fR; however,
Modified: trunk/scripts/debchange.pl
===================================================================
--- trunk/scripts/debchange.pl 2009-11-21 15:29:02 UTC (rev 2034)
+++ trunk/scripts/debchange.pl 2009-11-21 23:12:45 UTC (rev 2035)
@@ -170,7 +170,7 @@
What constitutes a matching directory name; REGEX is
a Perl regular expression; the string \`PACKAGE\' will
be replaced by the package name; see manpage for details
- (default: 'PACKAGE(-.*)?')
+ (default: 'PACKAGE(-.+)?')
--no-conf, --noconf
Don\'t read devscripts config files; must be the first option given
--release-heuristic log|changelog
@@ -203,7 +203,7 @@
# Start by setting default values
my $check_dirname_level = 1;
-my $check_dirname_regex = 'PACKAGE(-.*)?';
+my $check_dirname_regex = 'PACKAGE(-.+)?';
my $opt_p = 0;
my $opt_query = 1;
my $opt_release_heuristic = 'log';
@@ -227,7 +227,7 @@
'DEBCHANGE_PRESERVE' => 'no',
'DEBCHANGE_QUERY_BTS' => 'yes',
'DEVSCRIPTS_CHECK_DIRNAME_LEVEL' => 1,
- 'DEVSCRIPTS_CHECK_DIRNAME_REGEX' => 'PACKAGE(-.*)?',
+ 'DEVSCRIPTS_CHECK_DIRNAME_REGEX' => 'PACKAGE(-.+)?',
'DEBCHANGE_RELEASE_HEURISTIC' => 'log',
'DEBCHANGE_MULTIMAINT' => 'yes',
'DEBCHANGE_TZ' => $ENV{TZ}, # undef if TZ unset
Modified: trunk/scripts/debclean.1
===================================================================
--- trunk/scripts/debclean.1 2009-11-21 15:29:02 UTC (rev 2034)
+++ trunk/scripts/debclean.1 2009-11-21 23:12:45 UTC (rev 2035)
@@ -55,7 +55,7 @@
match the full directory name. If \fIregex\fR contains the string
\'PACKAGE', this will be replaced by the source package name, as
determined from the changelog. The default value for the regex is:
-\'PACKAGE(-.*)?', thus matching directory names such as PACKAGE and
+\'PACKAGE(-.+)?', thus matching directory names such as PACKAGE and
PACKAGE-version.
.SH OPTIONS
.TP
Modified: trunk/scripts/debclean.sh
===================================================================
--- trunk/scripts/debclean.sh 2009-11-21 15:29:02 UTC (rev 2034)
+++ trunk/scripts/debclean.sh 2009-11-21 23:12:45 UTC (rev 2035)
@@ -24,7 +24,7 @@
What constitutes a matching directory name; REGEX is
a Perl regular expression; the string \`PACKAGE' will
be replaced by the package name; see manpage for details
- (default: 'PACKAGE(-.*)?')
+ (default: 'PACKAGE(-.+)?')
--no-conf, --noconf
Do not read devscripts config files;
@@ -52,7 +52,7 @@
# Boilerplate: set config variables
DEFAULT_DEBCLEAN_CLEANDEBS=no
DEFAULT_DEVSCRIPTS_CHECK_DIRNAME_LEVEL=1
-DEFAULT_DEVSCRIPTS_CHECK_DIRNAME_REGEX='PACKAGE(-.*)?'
+DEFAULT_DEVSCRIPTS_CHECK_DIRNAME_REGEX='PACKAGE(-.+)?'
VARS="DEBCLEAN_CLEANDEBS DEVSCRIPTS_CHECK_DIRNAME_LEVEL
DEVSCRIPTS_CHECK_DIRNAME_REGEX"
Modified: trunk/scripts/debi.1
===================================================================
--- trunk/scripts/debi.1 2009-11-21 15:29:02 UTC (rev 2034)
+++ trunk/scripts/debi.1 2009-11-21 23:12:45 UTC (rev 2035)
@@ -60,7 +60,7 @@
match the full directory name. If \fIregex\fR contains the string
\'PACKAGE', this will be replaced by the source package name, as
determined from the changelog. The default value for the regex is:
-\'PACKAGE(-.*)?', thus matching directory names such as PACKAGE and
+\'PACKAGE(-.+)?', thus matching directory names such as PACKAGE and
PACKAGE-version.
.SH OPTIONS
.TP
Modified: trunk/scripts/debi.pl
===================================================================
--- trunk/scripts/debi.pl 2009-11-21 15:29:02 UTC (rev 2034)
+++ trunk/scripts/debi.pl 2009-11-21 23:12:45 UTC (rev 2035)
@@ -61,7 +61,7 @@
What constitutes a matching directory name; REGEX is
a Perl regular expression; the string \`PACKAGE\' will
be replaced by the package name; see manpage for details
- (default: 'PACKAGE(-.*)?')
+ (default: 'PACKAGE(-.+)?')
--with-depends Install packages with their depends.
--tool TOOL Use the specified tool for installing the dependencies
of the package(s) to be installed.
@@ -97,7 +97,7 @@
What constitutes a matching directory name; REGEX is
a Perl regular expression; the string \`PACKAGE\' will
be replaced by the package name; see manpage for details
- (default: 'PACKAGE(-.*)?')
+ (default: 'PACKAGE(-.+)?')
--help Show this message
--version Show version and copyright information
@@ -124,7 +124,7 @@
my $debsdir = '..';
my $debsdir_warning;
my $check_dirname_level = 1;
-my $check_dirname_regex = 'PACKAGE(-.*)?';
+my $check_dirname_regex = 'PACKAGE(-.+)?';
my $install_tool = 'apt-get';
# Next, read configuration files and then command line
@@ -138,7 +138,7 @@
my %config_vars = (
'DEBRELEASE_DEBS_DIR' => '..',
'DEVSCRIPTS_CHECK_DIRNAME_LEVEL' => 1,
- 'DEVSCRIPTS_CHECK_DIRNAME_REGEX' => 'PACKAGE(-.*)?',
+ 'DEVSCRIPTS_CHECK_DIRNAME_REGEX' => 'PACKAGE(-.+)?',
);
my %config_default = %config_vars;
Modified: trunk/scripts/debrelease.1
===================================================================
--- trunk/scripts/debrelease.1 2009-11-21 15:29:02 UTC (rev 2034)
+++ trunk/scripts/debrelease.1 2009-11-21 23:12:45 UTC (rev 2035)
@@ -51,7 +51,7 @@
match the full directory name. If \fIregex\fR contains the string
\'PACKAGE', this will be replaced by the source package name, as
determined from the changelog. The default value for the regex is:
-\'PACKAGE(-.*)?', thus matching directory names such as PACKAGE and
+\'PACKAGE(-.+)?', thus matching directory names such as PACKAGE and
PACKAGE-version.
.SH OPTIONS
.TP
Modified: trunk/scripts/debrelease.sh
===================================================================
--- trunk/scripts/debrelease.sh 2009-11-21 15:29:02 UTC (rev 2034)
+++ trunk/scripts/debrelease.sh 2009-11-21 23:12:45 UTC (rev 2035)
@@ -49,7 +49,7 @@
What constitutes a matching directory name; REGEX is
a Perl regular expression; the string \`PACKAGE' will
be replaced by the package name; see manpage for details
- (default: 'PACKAGE(-.*)?')
+ (default: 'PACKAGE(-.+)?')
--no-conf, --noconf
Don't read devscripts config files;
must be the first option given
@@ -84,7 +84,7 @@
DEFAULT_DEBRELEASE_UPLOADER=dupload
DEFAULT_DEBRELEASE_DEBS_DIR=..
DEFAULT_DEVSCRIPTS_CHECK_DIRNAME_LEVEL=1
-DEFAULT_DEVSCRIPTS_CHECK_DIRNAME_REGEX='PACKAGE(-.*)?'
+DEFAULT_DEVSCRIPTS_CHECK_DIRNAME_REGEX='PACKAGE(-.+)?'
VARS="DEBRELEASE_UPLOADER DEBRELEASE_DEBS_DIR DEVSCRIPTS_CHECK_DIRNAME_LEVEL
DEVSCRIPTS_CHECK_DIRNAME_REGEX"
if [ "$1" = "--no-conf" -o "$1" = "--noconf" ]; then
Modified: trunk/scripts/debuild.1
===================================================================
--- trunk/scripts/debuild.1 2009-11-21 15:29:02 UTC (rev 2034)
+++ trunk/scripts/debuild.1 2009-11-21 23:12:45 UTC (rev 2035)
@@ -81,7 +81,7 @@
match the full directory name. If \fIregex\fR contains the string
\'PACKAGE', this will be replaced by the source package name, as
determined from the changelog. The default value for the regex is:
-\'PACKAGE(-.*)?', thus matching directory names such as PACKAGE and
+\'PACKAGE(-.+)?', thus matching directory names such as PACKAGE and
PACKAGE-version.
.SH ENVIRONMENT VARIABLES
As environment variables can affect the building of a package, often
Modified: trunk/scripts/debuild.pl
===================================================================
--- trunk/scripts/debuild.pl 2009-11-21 15:29:02 UTC (rev 2034)
+++ trunk/scripts/debuild.pl 2009-11-21 23:12:45 UTC (rev 2035)
@@ -102,7 +102,7 @@
What constitutes a matching directory name; REGEX is
a Perl regular expression; the string \`PACKAGE\' will
be replaced by the package name; see manpage for details
- (default: 'PACKAGE(-.*)?')
+ (default: 'PACKAGE(-.+)?')
--help, -h display this message
@@ -179,7 +179,7 @@
my @lintian_opts=();
my $checkbuilddep=1;
my $check_dirname_level = 1;
-my $check_dirname_regex = 'PACKAGE(-.*)?';
+my $check_dirname_regex = 'PACKAGE(-.+)?';
my $logging=0;
my $tgz_check=1;
my $prepend_path='';
@@ -254,7 +254,7 @@
'DEBUILD_POST_DPKG_BUILDPACKAGE_HOOK' => '',
'DEBUILD_SIGNING_USERNAME' => '',
'DEVSCRIPTS_CHECK_DIRNAME_LEVEL' => 1,
- 'DEVSCRIPTS_CHECK_DIRNAME_REGEX' => 'PACKAGE(-.*)?',
+ 'DEVSCRIPTS_CHECK_DIRNAME_REGEX' => 'PACKAGE(-.+)?',
);
my %config_default = %config_vars;
my $dpkg_opts_var = 'DEBUILD_DPKG_BUILDPACKAGE_OPTS';
Modified: trunk/scripts/nmudiff.sh
===================================================================
--- trunk/scripts/nmudiff.sh 2009-11-21 15:29:02 UTC (rev 2034)
+++ trunk/scripts/nmudiff.sh 2009-11-21 23:12:45 UTC (rev 2035)
@@ -66,7 +66,7 @@
VARS="NMUDIFF_DELAY NMUDIFF_MUTT NMUDIFF_NEWREPORT BTS_SENDMAIL_COMMAND"
# Don't think it's worth including this stuff
# DEFAULT_DEVSCRIPTS_CHECK_DIRNAME_LEVEL=1
-# DEFAULT_DEVSCRIPTS_CHECK_DIRNAME_REGEX='PACKAGE(-.*)?'
+# DEFAULT_DEVSCRIPTS_CHECK_DIRNAME_REGEX='PACKAGE(-.+)?'
# VARS="BTS_SENDMAIL_COMMAND DEVSCRIPTS_CHECK_DIRNAME_LEVEL
DEVSCRIPTS_CHECK_DIRNAME_REGEX"
if [ "$1" = "--no-conf" -o "$1" = "--noconf" ]; then
Modified: trunk/scripts/uscan.1
===================================================================
--- trunk/scripts/uscan.1 2009-11-21 15:29:02 UTC (rev 2034)
+++ trunk/scripts/uscan.1 2009-11-21 23:12:45 UTC (rev 2035)
@@ -313,7 +313,7 @@
match the full directory name. If \fIregex\fR contains the string
\'PACKAGE', this will be replaced by the source package name, as
determined from the changelog. The default value for the regex is:
-\'PACKAGE(-.*)?', thus matching directory names such as PACKAGE and
+\'PACKAGE(-.+)?', thus matching directory names such as PACKAGE and
PACKAGE-version.
.SH EXAMPLE
This script will perform a fully automatic upstream update.
Modified: trunk/scripts/uscan.pl
===================================================================
--- trunk/scripts/uscan.pl 2009-11-21 15:29:02 UTC (rev 2034)
+++ trunk/scripts/uscan.pl 2009-11-21 23:12:45 UTC (rev 2035)
@@ -108,7 +108,7 @@
What constitutes a matching directory name; REGEX is
a Perl regular expression; the string \`PACKAGE\' will
be replaced by the package name; see manpage for details
- (default: 'PACKAGE(-.*)?')
+ (default: 'PACKAGE(-.+)?')
--watchfile FILE
Specify the watchfile rather than using debian/watch;
no directory traversing will be done in this case
@@ -168,7 +168,7 @@
my $symlink = 'symlink';
my $verbose = 0;
my $check_dirname_level = 1;
-my $check_dirname_regex = 'PACKAGE(-.*)?';
+my $check_dirname_regex = 'PACKAGE(-.+)?';
my $dehs = 0;
my %dehs_tags;
my $dehs_end_output = 0;
@@ -193,7 +193,7 @@
'USCAN_USER_AGENT' => '',
'USCAN_REPACK' => 'no',
'DEVSCRIPTS_CHECK_DIRNAME_LEVEL' => 1,
- 'DEVSCRIPTS_CHECK_DIRNAME_REGEX' => 'PACKAGE(-.*)?',
+ 'DEVSCRIPTS_CHECK_DIRNAME_REGEX' => 'PACKAGE(-.+)?',
);
my %config_default = %config_vars;
--
To unsubscribe, send mail to [email protected].
