[Python-modules-commits] r23726 - in packages/python-httplib2/tags (7 files)

dktrkranz at users.alioth.debian.org dktrkranz at users.alioth.debian.org
Mon Mar 18 21:50:01 UTC 2013


    Date: Monday, March 18, 2013 @ 21:49:59
  Author: dktrkranz
Revision: 23726

[svn-buildpackage] Tagging python-httplib2 0.8-1

Added:
  packages/python-httplib2/tags/0.8-1/
  packages/python-httplib2/tags/0.8-1/debian/changelog
    (from rev 23725, packages/python-httplib2/trunk/debian/changelog)
  packages/python-httplib2/tags/0.8-1/debian/control
    (from rev 23724, packages/python-httplib2/trunk/debian/control)
  packages/python-httplib2/tags/0.8-1/debian/patches/use_system_cacerts.patch
    (from rev 23723, packages/python-httplib2/trunk/debian/patches/use_system_cacerts.patch)
Deleted:
  packages/python-httplib2/tags/0.8-1/debian/changelog
  packages/python-httplib2/tags/0.8-1/debian/control
  packages/python-httplib2/tags/0.8-1/debian/patches/use_system_cacerts.patch

Deleted: packages/python-httplib2/tags/0.8-1/debian/changelog
===================================================================
--- packages/python-httplib2/trunk/debian/changelog	2013-03-18 20:57:00 UTC (rev 23721)
+++ packages/python-httplib2/tags/0.8-1/debian/changelog	2013-03-18 21:49:59 UTC (rev 23726)
@@ -1,203 +0,0 @@
-python-httplib2 (0.7.7-1) experimental; 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.
-  * debian/rules:
-    - Remove stale egg-info created during build.
-
- -- Luca Falavigna <dktrkranz at debian.org>  Sun, 25 Nov 2012 15:24:29 +0100
-
-python-httplib2 (0.7.6-1) experimental; urgency=low
-
-  * New upstream release.
-  * debian/control:
-    - Bump Standards-Version to 3.9.4, no changes required.
-
- -- Luca Falavigna <dktrkranz at debian.org>  Sat, 10 Nov 2012 10:57:02 +0100
-
-python-httplib2 (0.7.5-1) experimental; urgency=low
-
-  * New upstream release.
-  * debian/patches/egg-info.patch:
-    - Removed, no longer needed.
-  * debian/patches/use_system_cacerts.patch:
-    - Refresh for new upstream release.
-
- -- Luca Falavigna <dktrkranz at debian.org>  Sat, 08 Sep 2012 11:56:49 +0200
-
-python-httplib2 (0.7.4-2) unstable; urgency=low
-
-  * debian/patches/egg-info.patch:
-    - Complete egg-info data with missing details.
-  * debian/compat:
-    - Bump compatibility level to 9.
-  * debian/rules:
-    - Delete build directory during clean phase (Closes: #671108).
-
- -- Luca Falavigna <dktrkranz at debian.org>  Sun, 27 May 2012 12:07:29 +0200
-
-python-httplib2 (0.7.4-1) unstable; urgency=low
-
-  * New upstream release.
-  * debian/patches/use_system_cacerts.patch:
-    - Refresh for new upstream release.
-  * debian/watch:
-    - Use code.google.com to watch for upstream releases.
-
- -- Luca Falavigna <dktrkranz at debian.org>  Fri, 16 Mar 2012 22:19:04 +0100
-
-python-httplib2 (0.7.2-2) unstable; urgency=low
-
-  * debian/patches/use_system_cacerts.patch:
-    - Use system ca certificates, not the bundled ones, to always use
-      the most recent ones, thanks to Marc Deslauriers (Closes: #652105).
-  * debian/control:
-    - Depend on ca-certificates.
-    - Bump Standards-Version to 3.9.3.
-  * debian/copyright:
-    - Format now points to copyright-format site.
-
- -- Luca Falavigna <dktrkranz at debian.org>  Thu, 23 Feb 2012 21:42:54 +0100
-
-python-httplib2 (0.7.2-1) unstable; urgency=low
-
-  * New upstream release.
-  * debian/patches/ssl-validation.patch:
-    - Removed, applied upstream.
-  * debian/patches/godaddy-certificate.patch:
-    - Removed, applied upstream.
-
- -- Luca Falavigna <dktrkranz at debian.org>  Mon, 14 Nov 2011 21:07:54 +0100
-
-python-httplib2 (0.7.1-2) unstable; urgency=low
-
-  * debian/patches/ssl-validation.patch:
-    - Cherry-pick patch from upstream hg to fix incorrect checks for
-      SSL certificate domain names.
-
- -- Luca Falavigna <dktrkranz at debian.org>  Tue, 13 Sep 2011 20:32:44 +0200
-
-python-httplib2 (0.7.1-1) unstable; urgency=low
-
-  * New upstream release.
-    - Install cacerts.txt file (Closes: #631841).
-  * debian/patches/godaddy-certificate.patch:
-    - Cherry-pick GoDaddy root certificate from upstream to fix access
-      to Launchpad services (Closes: #631164).
-
- -- Luca Falavigna <dktrkranz at debian.org>  Tue, 28 Jun 2011 21:53:34 +0200
-
-python-httplib2 (0.7.0-1) unstable; urgency=low
-
-  * New upstream release.
-    - Do not hardcode $Rev$ in the User-Agent field (Closes: #609576).
-  * debian/copyright:
-    - Update copyright information.
-
- -- Luca Falavigna <dktrkranz at debian.org>  Mon, 13 Jun 2011 23:47:18 +0200
-
-python-httplib2 (0.6.0-5) unstable; urgency=low
-
-  * Python transition:
-    - Add support for python2.7
-    - Drop support for python2.5
-  * debian/control:
-    - Bump Standards-Version to 3.9.2, no changes required.
-
- -- Luca Falavigna <dktrkranz at debian.org>  Sat, 16 Apr 2011 15:15:29 +0200
-
-python-httplib2 (0.6.0-4) unstable; urgency=low
-
-  * Team upload.
-
-  [ Luca Falavigna ]
-  * debian/control:
-    - Add Breaks: ${python:Breaks} to generate correct dependencies, this
-      also makes lintian override useless now.
-
-  [ Piotr Ożarowski ]
-  * Bump minimum required python3-all version to 3.1.2-10
-    (and rebuild for /usr/lib/python3/dist-packages transtion)
-
- -- Piotr Ożarowski <piotr at debian.org>  Sun, 26 Sep 2010 22:10:33 +0200
-
-python-httplib2 (0.6.0-3) unstable; urgency=medium
-
-  * debian/control:
-    - Depend on ${python3:Depends} for python3-httplib2 to generate
-      correct dependencies for Python 3.X (Closes: #591956).
-    - Bump Standards-Version to 3.9.1, no changes required.
-  * debian/python-httplib2.lintian-overrides:
-    - Override old-versioned-python-dependency, needs fixing in Lintian.
-
- -- Luca Falavigna <dktrkranz at debian.org>  Sat, 07 Aug 2010 15:39:46 +0200
-
-python-httplib2 (0.6.0-2) unstable; urgency=low
-
-  * Switch to format 3.0 (quilt).
-  * Switch to dh_python2.
-  * debian/control:
-    - Add python3-httplib2 package.
-    - Bump Standards-Version to 3.8.4, no changes required.
-  * debian/rules:
-    - Install files for python3-httplib2 package.
-  * debian/watch: 
-    - Use googlecode.debian.net provider.
-
- -- Luca Falavigna <dktrkranz at debian.org>  Sun, 27 Jun 2010 10:59:40 +0200
-
-python-httplib2 (0.6.0-1) unstable; urgency=low
-
-  * New upstream release.
-  * Add new copyright holders.
-
- -- Luca Falavigna <dktrkranz at debian.org>  Sun, 03 Jan 2010 17:12:21 +0100
-
-python-httplib2 (0.5.0-1) unstable; urgency=low
-
-  * New upstream release (Closes: #461200) (LP: #373589).
-  * debian/compat:
-    - Bump compat level to 7.
-  * debian/control:
-    - New Maintainer (Closes: #542786).
-    - Add Debian Python Modules Team to Uploaders.
-    - Switch to python section to match override.
-    - Remove cdbs from Build-Depends.
-    - Bump debhelper required version to 7.2.18.
-    - Do not build-depend on python-all-dev, depend on python instead.
-    - Move python-support to Build-Depends-Indep.
-    - Bump Standards-Version to 3.8.3.
-    - Add Homepage field.
-    - Add XS-Python-Version field.
-    - Add Vcs-* fields to store Debian packaging.
-    - Set Architecture to all.
-    - Remove ${shlibs:Depends} from Depends.
-    - Fix spelling errors in package description.
-  * debian/copyright:
-    - Adjust copyright informations.
-  * debian/README.Debian:
-    - Removed, already provided by upstream README.
-  * debian/pycompat:
-    - Removed, useless.
-  * debian/rules:
-    - Switch to debhelper 7.
-  * debian/watch:
-    - Provide a watch file.
-
- -- Luca Falavigna <dktrkranz at debian.org>  Wed, 26 Aug 2009 20:16:16 +0200
-
-python-httplib2 (0.2.0-2) unstable; urgency=low
-
-  * reformat description closes: #392116
-  * add missing-build-dependency python-all-dev
-
- -- Matthias Jahn <jahn.matthias at freenet.de>  Wed, 11 Oct 2006 08:39:48 +0200
-
-python-httplib2 (0.2.0-1) unstable; urgency=low
-
-  * Initial upload. closes: #386944
-
- -- Matthias Jahn <jahn.matthias at freenet.de>  Mon, 31 Jul 2006 11:24:22 +0200
-

Copied: packages/python-httplib2/tags/0.8-1/debian/changelog (from rev 23725, packages/python-httplib2/trunk/debian/changelog)
===================================================================
--- packages/python-httplib2/tags/0.8-1/debian/changelog	                        (rev 0)
+++ packages/python-httplib2/tags/0.8-1/debian/changelog	2013-03-18 21:49:59 UTC (rev 23726)
@@ -0,0 +1,211 @@
+python-httplib2 (0.8-1) experimental; 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:41:38 +0100
+
+python-httplib2 (0.7.7-1) experimental; 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.
+  * debian/rules:
+    - Remove stale egg-info created during build.
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Sun, 25 Nov 2012 15:24:29 +0100
+
+python-httplib2 (0.7.6-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    - Bump Standards-Version to 3.9.4, no changes required.
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Sat, 10 Nov 2012 10:57:02 +0100
+
+python-httplib2 (0.7.5-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/patches/egg-info.patch:
+    - Removed, no longer needed.
+  * debian/patches/use_system_cacerts.patch:
+    - Refresh for new upstream release.
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Sat, 08 Sep 2012 11:56:49 +0200
+
+python-httplib2 (0.7.4-2) unstable; urgency=low
+
+  * debian/patches/egg-info.patch:
+    - Complete egg-info data with missing details.
+  * debian/compat:
+    - Bump compatibility level to 9.
+  * debian/rules:
+    - Delete build directory during clean phase (Closes: #671108).
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Sun, 27 May 2012 12:07:29 +0200
+
+python-httplib2 (0.7.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/use_system_cacerts.patch:
+    - Refresh for new upstream release.
+  * debian/watch:
+    - Use code.google.com to watch for upstream releases.
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Fri, 16 Mar 2012 22:19:04 +0100
+
+python-httplib2 (0.7.2-2) unstable; urgency=low
+
+  * debian/patches/use_system_cacerts.patch:
+    - Use system ca certificates, not the bundled ones, to always use
+      the most recent ones, thanks to Marc Deslauriers (Closes: #652105).
+  * debian/control:
+    - Depend on ca-certificates.
+    - Bump Standards-Version to 3.9.3.
+  * debian/copyright:
+    - Format now points to copyright-format site.
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Thu, 23 Feb 2012 21:42:54 +0100
+
+python-httplib2 (0.7.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/ssl-validation.patch:
+    - Removed, applied upstream.
+  * debian/patches/godaddy-certificate.patch:
+    - Removed, applied upstream.
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Mon, 14 Nov 2011 21:07:54 +0100
+
+python-httplib2 (0.7.1-2) unstable; urgency=low
+
+  * debian/patches/ssl-validation.patch:
+    - Cherry-pick patch from upstream hg to fix incorrect checks for
+      SSL certificate domain names.
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Tue, 13 Sep 2011 20:32:44 +0200
+
+python-httplib2 (0.7.1-1) unstable; urgency=low
+
+  * New upstream release.
+    - Install cacerts.txt file (Closes: #631841).
+  * debian/patches/godaddy-certificate.patch:
+    - Cherry-pick GoDaddy root certificate from upstream to fix access
+      to Launchpad services (Closes: #631164).
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Tue, 28 Jun 2011 21:53:34 +0200
+
+python-httplib2 (0.7.0-1) unstable; urgency=low
+
+  * New upstream release.
+    - Do not hardcode $Rev$ in the User-Agent field (Closes: #609576).
+  * debian/copyright:
+    - Update copyright information.
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Mon, 13 Jun 2011 23:47:18 +0200
+
+python-httplib2 (0.6.0-5) unstable; urgency=low
+
+  * Python transition:
+    - Add support for python2.7
+    - Drop support for python2.5
+  * debian/control:
+    - Bump Standards-Version to 3.9.2, no changes required.
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Sat, 16 Apr 2011 15:15:29 +0200
+
+python-httplib2 (0.6.0-4) unstable; urgency=low
+
+  * Team upload.
+
+  [ Luca Falavigna ]
+  * debian/control:
+    - Add Breaks: ${python:Breaks} to generate correct dependencies, this
+      also makes lintian override useless now.
+
+  [ Piotr Ożarowski ]
+  * Bump minimum required python3-all version to 3.1.2-10
+    (and rebuild for /usr/lib/python3/dist-packages transtion)
+
+ -- Piotr Ożarowski <piotr at debian.org>  Sun, 26 Sep 2010 22:10:33 +0200
+
+python-httplib2 (0.6.0-3) unstable; urgency=medium
+
+  * debian/control:
+    - Depend on ${python3:Depends} for python3-httplib2 to generate
+      correct dependencies for Python 3.X (Closes: #591956).
+    - Bump Standards-Version to 3.9.1, no changes required.
+  * debian/python-httplib2.lintian-overrides:
+    - Override old-versioned-python-dependency, needs fixing in Lintian.
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Sat, 07 Aug 2010 15:39:46 +0200
+
+python-httplib2 (0.6.0-2) unstable; urgency=low
+
+  * Switch to format 3.0 (quilt).
+  * Switch to dh_python2.
+  * debian/control:
+    - Add python3-httplib2 package.
+    - Bump Standards-Version to 3.8.4, no changes required.
+  * debian/rules:
+    - Install files for python3-httplib2 package.
+  * debian/watch: 
+    - Use googlecode.debian.net provider.
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Sun, 27 Jun 2010 10:59:40 +0200
+
+python-httplib2 (0.6.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add new copyright holders.
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Sun, 03 Jan 2010 17:12:21 +0100
+
+python-httplib2 (0.5.0-1) unstable; urgency=low
+
+  * New upstream release (Closes: #461200) (LP: #373589).
+  * debian/compat:
+    - Bump compat level to 7.
+  * debian/control:
+    - New Maintainer (Closes: #542786).
+    - Add Debian Python Modules Team to Uploaders.
+    - Switch to python section to match override.
+    - Remove cdbs from Build-Depends.
+    - Bump debhelper required version to 7.2.18.
+    - Do not build-depend on python-all-dev, depend on python instead.
+    - Move python-support to Build-Depends-Indep.
+    - Bump Standards-Version to 3.8.3.
+    - Add Homepage field.
+    - Add XS-Python-Version field.
+    - Add Vcs-* fields to store Debian packaging.
+    - Set Architecture to all.
+    - Remove ${shlibs:Depends} from Depends.
+    - Fix spelling errors in package description.
+  * debian/copyright:
+    - Adjust copyright informations.
+  * debian/README.Debian:
+    - Removed, already provided by upstream README.
+  * debian/pycompat:
+    - Removed, useless.
+  * debian/rules:
+    - Switch to debhelper 7.
+  * debian/watch:
+    - Provide a watch file.
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Wed, 26 Aug 2009 20:16:16 +0200
+
+python-httplib2 (0.2.0-2) unstable; urgency=low
+
+  * reformat description closes: #392116
+  * add missing-build-dependency python-all-dev
+
+ -- Matthias Jahn <jahn.matthias at freenet.de>  Wed, 11 Oct 2006 08:39:48 +0200
+
+python-httplib2 (0.2.0-1) unstable; urgency=low
+
+  * Initial upload. closes: #386944
+
+ -- Matthias Jahn <jahn.matthias at freenet.de>  Mon, 31 Jul 2006 11:24:22 +0200
+

Deleted: packages/python-httplib2/tags/0.8-1/debian/control
===================================================================
--- packages/python-httplib2/trunk/debian/control	2013-03-18 20:57:00 UTC (rev 23721)
+++ packages/python-httplib2/tags/0.8-1/debian/control	2013-03-18 21:49:59 UTC (rev 23726)
@@ -1,45 +0,0 @@
-Source: python-httplib2
-Section: python
-Priority: optional
-Maintainer: Luca Falavigna <dktrkranz at debian.org>
-Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 9), python-all (>= 2.6.6-3~), python3-all (>= 3.1.2-10)
-Standards-Version: 3.9.4
-X-Python-Version: >= 2.4
-Homepage: http://code.google.com/p/httplib2/
-Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-httplib2/trunk/
-Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-httplib2/trunk/
-
-Package: python-httplib2
-Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, ca-certificates
-Description: comprehensive HTTP client library written for Python
- httplib2.py supports many features left out of other HTTP libraries.
-  * HTTP and HTTPS
-  * Keep-Alive
-  * Authentication
-  * Caching
-  * All Methods
-  * Redirects
-  * Compression
-  * Lost update support
-  * Unit Tested
- .
- This package provides module for python2 series.
-
-Package: python3-httplib2
-Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}, ca-certificates
-Description: comprehensive HTTP client library written for Python3
- httplib2.py supports many features left out of other HTTP libraries.
-  * HTTP and HTTPS
-  * Keep-Alive
-  * Authentication
-  * Caching
-  * All Methods
-  * Redirects
-  * Compression
-  * Lost update support
-  * Unit Tested
- .
- This package provides module for python3 series.

Copied: packages/python-httplib2/tags/0.8-1/debian/control (from rev 23724, packages/python-httplib2/trunk/debian/control)
===================================================================
--- packages/python-httplib2/tags/0.8-1/debian/control	                        (rev 0)
+++ packages/python-httplib2/tags/0.8-1/debian/control	2013-03-18 21:49:59 UTC (rev 23726)
@@ -0,0 +1,51 @@
+Source: python-httplib2
+Section: python
+Priority: optional
+Maintainer: Luca Falavigna <dktrkranz at debian.org>
+Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Build-Depends: debhelper (>= 9),
+               python-all (>= 2.6.6-3~),
+               python3-all (>= 3.1.2-10)
+Standards-Version: 3.9.4
+X-Python-Version: >= 2.4
+Homepage: http://code.google.com/p/httplib2/
+Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-httplib2/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewsvn/python-modules/packages/python-httplib2/trunk/
+
+Package: python-httplib2
+Architecture: all
+Depends: ${python:Depends},
+         ${misc:Depends},
+         ca-certificates
+Description: comprehensive HTTP client library written for Python
+ httplib2.py supports many features left out of other HTTP libraries.
+  * HTTP and HTTPS
+  * Keep-Alive
+  * Authentication
+  * Caching
+  * All Methods
+  * Redirects
+  * Compression
+  * Lost update support
+  * Unit Tested
+ .
+ This package provides module for python2 series.
+
+Package: python3-httplib2
+Architecture: all
+Depends: ${python3:Depends},
+         ${misc:Depends},
+         ca-certificates
+Description: comprehensive HTTP client library written for Python3
+ httplib2.py supports many features left out of other HTTP libraries.
+  * HTTP and HTTPS
+  * Keep-Alive
+  * Authentication
+  * Caching
+  * All Methods
+  * Redirects
+  * Compression
+  * Lost update support
+  * Unit Tested
+ .
+ This package provides module for python3 series.

Deleted: packages/python-httplib2/tags/0.8-1/debian/patches/use_system_cacerts.patch
===================================================================
--- packages/python-httplib2/trunk/debian/patches/use_system_cacerts.patch	2013-03-18 20:57:00 UTC (rev 23721)
+++ packages/python-httplib2/tags/0.8-1/debian/patches/use_system_cacerts.patch	2013-03-18 21:49:59 UTC (rev 23726)
@@ -1,49 +0,0 @@
-Description: Use system ca certificates, not the bundled ones
-Author: Marc Deslauriers <marc.deslauriers at canonical.com>
-Forwarded: not-needed
-Bug-Ubuntu: https://launchpad.net/bugs/882027
-
-Index: httplib2-0.7.7/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(
--        os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
-+# 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
-===================================================================
---- 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']
- 
--# 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"
- 
- 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',

Copied: packages/python-httplib2/tags/0.8-1/debian/patches/use_system_cacerts.patch (from rev 23723, packages/python-httplib2/trunk/debian/patches/use_system_cacerts.patch)
===================================================================
--- packages/python-httplib2/tags/0.8-1/debian/patches/use_system_cacerts.patch	                        (rev 0)
+++ packages/python-httplib2/tags/0.8-1/debian/patches/use_system_cacerts.patch	2013-03-18 21:49:59 UTC (rev 23726)
@@ -0,0 +1,49 @@
+Description: Use system ca certificates, not the bundled ones
+Author: Marc Deslauriers <marc.deslauriers at canonical.com>
+Forwarded: not-needed
+Bug-Ubuntu: https://launchpad.net/bugs/882027
+
+Index: b/python2/httplib2/__init__.py
+===================================================================
+--- 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"
+ 
+ # 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: b/python3/httplib2/__init__.py
+===================================================================
+--- 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']
+ 
+-# 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"
+ 
+ def _get_end2end_headers(response):
+     hopbyhop = list(HOP_BY_HOP)
+Index: b/setup.py
+===================================================================
+--- 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,
+         packages=['httplib2'],
+-        package_data={'httplib2': ['*.txt']},
+         classifiers=[
+         'Development Status :: 4 - Beta',
+         'Environment :: Web Environment',




More information about the Python-modules-commits mailing list