[Python-modules-commits] r14167 - in packages/gnupginterface/trunk/debian (7 files)

[jwilk at users.alioth.debian.org]

    Date: Sunday, August 8, 2010 @ 12:51:09
  Author: jwilk
Revision: 14167

Integrate NMU 0.3.2-9.1.

Added:
  packages/gnupginterface/trunk/debian/patches/
  packages/gnupginterface/trunk/debian/patches/01_print_exit_status_correctly.patch
  packages/gnupginterface/trunk/debian/patches/02_setup_license.patch
  packages/gnupginterface/trunk/debian/pycompat
  packages/gnupginterface/trunk/debian/pyversions
Modified:
  packages/gnupginterface/trunk/debian/changelog
  packages/gnupginterface/trunk/debian/control

Modified: packages/gnupginterface/trunk/debian/changelog
===================================================================
--- packages/gnupginterface/trunk/debian/changelog	2010-08-08 12:47:48 UTC (rev 14166)
+++ packages/gnupginterface/trunk/debian/changelog	2010-08-08 12:51:09 UTC (rev 14167)
@@ -1,3 +1,28 @@
+gnupginterface (0.3.2-9.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Merge in Ubuntu patches to address exit status bug, thanks!
+  * Move setup.py patch from diff.gz to patch system.
+
+ -- Thijs Kinkhorst <thijs at debian.org>  Fri, 18 Dec 2009 13:34:48 +0100
+
+gnupginterface (0.3.2-9ubuntu2) jaunty; urgency=low
+
+  * Add 01__print_exit_status_correctly.patch (Closes: #509415, LP: #333057)
+    Thanks to Kenneth Loafman for the initial patch.
+
+ -- Brian Murray <brian at ubuntu.com>  Tue, 31 Mar 2009 14:48:28 -0700
+
+gnupginterface (0.3.2-9ubuntu1) gutsy; urgency=low
+
+  * Rebuild to remove the .pyc file (LP: #36733)
+  * debian/control:
+    + Update to current python-support usage.
+    + Modify Maintainer value to match DebianMaintainerField spec.
+  * setup.py: Rename the licence field to license as suggested by the warning.
+
+ -- Michael Bienia <geser at ubuntu.com>  Fri, 24 Aug 2007 01:47:09 +0200
+
 gnupginterface (0.3.2-9) unstable; urgency=low
   
   [ Piotr Ozarowski ]

Modified: packages/gnupginterface/trunk/debian/control
===================================================================
--- packages/gnupginterface/trunk/debian/control	2010-08-08 12:47:48 UTC (rev 14166)
+++ packages/gnupginterface/trunk/debian/control	2010-08-08 12:51:09 UTC (rev 14167)
@@ -3,15 +3,14 @@
 Priority: optional
 Maintainer: Guilherme de S. Pastore <gpastore at colband.com.br>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>, Gustavo Franco <stratus at debian.org> 
-Build-Depends: cdbs (>= 0.4.41), debhelper (>= 5.0.37.1)
-Build-Depends-Indep: python, python-dev, python-support (>= 0.2.3)
-XS-Python-Version: all
+Build-Depends: cdbs (>= 0.4.41), debhelper (>= 5.0.37.1), python
+Build-Depends-Indep: python-support (>= 0.6)
 Standards-Version: 3.7.2
 
 Package: python-gnupginterface
 Architecture: all
 Depends: ${python:Depends}, gnupg (>= 1.2.1)
-XB-Python-Version: ${python:Versions}
+Provides: ${python:Provides}
 Description: Python interface to GnuPG (GPG)
  GnuPGInterface is a Python module to interface with GnuPG.
  It concentrates on interacting with GnuPG via filehandles,

Added: packages/gnupginterface/trunk/debian/patches/01_print_exit_status_correctly.patch
===================================================================
--- packages/gnupginterface/trunk/debian/patches/01_print_exit_status_correctly.patch	                        (rev 0)
+++ packages/gnupginterface/trunk/debian/patches/01_print_exit_status_correctly.patch	2010-08-08 12:51:09 UTC (rev 14167)
@@ -0,0 +1,16 @@
+Description: correctly report error codes.
+Ubuntu: https://bugs.launchpad.net/bugs/333057
+Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=509415
+
+diff -Nur -x '*.orig' -x '*~' gnupginterface-0.3.2/GnuPGInterface.py gnupginterface-0.3.2.new/GnuPGInterface.py
+--- gnupginterface-0.3.2/GnuPGInterface.py	2002-01-11 12:22:04.000000000 -0800
++++ gnupginterface-0.3.2.new/GnuPGInterface.py	2009-03-31 14:43:06.000000000 -0700
+@@ -636,7 +636,7 @@
+         
+         e = os.waitpid(self.pid, 0)[1]
+         if e != 0:
+-            raise IOError, "GnuPG exited non-zero, with code %d" % (e << 8)
++            raise IOError, "GnuPG exited non-zero, with code %d" % (e >> 8)
+ 
+ def _run_doctests():
+     import doctest, GnuPGInterface

Added: packages/gnupginterface/trunk/debian/patches/02_setup_license.patch
===================================================================
--- packages/gnupginterface/trunk/debian/patches/02_setup_license.patch	                        (rev 0)
+++ packages/gnupginterface/trunk/debian/patches/02_setup_license.patch	2010-08-08 12:51:09 UTC (rev 14167)
@@ -0,0 +1,13 @@
+Description: correct syntax error in license.
+
+--- gnupginterface-0.3.2/setup.py.orig	2009-12-18 13:38:31.577852029 +0100
++++ gnupginterface-0.3.2/setup.py	2009-12-18 13:27:38.729859000 +0100
+@@ -14,7 +14,7 @@
+ 		      long_description = long_description,
+                       author = 'Frank J. Tobin',
+                       author_email = 'ftobin at users.sourceforge.net',
+-		      licence = 'LGPL',
++		      license = 'LGPL',
+ 		      platforms = 'POSIX',
+ 		      keywords = 'GnuPG gpg',
+                       url = 'http://py-gnupg.sourceforge.net/',

Added: packages/gnupginterface/trunk/debian/pycompat
===================================================================
--- packages/gnupginterface/trunk/debian/pycompat	                        (rev 0)
+++ packages/gnupginterface/trunk/debian/pycompat	2010-08-08 12:51:09 UTC (rev 14167)
@@ -0,0 +1 @@
+2

Added: packages/gnupginterface/trunk/debian/pyversions
===================================================================
--- packages/gnupginterface/trunk/debian/pyversions	                        (rev 0)
+++ packages/gnupginterface/trunk/debian/pyversions	2010-08-08 12:51:09 UTC (rev 14167)
@@ -0,0 +1 @@
+-