[Python-modules-commits] r6254 - in packages/python-gnutls/trunk/debian (6 files)

[morph-guest at users.alioth.debian.org]

    Date: Wednesday, August 20, 2008 @ 11:21:22
  Author: morph-guest
Revision: 6254

added dpatch stuff; added 10_bts490147_reintroduce_gnutls_openpgp_crt_get_id.dpatch to reintroduce gnutls_openpgp_crt_get_id function removed from new upstream code

Added:
  packages/python-gnutls/trunk/debian/patches/
  packages/python-gnutls/trunk/debian/patches/00list
  packages/python-gnutls/trunk/debian/patches/10_bts490147_reintroduce_gnutls_openpgp_crt_get_id.dpatch
Modified:
  packages/python-gnutls/trunk/debian/changelog
  packages/python-gnutls/trunk/debian/control
  packages/python-gnutls/trunk/debian/rules

Modified: packages/python-gnutls/trunk/debian/changelog
===================================================================
--- packages/python-gnutls/trunk/debian/changelog	2008-08-19 23:39:00 UTC (rev 6253)
+++ packages/python-gnutls/trunk/debian/changelog	2008-08-20 11:21:22 UTC (rev 6254)
@@ -1,3 +1,15 @@
+python-gnutls (1.1.6-2) UNRELEASED; urgency=low
+
+  * debian/control
+    - added dpatch build-dep
+  * debian/rules
+    - added cdbs dpatch rule inclusion
+  * debian/patches/10_bts490147_reintroduce_gnutls_openpgp_crt_get_id.dpatch
+    - added to reintroduce gnutls_openpgp_crt_get_id function (removed from new
+      upstream code); thanks to Juha Heinanen for the report; Closes: #490147
+
+ -- Sandro Tosi <matrixhasu at gmail.com>  Wed, 20 Aug 2008 13:18:38 +0200
+
 python-gnutls (1.1.6-1) unstable; urgency=low
 
   * New upstream version.

Modified: packages/python-gnutls/trunk/debian/control
===================================================================
--- packages/python-gnutls/trunk/debian/control	2008-08-19 23:39:00 UTC (rev 6253)
+++ packages/python-gnutls/trunk/debian/control	2008-08-20 11:21:22 UTC (rev 6254)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Bernd Zeimetz <bzed at debian.org>, Dan Pascu <dan at ag-projects.com>
-Build-Depends: cdbs (>= 0.4.47), debhelper (>= 5.0.42), python-all-dev (>= 2.4.4), python-support, libgnutls-dev (>= 2.2.2)
+Build-Depends: cdbs (>= 0.4.47), debhelper (>= 5.0.42), python-all-dev (>= 2.4.4), python-support, libgnutls-dev (>= 2.2.2), dpatch
 Standards-Version: 3.7.3
 Homepage: http://cheeseshop.python.org/pypi/python-gnutls
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-gnutls/trunk/

Added: packages/python-gnutls/trunk/debian/patches/00list
===================================================================
--- packages/python-gnutls/trunk/debian/patches/00list	                        (rev 0)
+++ packages/python-gnutls/trunk/debian/patches/00list	2008-08-20 11:21:22 UTC (rev 6254)
@@ -0,0 +1 @@
+10_bts490147_reintroduce_gnutls_openpgp_crt_get_id

Added: packages/python-gnutls/trunk/debian/patches/10_bts490147_reintroduce_gnutls_openpgp_crt_get_id.dpatch
===================================================================
--- packages/python-gnutls/trunk/debian/patches/10_bts490147_reintroduce_gnutls_openpgp_crt_get_id.dpatch	                        (rev 0)
+++ packages/python-gnutls/trunk/debian/patches/10_bts490147_reintroduce_gnutls_openpgp_crt_get_id.dpatch	2008-08-20 11:21:22 UTC (rev 6254)
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_bts490147_reintroduce_gnutls_openpgp_crt_get_id.dpatch by Sandro Tosi <matrixhasu at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: reintroduce gnutls_openpgp_crt_get_id function (removed from new upstream code)
+
+ at DPATCH@
+diff -urNad python-gnutls~/gnutls/library/functions.py python-gnutls/gnutls/library/functions.py
+--- python-gnutls~/gnutls/library/functions.py	2008-07-22 11:20:54.000000000 +0200
++++ python-gnutls/gnutls/library/functions.py	2008-08-20 13:18:29.760218517 +0200
+@@ -840,6 +840,9 @@
+ gnutls_openpgp_crt_get_key_id = _libraries['libgnutls.so.26'].gnutls_openpgp_crt_get_key_id
+ gnutls_openpgp_crt_get_key_id.restype = c_int
+ gnutls_openpgp_crt_get_key_id.argtypes = [gnutls_openpgp_crt_t, POINTER(c_ubyte)]
++gnutls_openpgp_crt_get_id = _libraries['libgnutls.so.26'].gnutls_openpgp_crt_get_key_id
++gnutls_openpgp_crt_get_id.restype = c_int
++gnutls_openpgp_crt_get_id.argtypes = [gnutls_openpgp_crt_t, POINTER(c_ubyte)]
+ gnutls_openpgp_crt_check_hostname = _libraries['libgnutls.so.26'].gnutls_openpgp_crt_check_hostname
+ gnutls_openpgp_crt_check_hostname.restype = c_int
+ gnutls_openpgp_crt_check_hostname.argtypes = [gnutls_openpgp_crt_t, STRING]
+@@ -1740,6 +1743,7 @@
+            'gnutls_openpgp_privkey_get_pk_algorithm',
+            'gnutls_certificate_set_x509_key_file',
+            'gnutls_openpgp_crt_get_key_id',
++	   'gnutls_openpgp_crt_get_id',
+            'gnutls_set_default_export_priority',
+            'gnutls_x509_crl_print', 'gnutls_rsa_export_get_pubkey',
+            'gnutls_x509_crq_set_key',


Property changes on: packages/python-gnutls/trunk/debian/patches/10_bts490147_reintroduce_gnutls_openpgp_crt_get_id.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/python-gnutls/trunk/debian/rules
===================================================================
--- packages/python-gnutls/trunk/debian/rules	2008-08-19 23:39:00 UTC (rev 6253)
+++ packages/python-gnutls/trunk/debian/rules	2008-08-20 11:21:22 UTC (rev 6254)
@@ -5,8 +5,8 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
 
-
 clean::
 	rm -rf dist MANIFEST