Merge branch '1.x' into 2.x

Conflicts:
	debian/changelog
	debian/gbp.conf
	monkeysign/__init__.py

debian/changelog

@@ -14,14 +14,21 @@ monkeysign (2.0~git0) experimental; urgency=low
 
  -- Antoine Beaupré <anarcat@debian.org>  Tue, 01 Oct 2013 14:34:48 +0200
 
-monkeysign (1.2~git0) UNRELEASED; urgency=low
+monkeysign (1.2) unstable; urgency=medium
 
   * improve python 3 compatibility, partially (Closes: #725059)
   * update translation strings
   * spanish translation, thanks to lilbit
   * partial french translation
-
- -- Antoine Beaupré <anarcat@debian.org>  Tue, 01 Oct 2013 14:42:58 +0200
+  * Czech translation, thanks to Michal Čihař
+  * Bug fix: "build_slides fails of two reasons", thanks to Felix Dreissig
+    (Closes: #738731).
+  * Bug fix: "build_manpage only works because of PyGTK encoding changes",
+    thanks to Felix Dreissig (Closes: #738730).
+  * Bug fix: "build_trans fails if called seperately", thanks to Felix
+    Dreissig (Closes: #738732).
+
+ -- Antoine Beaupré <anarcat@debian.org>  Thu, 28 Aug 2014 20:23:57 -0700
 
 monkeysign (1.1) unstable; urgency=low
 

monkeysign/cli.py

@@ -40,7 +40,7 @@ passwords."""
     def parse_args(self, args):
         """override main parsing: we absolutely need an argument"""
         parser = MonkeysignUi.parse_args(self, args)
-        if self.pattern is None:
+        if self.pattern is None and not self.options.version:
             parser.print_usage()
             sys.exit(_('wrong number of arguments, use -h for full help'))
 

monkeysign/ui.py

@@ -15,6 +15,7 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from monkeysign import __version__
 # gpg interface
 from monkeysign.gpg import Keyring, TempKeyring, GpgRuntimeError
 import monkeysign.translation
@@ -69,6 +70,8 @@ class MonkeysignUi(object):
     def parser(self):
         """parse the commandline arguments"""
         parser = optparse.OptionParser(description=self.__doc__, usage=self.usage, epilog=self.epilog, formatter=NowrapHelpFormatter())
+        parser.add_option('--version', dest='version', default=False, action='store_true',
+                          help=_('show version information and quit'))
         parser.add_option('-d', '--debug', dest='debug', default=False, action='store_true',
                           help=_('request debugging information from GPG engine (lots of garbage)'))
         parser.add_option('-v', '--verbose', dest='verbose', default=False, action='store_true',
@@ -150,6 +153,8 @@ class MonkeysignUi(object):
         # initialize the temporary keyring directory
         self.tmpkeyring = TempKeyring()
 
+        if self.options.version:
+            self.abort(monkeysign.__version__)
         if self.options.debug:
             self.tmpkeyring.context.debug = self.logfile
             self.keyring.context.debug = self.logfile