[devscripts] 01/04: Configure Getopt::Long with explicit options rather than gnu_getopt

James McCoy jamessan at debian.org
Sat Oct 1 02:18:16 UTC 2016 

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch master
in repository devscripts.

commit 45849e12efdc1002e1cfd66bcc00b971f6518382
Author: James McCoy <jamessan at debian.org>
Date:   Thu Sep 29 20:22:07 2016 -0400

    Configure Getopt::Long with explicit options rather than gnu_getopt
    
    gnu_getopt include gnu_compat which now requires an '=' to indicate
    omission of an optional argument (e.g., "dch --news=").  This was an
    intentional change to man gnu_compat actually compatible with gnu
    getopt, but that's now what devscripts wants.
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog            | 2 ++
 scripts/build-rdeps.pl      | 2 +-
 scripts/checkbashisms.pl    | 2 +-
 scripts/dcontrol.pl         | 2 +-
 scripts/dd-list.pl          | 2 +-
 scripts/debchange.pl        | 2 +-
 scripts/debcheckout.pl      | 2 +-
 scripts/debcommit.pl        | 2 +-
 scripts/debi.pl             | 2 +-
 scripts/debsnap.pl          | 2 +-
 scripts/desktop2menu.pl     | 2 +-
 scripts/dget.pl             | 2 +-
 scripts/dscverify.pl        | 2 +-
 scripts/mass-bug.pl         | 2 +-
 scripts/mk-build-deps.pl    | 2 +-
 scripts/mk-origtargz.pl     | 2 +-
 scripts/origtargz.pl        | 2 +-
 scripts/plotchangelog.pl    | 2 +-
 scripts/rc-alert.pl         | 2 +-
 scripts/rmadison.pl         | 2 +-
 scripts/tagpending.pl       | 2 +-
 scripts/transition-check.pl | 2 +-
 scripts/uscan.pl            | 2 +-
 23 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a1590d1..e65cd8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ devscripts (2.16.8) UNRELEASED; urgency=medium
   [ James McCoy ]
   * deb-reversion: Update md5sum of changelog if it's changed.  (Closes:
     #836725)
+  * Change Getopt::Long configuration to disable gnu_compat so an '=' isn't
+    required for optional arguments (e.g. "dch --news=").
 
  -- Paul Wise <pabs at debian.org>  Sat, 27 Aug 2016 13:58:14 +0800
 
diff --git a/scripts/build-rdeps.pl b/scripts/build-rdeps.pl
index 07c17db..6478a04 100755
--- a/scripts/build-rdeps.pl
+++ b/scripts/build-rdeps.pl
@@ -128,7 +128,7 @@ and run apt-get update afterwards or use the update option of this tool.
 use warnings;
 use strict;
 use File::Basename;
-use Getopt::Long qw(:config gnu_getopt);
+use Getopt::Long qw(:config bundling permute no_getopt_compat);
 use Pod::Usage;
 use Data::Dumper;
 my $progname = basename($0);
diff --git a/scripts/checkbashisms.pl b/scripts/checkbashisms.pl
index 7460250..76578f8 100755
--- a/scripts/checkbashisms.pl
+++ b/scripts/checkbashisms.pl
@@ -22,7 +22,7 @@
 
 use strict;
 use warnings;
-use Getopt::Long qw(:config gnu_getopt);
+use Getopt::Long qw(:config bundling permute no_getopt_compat);
 use File::Temp qw/tempfile/;
 
 sub init_hashes;
diff --git a/scripts/dcontrol.pl b/scripts/dcontrol.pl
index 309e585..ca40248 100755
--- a/scripts/dcontrol.pl
+++ b/scripts/dcontrol.pl
@@ -21,7 +21,7 @@
 use strict;
 use warnings;
 use File::Basename;
-use Getopt::Long qw(:config gnu_getopt);
+use Getopt::Long qw(:config bundling permute no_getopt_compat);
 
 BEGIN {
     pop @INC if $INC[-1] eq '.';
diff --git a/scripts/dd-list.pl b/scripts/dd-list.pl
index f7c4b50..7bae8a3 100755
--- a/scripts/dd-list.pl
+++ b/scripts/dd-list.pl
@@ -23,7 +23,7 @@
 use strict;
 use warnings;
 use FileHandle;
-use Getopt::Long qw(:config gnu_getopt);
+use Getopt::Long qw(:config bundling permute no_getopt_compat);
 use Dpkg::Version;
 use Dpkg::IPC;
 
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index d8aeb00..9a36432 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -35,7 +35,7 @@ use open ':utf8';  # changelogs are written with UTF-8 encoding
 use filetest 'access';  # use access rather than stat for -w
 # for checking whether user names are valid and making format() behave
 use Encode qw/decode_utf8 encode_utf8/;
-use Getopt::Long qw(:config gnu_getopt);
+use Getopt::Long qw(:config bundling permute no_getopt_compat);
 use File::Copy;
 use File::Basename;
 use Cwd;
diff --git a/scripts/debcheckout.pl b/scripts/debcheckout.pl
index e9327bd..8142385 100755
--- a/scripts/debcheckout.pl
+++ b/scripts/debcheckout.pl
@@ -244,7 +244,7 @@ use strict;
 use warnings;
 no if $] >= 5.018, 'warnings', 'experimental::smartmatch';
 use feature 'switch';
-use Getopt::Long qw(:config gnu_getopt);
+use Getopt::Long qw(:config bundling permute no_getopt_compat);
 use Pod::Usage;
 use File::Basename;
 use File::Copy qw/copy/;
diff --git a/scripts/debcommit.pl b/scripts/debcommit.pl
index ce22100..279f01b 100755
--- a/scripts/debcommit.pl
+++ b/scripts/debcommit.pl
@@ -182,7 +182,7 @@ options to "bzr commit" will be generated to associate the revision and the bugs
 
 use warnings;
 use strict;
-use Getopt::Long qw(:config gnu_getopt);
+use Getopt::Long qw(:config bundling permute no_getopt_compat);
 use Cwd;
 use File::Basename;
 use File::Temp;
diff --git a/scripts/debi.pl b/scripts/debi.pl
index 31ed63c..82588be 100755
--- a/scripts/debi.pl
+++ b/scripts/debi.pl
@@ -26,7 +26,7 @@
 use 5.008;
 use strict;
 use warnings;
-use Getopt::Long qw(:config gnu_getopt);
+use Getopt::Long qw(:config bundling permute no_getopt_compat);
 use File::Basename;
 use filetest 'access';
 use Cwd;
diff --git a/scripts/debsnap.pl b/scripts/debsnap.pl
index cf17f25..4827246 100755
--- a/scripts/debsnap.pl
+++ b/scripts/debsnap.pl
@@ -18,7 +18,7 @@
 use strict;
 use warnings;
 
-use Getopt::Long qw(:config gnu_getopt);
+use Getopt::Long qw(:config bundling permute no_getopt_compat);
 use File::Basename;
 use Cwd qw/cwd abs_path/;
 use File::Path qw/make_path/;
diff --git a/scripts/desktop2menu.pl b/scripts/desktop2menu.pl
index f915ec2..5437cc7 100755
--- a/scripts/desktop2menu.pl
+++ b/scripts/desktop2menu.pl
@@ -58,7 +58,7 @@ Sune Vuorela <debian at pusling.com> with modifications by Adam D. Barratt
 
 use warnings;
 use strict;
-use Getopt::Long qw(:config gnu_getopt);
+use Getopt::Long qw(:config bundling permute no_getopt_compat);
 use File::Basename;
 
 my $progname = basename($0);
diff --git a/scripts/dget.pl b/scripts/dget.pl
index 8e6c8ac..f090df4 100755
--- a/scripts/dget.pl
+++ b/scripts/dget.pl
@@ -34,7 +34,7 @@ use IO::File;
 use Digest::MD5;
 use Devscripts::Compression;
 use Dpkg::Control;
-use Getopt::Long qw(:config gnu_getopt);
+use Getopt::Long qw(:config bundling permute no_getopt_compat);
 use File::Basename;
 
 # global variables
diff --git a/scripts/dscverify.pl b/scripts/dscverify.pl
index cb2946f..a47bad1 100755
--- a/scripts/dscverify.pl
+++ b/scripts/dscverify.pl
@@ -32,7 +32,7 @@ use File::Spec;
 use File::Temp;
 use File::Basename;
 use POSIX	qw(:errno_h);
-use Getopt::Long qw(:config gnu_getopt);
+use Getopt::Long qw(:config bundling permute no_getopt_compat);
 use List::Util qw(first);
 
 my $progname = basename $0;
diff --git a/scripts/mass-bug.pl b/scripts/mass-bug.pl
index 6ef3948..42a4d51 100755
--- a/scripts/mass-bug.pl
+++ b/scripts/mass-bug.pl
@@ -150,7 +150,7 @@ F</usr/sbin/sendmail>.  Same as the B<--sendmail> command line option.
 
 use strict;
 use warnings;
-use Getopt::Long qw(:config gnu_getopt);
+use Getopt::Long qw(:config bundling permute no_getopt_compat);
 use Text::Wrap;
 use File::Basename;
 use POSIX qw(locale_h strftime);
diff --git a/scripts/mk-build-deps.pl b/scripts/mk-build-deps.pl
index 4e31654..2612389 100755
--- a/scripts/mk-build-deps.pl
+++ b/scripts/mk-build-deps.pl
@@ -129,7 +129,7 @@ General Public License, version 2 or later.
 use 5.01;
 use strict;
 use warnings;
-use Getopt::Long qw(:config gnu_getopt);
+use Getopt::Long qw(:config bundling permute no_getopt_compat);
 use File::Basename;
 use Pod::Usage;
 use Dpkg::Control;
diff --git a/scripts/mk-origtargz.pl b/scripts/mk-origtargz.pl
index f09c500..d8eaf70 100644
--- a/scripts/mk-origtargz.pl
+++ b/scripts/mk-origtargz.pl
@@ -193,7 +193,7 @@ B<mk-origtargz> and this manpage have been written by Joachim Breitner
 use strict;
 use warnings;
 use File::Temp qw/tempdir/;
-use Getopt::Long qw(:config gnu_getopt);
+use Getopt::Long qw(:config bundling permute no_getopt_compat);
 use Pod::Usage;
 
 use Dpkg::Changelog::Debian;
diff --git a/scripts/origtargz.pl b/scripts/origtargz.pl
index 6d3369f..535d91f 100755
--- a/scripts/origtargz.pl
+++ b/scripts/origtargz.pl
@@ -171,7 +171,7 @@ B<origtargz> and this manpage have been written by Christoph Berg
 use strict;
 use warnings;
 use File::Temp qw/tempdir/;
-use Getopt::Long qw(:config gnu_getopt);
+use Getopt::Long qw(:config bundling permute no_getopt_compat);
 use Pod::Usage;
 
 my @dirs = ();
diff --git a/scripts/plotchangelog.pl b/scripts/plotchangelog.pl
index df45814..cc8e339 100755
--- a/scripts/plotchangelog.pl
+++ b/scripts/plotchangelog.pl
@@ -29,7 +29,7 @@ use FileHandle;
 use File::Basename;
 use File::Temp qw/ tempfile /;
 use Fcntl;
-use Getopt::Long qw(:config gnu_getopt);
+use Getopt::Long qw(:config bundling permute no_getopt_compat);
 
 BEGIN {
     pop @INC if $INC[-1] eq '.';
diff --git a/scripts/rc-alert.pl b/scripts/rc-alert.pl
index 9685c29..b275c8c 100755
--- a/scripts/rc-alert.pl
+++ b/scripts/rc-alert.pl
@@ -26,7 +26,7 @@ use File::Basename;
 use File::Copy qw(move);
 use File::Path qw(make_path);
 use File::Spec;
-use Getopt::Long qw(:config gnu_getopt);
+use Getopt::Long qw(:config bundling permute no_getopt_compat);
 
 sub remove_duplicate_values($);
 sub store_if_relevant(%);
diff --git a/scripts/rmadison.pl b/scripts/rmadison.pl
index 390b8d8..a9cad17 100755
--- a/scripts/rmadison.pl
+++ b/scripts/rmadison.pl
@@ -21,7 +21,7 @@
 use strict;
 use warnings;
 use File::Basename;
-use Getopt::Long qw(:config gnu_getopt);
+use Getopt::Long qw(:config bundling permute no_getopt_compat);
 
 BEGIN {
     pop @INC if $INC[-1] eq '.';
diff --git a/scripts/tagpending.pl b/scripts/tagpending.pl
index cbf789a..2782987 100755
--- a/scripts/tagpending.pl
+++ b/scripts/tagpending.pl
@@ -26,7 +26,7 @@
 
 use strict;
 use warnings;
-use Getopt::Long qw(:config gnu_getopt);
+use Getopt::Long qw(:config bundling permute no_getopt_compat);
 use File::Basename;
 use Dpkg::Changelog::Parse qw(changelog_parse);
 use Devscripts::Debbugs;
diff --git a/scripts/transition-check.pl b/scripts/transition-check.pl
index 5475950..276d93a 100755
--- a/scripts/transition-check.pl
+++ b/scripts/transition-check.pl
@@ -86,7 +86,7 @@ Adam D. Barratt <I<adam at adam-barratt.org.uk>>
 
 use warnings;
 use strict;
-use Getopt::Long qw(:config gnu_getopt);
+use Getopt::Long qw(:config bundling permute no_getopt_compat);
 use File::Basename;
 
 my $progname = basename($0);
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 68187fd..ec0bb1d 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -1697,7 +1697,7 @@ use File::Spec::Functions qw/catfile/;
 use File::Temp qw/tempfile tempdir/;
 use List::Util qw/first/;
 use filetest 'access';
-use Getopt::Long qw(:config gnu_getopt);
+use Getopt::Long qw(:config bundling permute no_getopt_compat);
 use Devscripts::Versort;
 use Text::ParseWords;
 use Digest::MD5;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git

More information about the devscripts-devel mailing list