[Python-modules-commits] r23053 - in packages/python-httplib2/trunk/debian (2 files)

[dktrkranz at users.alioth.debian.org]

    Date: Sunday, November 25, 2012 @ 13:19:39
  Author: dktrkranz
Revision: 23053

Do not ship bundled certificates

Modified:
  packages/python-httplib2/trunk/debian/changelog
  packages/python-httplib2/trunk/debian/patches/use_system_cacerts.patch

Modified: packages/python-httplib2/trunk/debian/changelog
===================================================================
--- packages/python-httplib2/trunk/debian/changelog	2012-11-25 13:06:56 UTC (rev 23052)
+++ packages/python-httplib2/trunk/debian/changelog	2012-11-25 13:19:39 UTC (rev 23053)
@@ -1,6 +1,9 @@
 python-httplib2 (0.7.7-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/patches/use_system_cacerts.patch:
+    - Do not ship bundled certificates, package already uses system ones,
+      provided by ca-certificates.
 
  -- Luca Falavigna <dktrkranz at debian.org>  Sun, 25 Nov 2012 14:06:26 +0100
 

Modified: packages/python-httplib2/trunk/debian/patches/use_system_cacerts.patch
===================================================================
--- packages/python-httplib2/trunk/debian/patches/use_system_cacerts.patch	2012-11-25 13:06:56 UTC (rev 23052)
+++ packages/python-httplib2/trunk/debian/patches/use_system_cacerts.patch	2012-11-25 13:19:39 UTC (rev 23053)
@@ -1,12 +1,12 @@
 Description: Use system ca certificates, not the bundled ones
 Author: Marc Deslauriers <marc.deslauriers at canonical.com>
-Forwarded: No, distro-specific
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-httplib2/+bug/882027
+Forwarded: not-needed
+Bug-Ubuntu: https://launchpad.net/bugs/882027
 
-Index: python-httplib2-0.7.2/python2/httplib2/__init__.py
+Index: httplib2-0.7.7/python2/httplib2/__init__.py
 ===================================================================
---- python-httplib2-0.7.2.orig/python2/httplib2/__init__.py	2011-11-14 12:37:38.000000000 -0500
-+++ python-httplib2-0.7.2/python2/httplib2/__init__.py	2011-12-15 14:21:42.061709438 -0500
+--- httplib2-0.7.7.orig/python2/httplib2/__init__.py	2012-11-16 14:20:22.000000000 +0100
++++ httplib2-0.7.7/python2/httplib2/__init__.py	2012-11-25 14:13:47.843351377 +0100
 @@ -182,9 +182,8 @@
  # requesting that URI again.
  DEFAULT_MAX_REDIRECTS = 5
@@ -19,10 +19,10 @@
  
  # Which headers are hop-by-hop headers by default
  HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
-Index: python-httplib2-0.7.2/python3/httplib2/__init__.py
+Index: httplib2-0.7.7/python3/httplib2/__init__.py
 ===================================================================
---- python-httplib2-0.7.2.orig/python3/httplib2/__init__.py	2011-11-14 12:37:38.000000000 -0500
-+++ python-httplib2-0.7.2/python3/httplib2/__init__.py	2011-12-15 14:22:02.937709977 -0500
+--- httplib2-0.7.7.orig/python3/httplib2/__init__.py	2012-11-16 14:20:22.000000000 +0100
++++ httplib2-0.7.7/python3/httplib2/__init__.py	2012-11-25 14:13:47.843351377 +0100
 @@ -122,9 +122,8 @@
  # Which headers are hop-by-hop headers by default
  HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
@@ -35,3 +35,15 @@
  
  def _get_end2end_headers(response):
      hopbyhop = list(HOP_BY_HOP)
+Index: httplib2-0.7.7/setup.py
+===================================================================
+--- httplib2-0.7.7.orig/setup.py	2012-11-25 14:15:25.559354369 +0100
++++ httplib2-0.7.7/setup.py	2012-11-25 14:15:35.167354663 +0100
+@@ -62,7 +62,6 @@
+         """,
+         package_dir=pkgdir,
+         packages=['httplib2'],
+-        package_data={'httplib2': ['*.txt']},
+         classifiers=[
+         'Development Status :: 4 - Beta',
+         'Environment :: Web Environment',