[Python-modules-commits] r31774 - in packages/python-gnupg/trunk/debian (9 files)

Thu Feb 5 16:59:14 UTC 2015

Date: Thursday, February 5, 2015 @ 16:59:13
  Author: valhalla-guest
Revision: 31774

Updated to new release

Added:
  packages/python-gnupg/trunk/debian/patches/skip_failing_test_because_of_missing_files.patch
  packages/python-gnupg/trunk/debian/upstream/
  packages/python-gnupg/trunk/debian/upstream/signing-key.asc
    (from rev 31773, packages/python-gnupg/trunk/debian/upstream-signing-key.pgp)
Modified:
  packages/python-gnupg/trunk/debian/changelog
  packages/python-gnupg/trunk/debian/control
  packages/python-gnupg/trunk/debian/copyright
  packages/python-gnupg/trunk/debian/patches/series
  packages/python-gnupg/trunk/debian/patches/skip_network_needing_test.patch
Deleted:
  packages/python-gnupg/trunk/debian/upstream-signing-key.pgp

Modified: packages/python-gnupg/trunk/debian/changelog
===================================================================

--- packages/python-gnupg/trunk/debian/changelog	2015-02-05 10:39:22 UTC (rev 31773)
+++ packages/python-gnupg/trunk/debian/changelog	2015-02-05 16:59:13 UTC (rev 31774)
@@ -1,7 +1,11 @@
-python-gnupg (0.3.7-1) UNRELEASED; urgency=medium
+python-gnupg (0.3.7-1) experimental; urgency=medium
 
-  * New upstream release.
+  * New upstream release. Closes: #774770.
+  * Skipped one test that is failing because of missing files.
   * Updated watch file to use http://pypi.debian.net and check gpg signature.
+  * Fixed short name of the BSD-3-clause license in debian/copyright.
+  * Updated standard versions to 3.9.6 (no change needed).
+  * Fixed capitalization in description.
 
  -- Elena Grandi <valhalla-d at trueelena.org>  Thu, 05 Feb 2015 11:36:16 +0100
 

Modified: packages/python-gnupg/trunk/debian/control
===================================================================
--- packages/python-gnupg/trunk/debian/control	2015-02-05 10:39:22 UTC (rev 31773)
+++ packages/python-gnupg/trunk/debian/control	2015-02-05 16:59:13 UTC (rev 31774)
@@ -1,20 +1,20 @@
 Source: python-gnupg
-Maintainer: Elena Grandi <elena.valhalla at gmail.com>
+Maintainer: Elena Grandi <valhalla-d at trueelena.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Section: python
 Priority: optional
 Build-Depends: python-all (>= 2.6.6-3~), python3-all (>= 3.1.2-7~), debhelper (>= 7.0.50~)
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: https://bitbucket.org/vinay.sajip/python-gnupg
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-gnupg/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-gnupg/trunk/
 X-Python-Version: >= 2.6
-X-Python3-Version: >= 3.1
+X-Python3-Version: >= 3.2
 
 Package: python-gnupg
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}, gnupg
-Description: Python wrapper for the Gnu Privacy Guard (Python 2.x)
+Description: Python wrapper for the GNU Privacy Guard (Python 2.x)
  Python-GnuPG allows easy and well-documented access to basic GnuPG
  functionality such as generating and managing keys, encrypting and
  decrypting data, signing and verifying messages.
@@ -24,7 +24,7 @@
 Package: python3-gnupg
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends}, gnupg
-Description: Python wrapper for the Gnu Privacy Guard (Python 3.x)
+Description: Python wrapper for the GNU Privacy Guard (Python 3.x)
  Python-GnuPG allows easy and well-documented access to basic GnuPG
  functionality such as generating and managing keys, encrypting and
  decrypting data, signing and verifying messages.

Modified: packages/python-gnupg/trunk/debian/copyright
===================================================================
--- packages/python-gnupg/trunk/debian/copyright	2015-02-05 10:39:22 UTC (rev 31773)
+++ packages/python-gnupg/trunk/debian/copyright	2015-02-05 16:59:13 UTC (rev 31774)
@@ -4,21 +4,21 @@
 Source: http://code.google.com/p/python-gnupg/
 
 Files: *
-Copyright: 2008-2011 by Vinay Sajip
-License: BSD
+Copyright: 2008-2014 by Vinay Sajip
+License: BSD-3-clause
 
 Files: gnupg.py
-Copyright: 2008-2011 by Vinay Sajip
+Copyright: 2008-2014 by Vinay Sajip
  2005 Steve Traugott
  2003 Richard Jones
-License: BSD and pycrypto
+License: BSD-3-clause and pycrypto
 
 Files: debian/*
-Copyright: 2012 Elena Grandi
-License: BSD
+Copyright: 2012-2014 Elena Grandi
+License: BSD-3-clause
 
-License: BSD
- Copyright (c) 2008-2011 by Vinay Sajip.
+License: BSD-3-clause
+ Copyright (c) 2008-2014 by Vinay Sajip.
  All rights reserved.
  .
  Redistribution and use in source and binary forms, with or without

Modified: packages/python-gnupg/trunk/debian/patches/series
===================================================================
--- packages/python-gnupg/trunk/debian/patches/series	2015-02-05 10:39:22 UTC (rev 31773)
+++ packages/python-gnupg/trunk/debian/patches/series	2015-02-05 16:59:13 UTC (rev 31774)
@@ -1 +1,2 @@
 skip_network_needing_test.patch
+skip_failing_test_because_of_missing_files.patch

Added: packages/python-gnupg/trunk/debian/patches/skip_failing_test_because_of_missing_files.patch
===================================================================
--- packages/python-gnupg/trunk/debian/patches/skip_failing_test_because_of_missing_files.patch	                        (rev 0)
+++ packages/python-gnupg/trunk/debian/patches/skip_failing_test_because_of_missing_files.patch	2015-02-05 16:59:13 UTC (rev 31774)
@@ -0,0 +1,16 @@
+Description: Skip a test that fails because of missing files in the tarball
+Forwarded: not-needed
+Author: Elena Grandi <elena.valhalla at gmail.com>
+Bug: https://bitbucket.org/vinay.sajip/python-gnupg/issue/29/missing-files-in-037-tarball-lead-to
+Index: python-gnupg-0.3.7/test_gnupg.py
+===================================================================
+--- python-gnupg-0.3.7.orig/test_gnupg.py	2015-02-05 17:17:26.964715396 +0100
++++ python-gnupg-0.3.7/test_gnupg.py	2015-02-05 17:18:33.338665221 +0100
+@@ -243,6 +243,7 @@
+         private_keys_2 = gpg.list_keys(secret=True)
+         self.assertEqual(private_keys_2, private_keys)
+ 
++    @unittest.skip('failing because of a lack of files in the tarball')
+     def test_scan_keys(self):
+         "Test that external key files can be scanned"
+         expected = set([

Modified: packages/python-gnupg/trunk/debian/patches/skip_network_needing_test.patch
===================================================================
--- packages/python-gnupg/trunk/debian/patches/skip_network_needing_test.patch	2015-02-05 10:39:22 UTC (rev 31773)
+++ packages/python-gnupg/trunk/debian/patches/skip_network_needing_test.patch	2015-02-05 16:59:13 UTC (rev 31774)
@@ -1,9 +1,11 @@
 Description: Skip tests that require internet access
 Forwarded: not-needed
 Author: Elena Grandi <elena.valhalla at gmail.com>
---- a/gnupg.py
-+++ b/gnupg.py
-@@ -948,8 +948,8 @@
+Index: python-gnupg-0.3.7/gnupg.py
+===================================================================
+--- python-gnupg-0.3.7.orig/gnupg.py	2014-12-07 19:46:19.000000000 +0100
++++ python-gnupg-0.3.7/gnupg.py	2015-02-05 12:06:00.292109216 +0100
+@@ -984,8 +984,8 @@
          >>> shutil.rmtree("keys")
          >>> gpg = GPG(gnupghome="keys")
          >>> os.chmod('keys', 0x1C0)
@@ -14,28 +16,30 @@
  
          """
          result = self.result_map['import'](self)
-@@ -1067,11 +1067,11 @@
+@@ -1121,11 +1121,11 @@
          >>> shutil.rmtree('keys')
          >>> gpg = GPG(gnupghome='keys')
          >>> os.chmod('keys', 0x1C0)
 -        >>> result = gpg.search_keys('<vinay_sajip at hotmail.com>')
--        >>> assert result
+-        >>> assert result, 'Failed using default keyserver'
 +        >>> result = gpg.search_keys('<vinay_sajip at hotmail.com>')  # doctest: +SKIP
-+        >>> assert result  # doctest: +SKIP
++        >>> assert result, 'Failed using default keyserver'  # doctest: +SKIP
          >>> keyserver = 'keyserver.ubuntu.com'
 -        >>> result = gpg.search_keys('<vinay_sajip at hotmail.com>', keyserver)
--        >>> assert result
+-        >>> assert result, 'Failed using keyserver.ubuntu.com'
 +        >>> result = gpg.search_keys('<vinay_sajip at hotmail.com>', keyserver)  # doctest: +SKIP
-+        >>> assert result  # doctest: +SKIP
++        >>> assert result, 'Failed using keyserver.ubuntu.com'  # doctest: +SKIP
  
          """
+         query = query.strip()
+Index: python-gnupg-0.3.7/test_gnupg.py
+===================================================================
+--- python-gnupg-0.3.7.orig/test_gnupg.py	2014-12-07 19:46:41.000000000 +0100
++++ python-gnupg-0.3.7/test_gnupg.py	2015-02-05 12:07:03.262063546 +0100
+@@ -547,6 +547,7 @@
+             shutil.rmtree(d)
+         logger.debug("test_filename_with_spaces ends")
  
---- a/test_gnupg.py
-+++ b/test_gnupg.py
-@@ -452,6 +452,7 @@
-                     os.remove(fn)
-         logger.debug("test_file_encryption_and_decryption ends")
- 
 +    @unittest.skip('requires network')
      def test_search_keys(self):
          "Test that searching for keys works"

Copied: packages/python-gnupg/trunk/debian/upstream/signing-key.asc (from rev 31773, packages/python-gnupg/trunk/debian/upstream-signing-key.pgp)
===================================================================
(Binary files differ)

Deleted: packages/python-gnupg/trunk/debian/upstream-signing-key.pgp
===================================================================
(Binary files differ)


