k_f         14/11/06 16:50:01

  Added:                monkeysign-1.2-test-no-emit-version.patch
                        monkeysign-2.0.0-rst2s5.patch
  Log:
  Bump version to 2.0.0, fixes bug #521822
  
  (Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 
0xFC3B17DE05E136A0!)

Revision  Changes    Path
1.1                  
app-crypt/monkeysign/files/monkeysign-1.2-test-no-emit-version.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/monkeysign/files/monkeysign-1.2-test-no-emit-version.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/monkeysign/files/monkeysign-1.2-test-no-emit-version.patch?rev=1.1&content-type=text/plain

Index: monkeysign-1.2-test-no-emit-version.patch
===================================================================
diff -r cd828dc1ffd9 tests/96F47C6A.asc
--- a/tests/96F47C6A.asc        Tue Sep 02 17:54:40 2014 +0200
+++ b/tests/96F47C6A.asc        Tue Sep 02 17:55:56 2014 +0200
@@ -1,5 +1,4 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.12 (GNU/Linux)
 
 mI0EUAlt9AEEAMVygQA7sGE7xS5lGk8bPK7vtBuNAb9ETjXmC8jPLZ35KTviRq1c
 NfFl0J66ObgcLEQjl84GMQ6Du6qLDAAgwi/2TqzmoGljXEiOd+lePBOhEV7WgkTx
diff -r cd828dc1ffd9 tests/test_gpg.py
--- a/tests/test_gpg.py Tue Sep 02 17:54:40 2014 +0200
+++ b/tests/test_gpg.py Tue Sep 02 17:55:56 2014 +0200
@@ -150,6 +150,7 @@
         self.assertTrue(self.gpg.import_data(open(os.path.dirname(__file__) + 
'/96F47C6A.asc').read()))
         k1 = open(os.path.dirname(__file__) + '/96F47C6A.asc').read()
         self.gpg.context.set_option('armor')
+        self.gpg.context.set_option('no-emit-version')
         self.gpg.context.set_option('export-options', 'export-minimal')
         k2 = self.gpg.export_data('96F47C6A')
         self.assertEqual(k1,k2)



1.1                  app-crypt/monkeysign/files/monkeysign-2.0.0-rst2s5.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/monkeysign/files/monkeysign-2.0.0-rst2s5.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/monkeysign/files/monkeysign-2.0.0-rst2s5.patch?rev=1.1&content-type=text/plain

Index: monkeysign-2.0.0-rst2s5.patch
===================================================================
diff -r 9cf95971dd10 monkeysign/documentation.py
--- a/monkeysign/documentation.py       Sun Oct 19 12:34:21 2014 -0400
+++ b/monkeysign/documentation.py       Sun Oct 19 12:35:30 2014 -0400
@@ -161,11 +161,11 @@
     def run(self):
         html = os.path.join(os.path.dirname(self.file), 
os.path.splitext(os.path.basename(self.file))[0] + '.html')
         self.announce('processing slides from %s to %s' % (self.file, html), 2)
-        os.system('rst2s5 --theme default "%s" "%s"' % (self.file, html))
+        os.system('rst2s5.py --theme default "%s" "%s"' % (self.file, html))
 
 def has_rst2s5(build):
     """predicate for this class: do not fail if rst2s5 is missing"""
-    return (os.system('rst2s5 < /dev/null > /dev/null') == 0)
+    return (os.system('rst2s5.py < /dev/null > /dev/null') == 0)
 
 # (function, predicate), see 
http://docs.python.org/2/distutils/apiref.html#distutils.cmd.Command.sub_commands
 build.sub_commands.append(('build_manpage', None))




Reply via email to