[SCM] Git repository for devscripts branch, master, updated. v2.11.6-25-g9071026

[James McCoy]

The following commit has been merged in the master branch:
commit b11df67e853e5cbf497fab0261c01aad5c0f48f8
Author: James McCoy <jamessan at debian.org>
Date:   Sun May 6 14:20:35 2012 -0400

    debi: Add -u and -m as synonyms for --upgrade and --multi.
    
    Closes: #662773
    Signed-off-by: James McCoy <jamessan at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 145b1cd..aca10b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,8 @@ devscripts (2.11.7) UNRELEASED; urgency=low
     + Use Dpkg::IPC to run apt-cache.
     + Don't run equivs if no package information was parsed.
   * uscan: Clarify behavior of the --destdir option.  (Closes: #659389)
+  * debi: Add -u and -m as synonyms for --upgrade and --multi.  (Closes:
+    #662773)
 
   [ Benjamin Drung ]
   * Introduce a test suite for the scripts based on shunit2.
diff --git a/scripts/debi.1 b/scripts/debi.1
index 87e7dc4..2fb3bdf 100644
--- a/scripts/debi.1
+++ b/scripts/debi.1
@@ -76,10 +76,10 @@ instead of the parent of the source directory.  This should
 either be an absolute path or relative to the top of the source
 directory.
 .TP
-\fB\-\-multi\fR
+.BR \-m ", " \-\-multi
 Search for a multiarch \fI.changes\fR file, as created by \fBdpkg-cross\fR.
 .TP
-\fB\-\-upgrade\fR
+.BR \-u ", " \-\-upgrade
 Only upgrade packages already installed on the system, rather than
 installing all packages listed in the \fI.changes\fR file.
 Useful for multi-binary packages when you don't want to have all the
diff --git a/scripts/debi.pl b/scripts/debi.pl
index 1668eda..c2d44b2 100755
--- a/scripts/debi.pl
+++ b/scripts/debi.pl
@@ -186,8 +186,8 @@ GetOptions("help" => \$opt_help,
 	   "a=s" => \$opt_a,
 	   "t=s" => \$opt_t,
 	   "debs-dir=s" => \$opt_debsdir,
-	   "multi" => \$opt_multi,
-	   "upgrade" => \$opt_upgrade,
+	   "m|multi" => \$opt_multi,
+	   "u|upgrade" => \$opt_upgrade,
 	   "check-dirname-level=s" => \$opt_level,
 	   "check-dirname-regex=s" => \$opt_regex,
 	   "with-depends" => \$opt_with_depends,

-- 
Git repository for devscripts