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

[dktrkranz at users.alioth.debian.org]

    Date: Monday, March 18, 2013 @ 21:39:20
  Author: dktrkranz
Revision: 23723

Refresh patches for new upstream release

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	2013-03-18 21:31:13 UTC (rev 23722)
+++ packages/python-httplib2/trunk/debian/changelog	2013-03-18 21:39:20 UTC (rev 23723)
@@ -1,6 +1,8 @@
 python-httplib2 (0.8.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/patches/use_system_cacerts.patch:
+    - Refresh for new upstream release.
 
  -- Luca Falavigna <dktrkranz at debian.org>  Mon, 18 Mar 2013 22:30:43 +0100
 

Modified: packages/python-httplib2/trunk/debian/patches/use_system_cacerts.patch
===================================================================
--- packages/python-httplib2/trunk/debian/patches/use_system_cacerts.patch	2013-03-18 21:31:13 UTC (rev 23722)
+++ packages/python-httplib2/trunk/debian/patches/use_system_cacerts.patch	2013-03-18 21:39:20 UTC (rev 23723)
@@ -3,27 +3,27 @@
 Forwarded: not-needed
 Bug-Ubuntu: https://launchpad.net/bugs/882027
 
-Index: httplib2-0.7.7/python2/httplib2/__init__.py
+Index: b/python2/httplib2/__init__.py
 ===================================================================
---- 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
- 
--# Default CA certificates file bundled with httplib2.
--CA_CERTS = os.path.join(
+--- a/python2/httplib2/__init__.py	2013-03-18 22:37:43.423868573 +0100
++++ b/python2/httplib2/__init__.py	2013-03-18 22:37:43.419868572 +0100
+@@ -190,9 +190,8 @@
+     import ca_certs_locater
+     CA_CERTS = ca_certs_locater.get()
+ except ImportError:
+-    # Default CA certificates file bundled with httplib2.
+-    CA_CERTS = os.path.join(
 -        os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
-+# Use system CA certificates
-+CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
++    # Use system CA certificates
++    CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
  
  # 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: httplib2-0.7.7/python3/httplib2/__init__.py
+Index: b/python3/httplib2/__init__.py
 ===================================================================
---- 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 @@
+--- a/python3/httplib2/__init__.py	2013-03-18 22:37:43.423868573 +0100
++++ b/python3/httplib2/__init__.py	2013-03-18 22:37:43.419868572 +0100
+@@ -123,9 +123,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,10 +35,10 @@
  
  def _get_end2end_headers(response):
      hopbyhop = list(HOP_BY_HOP)
-Index: httplib2-0.7.7/setup.py
+Index: b/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
+--- a/setup.py	2013-03-18 22:37:43.423868573 +0100
++++ b/setup.py	2013-03-18 22:37:43.419868572 +0100
 @@ -62,7 +62,6 @@
          """,
          package_dir=pkgdir,