aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2015-05-04 02:00:18 +0000
committerDaniele Tricoli <eriol@mornie.org>2015-05-04 02:00:18 +0000
commit1ae939425e29eb3d645cfda82a8419c5e462d019 (patch)
tree591f89177cf96a5c19f422a72e4b2364c8fad0dc
parent68d4ebe1eae74c66a6c12eedbd359fc00c9e6eec (diff)
downloadpython-requests-1ae939425e29eb3d645cfda82a8419c5e462d019.tar
python-requests-1ae939425e29eb3d645cfda82a8419c5e462d019.tar.gz
Refresh and remove CA certificate bundle from MANIFEST.in
-rw-r--r--debian/changelog5
-rw-r--r--debian/patches/01_use-system-ca-certificates.patch7
2 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 05090d6..22a453a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ requests (2.7.0-1) UNRELEASED; urgency=medium
(Closes: #770172)
* debian/watch
- Use pypi.debian.net redirector.
+ * debian/patches/01_use-system-ca-certificates.patch
+ - Refresh and remove CA certificate bundle from MANIFEST.in.
+ (Closes: #781610)
* debian/patches/02_use-system-chardet-and-urllib3.patch
- Refresh.
* debian/patches/04_make-requests.packages.urllib3-same-as-urllib3.patch
@@ -15,7 +18,7 @@ requests (2.7.0-1) UNRELEASED; urgency=medium
- Remove links thanks to the import machinery in
04_make-requests.packages.urllib3-same-as-urllib3.patch
- -- Daniele Tricoli <eriol@mornie.org> Sun, 03 May 2015 21:30:10 +0200
+ -- Daniele Tricoli <eriol@mornie.org> Mon, 04 May 2015 03:44:46 +0200
requests (2.4.3-6) unstable; urgency=medium
diff --git a/debian/patches/01_use-system-ca-certificates.patch b/debian/patches/01_use-system-ca-certificates.patch
index 258455e..b5cfeec 100644
--- a/debian/patches/01_use-system-ca-certificates.patch
+++ b/debian/patches/01_use-system-ca-certificates.patch
@@ -19,7 +19,7 @@ Last-Update: 2014-10-08
print(where())
--- a/setup.py
+++ b/setup.py
-@@ -43,7 +43,7 @@
+@@ -50,7 +50,7 @@
author_email='me@kennethreitz.com',
url='http://python-requests.org',
packages=packages,
@@ -28,3 +28,8 @@ Last-Update: 2014-10-08
package_dir={'requests': 'requests'},
include_package_data=True,
install_requires=requires,
+--- a/MANIFEST.in
++++ b/MANIFEST.in
+@@ -1 +1 @@
+-include README.rst LICENSE NOTICE HISTORY.rst test_requests.py requirements.txt requests/cacert.pem
++include README.rst LICENSE NOTICE HISTORY.rst test_requests.py requirements.txt