[SCM] Git repository for devscripts branch, master, updated. v2.12.3-9-g87d7bc3

[James McCoy]

The following commit has been merged in the master branch:
commit 87d7bc3c879f4168f67f7a8940cf8b55ad55944c
Author: James McCoy <jamessan at debian.org>
Date:   Thu Sep 20 18:58:48 2012 -0400

    debcheckout: Fix collision in short options.  Use -P for --package.
    
    Closes: #688150
    Signed-off-by: James McCoy <jamessan at debian.org>

diff --git a/debian/changelog b/debian/changelog
index fdc403d..61a9094 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ devscripts (2.12.4) UNRELEASED; urgency=low
       #685202)
   * dcmd: Don't add "--" to the command being executed.  The user has to know
     where this should be used/if it can be used.  (Closes: #687964)
+  * debcheckout: Fix collision in short options.  Use -P for --package.
+    (Closes: #688150)
 
   [ Benjamin Drung ]
   * licensecheck: Recognize licenses in (fixed-form) Fortran code. Thanks to
diff --git a/scripts/debcheckout.pl b/scripts/debcheckout.pl
index a8270c8..baf3846 100755
--- a/scripts/debcheckout.pl
+++ b/scripts/debcheckout.pl
@@ -103,7 +103,7 @@ uses "static" information as known by APT's cache.
 
 Also see B<-d>. This option and B<-d> are mutually exclusive.
 
-=item B<--package> I<package>
+=item B<-P> I<package>, B<--package> I<package>
 
 When checking out a repository URL, instead of trying to guess the package name
 from the URL, use this package name.
@@ -987,7 +987,7 @@ sub main() {
 	"help|h" => sub { pod2usage({-exitval => 0, -verbose => 1}); },
 	"print|p" => \$print_mode,
 	"details|d" => \$details_mode,
-	"package|p=s" => \$use_package,
+	"package|P=s" => \$use_package,
 	"type|t=s" => \$repo_type,
 	"user|u=s" => \$user,
 	"file|f=s" => sub { push(@files, $_[1]); },

-- 
Git repository for devscripts