From b6e4bd293bc4b32d700b942dd9ba4f4cf3abfcda Mon Sep 17 00:00:00 2001 From: Takaki Taniguchi Date: Wed, 5 Nov 2014 00:40:48 +0000 Subject: [PATCH] refresh patch --- debian/changelog | 3 +++ debian/control | 3 ++- debian/patches/remove-duplicated-code | 38 +++++++++++++-------------- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/debian/changelog b/debian/changelog index 56874b6c..4c8227cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ python-botocore (0.69.0-1) UNRELEASED; urgency=medium * New upstream release + * debian/pathces: refresh + * Bump Standards-Version to 3.9.6 (no changes). + * Add dh-python to B-D. -- TANIGUCHI Takaki Wed, 05 Nov 2014 09:33:47 +0900 diff --git a/debian/control b/debian/control index 50fb626e..81e9e8b4 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,8 @@ Build-Depends: debhelper (>= 9) , python-setuptools , python3-all , python3-setuptools -Standards-Version: 3.9.5 + , dh-python +Standards-Version: 3.9.6 Homepage: https://github.com/boto/botocore Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/python-botocore/trunk/ Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/python-botocore/trunk/ diff --git a/debian/patches/remove-duplicated-code b/debian/patches/remove-duplicated-code index 53d40341..84b05f46 100644 --- a/debian/patches/remove-duplicated-code +++ b/debian/patches/remove-duplicated-code @@ -20,10 +20,10 @@ Forwarded: Reviewed-By: Last-Update: -Index: python-botocore-0.62.0/botocore/endpoint.py +Index: python-botocore-0.69.0/botocore/endpoint.py =================================================================== ---- python-botocore-0.62.0.orig/botocore/endpoint.py 2014-09-04 11:53:11.603921152 +0900 -+++ python-botocore-0.62.0/botocore/endpoint.py 2014-09-04 11:53:11.583921657 +0900 +--- python-botocore-0.69.0.orig/botocore/endpoint.py 2014-11-05 09:35:21.714078645 +0900 ++++ python-botocore-0.69.0/botocore/endpoint.py 2014-11-05 09:35:21.710078697 +0900 @@ -17,8 +17,8 @@ import time import threading @@ -35,10 +35,10 @@ Index: python-botocore-0.62.0/botocore/endpoint.py import six import botocore.response -Index: python-botocore-0.62.0/botocore/retryhandler.py +Index: python-botocore-0.69.0/botocore/retryhandler.py =================================================================== ---- python-botocore-0.62.0.orig/botocore/retryhandler.py 2014-09-04 11:53:11.603921152 +0900 -+++ python-botocore-0.62.0/botocore/retryhandler.py 2014-09-04 11:55:06.209047860 +0900 +--- python-botocore-0.69.0.orig/botocore/retryhandler.py 2014-11-05 09:35:21.714078645 +0900 ++++ python-botocore-0.69.0/botocore/retryhandler.py 2014-11-05 09:35:21.710078697 +0900 @@ -17,8 +17,8 @@ import logging from binascii import crc32 @@ -50,11 +50,11 @@ Index: python-botocore-0.62.0/botocore/retryhandler.py from botocore.exceptions import ChecksumError -Index: python-botocore-0.62.0/botocore/awsrequest.py +Index: python-botocore-0.69.0/botocore/awsrequest.py =================================================================== ---- python-botocore-0.62.0.orig/botocore/awsrequest.py 2014-09-04 11:53:11.603921152 +0900 -+++ python-botocore-0.62.0/botocore/awsrequest.py 2014-09-04 11:53:11.587921553 +0900 -@@ -17,14 +17,14 @@ +--- python-botocore-0.69.0.orig/botocore/awsrequest.py 2014-11-05 09:35:21.714078645 +0900 ++++ python-botocore-0.69.0/botocore/awsrequest.py 2014-11-05 09:36:25.553245163 +0900 +@@ -19,14 +19,14 @@ import inspect import six @@ -62,29 +62,29 @@ Index: python-botocore-0.62.0/botocore/awsrequest.py -from botocore.vendored.requests.sessions import REDIRECT_STATI +from requests import models +from requests.sessions import REDIRECT_STATI - from botocore.compat import HTTPHeaders, file_type, HTTPResponse + from botocore.compat import HTTPHeaders, HTTPResponse from botocore.exceptions import UnseekableStreamError -from botocore.vendored.requests.packages.urllib3.connection import VerifiedHTTPSConnection -from botocore.vendored.requests.packages.urllib3.connection import HTTPConnection -from botocore.vendored.requests.packages.urllib3.connectionpool import HTTPConnectionPool -from botocore.vendored.requests.packages.urllib3.connectionpool import HTTPSConnectionPool +from urllib3.connection import VerifiedHTTPSConnection -+from urllib3.connection import HTTPConnection -+from urllib3.connectionpool import HTTPConnectionPool -+from urllib3.connectionpool import HTTPSConnectionPool ++from requests.packages.urllib3.connection import HTTPConnection ++from requests.packages.urllib3.connectionpool import HTTPConnectionPool ++from requests.packages.urllib3.connectionpool import HTTPSConnectionPool logger = logging.getLogger(__name__) -Index: python-botocore-0.62.0/botocore/utils.py +Index: python-botocore-0.69.0/botocore/utils.py =================================================================== ---- python-botocore-0.62.0.orig/botocore/utils.py 2014-09-04 11:53:11.603921152 +0900 -+++ python-botocore-0.62.0/botocore/utils.py 2014-09-04 11:54:04.814583384 +0900 -@@ -16,7 +16,7 @@ +--- python-botocore-0.69.0.orig/botocore/utils.py 2014-11-05 09:35:21.714078645 +0900 ++++ python-botocore-0.69.0/botocore/utils.py 2014-11-05 09:36:52.764889848 +0900 +@@ -19,7 +19,7 @@ from botocore.exceptions import InvalidExpressionError, ConfigNotFound from botocore.compat import json, quote -from botocore.vendored import requests +import requests + from botocore.compat import OrderedDict - logger = logging.getLogger(__name__)