From 6b07f6611793b365ae98ef558678983da278288c Mon Sep 17 00:00:00 2001 From: Takaki Taniguchi Date: Sat, 4 Jan 2014 08:21:59 +0000 Subject: [PATCH 1/3] [svn-inject] Applying Debian modifications (0.29.0-1) to trunk --- debian/changelog | 5 +++++ debian/compat | 1 + debian/control | 32 ++++++++++++++++++++++++++++++++ debian/copyright | 30 ++++++++++++++++++++++++++++++ debian/docs | 2 ++ debian/rules | 11 +++++++++++ debian/source/format | 1 + debian/watch | 2 ++ 8 files changed, 84 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/docs create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 00000000..871971f8 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +python-botocore (0.29.0-1) unstable; urgency=low + + * Initial release (Closes: #733214) + + -- TANIGUCHI Takaki Fri, 27 Dec 2013 16:45:14 +0900 diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000..ec635144 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 00000000..ea3e15ed --- /dev/null +++ b/debian/control @@ -0,0 +1,32 @@ +Source: python-botocore +Section: python +Priority: optional +Maintainer: Debian Python Modules Team +Uploaders: TANIGUCHI Takaki +Build-Depends: debhelper (>= 9) + , python-all + , python-setuptools + , python3-all + , python3-setuptools +Standards-Version: 3.9.5 +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/ + +Package: python-botocore +Architecture: all +Depends: ${python:Depends}, ${misc:Depends} +Description: Low-level, data-driven core of boto 3 (Python 2) + A low-level interface to a growing number of Amazon Web Services. + The botocore package is the foundation for AWS-CLI. + . + This package contains the module for Python 2. + +Package: python3-botocore +Architecture: all +Depends: ${python3:Depends}, ${misc:Depends} +Description: Low-level, data-driven core of boto 3 (Python 3) + A low-level interface to a growing number of Amazon Web Services. + The botocore package is the foundation for AWS-CLI. + . + This package contains the module for Python 3. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 00000000..24639c9f --- /dev/null +++ b/debian/copyright @@ -0,0 +1,30 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: python-botocore +Source: https://pypi.python.org/pypi/botocore + +Files: * +Copyright: Mitch Garnaat +License: MIT + +Files: debian/* +Copyright: 2013 TANIGUCHI Takaki +License: MIT + +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/debian/docs b/debian/docs new file mode 100644 index 00000000..9949a604 --- /dev/null +++ b/debian/docs @@ -0,0 +1,2 @@ +README.rst +requirements.txt diff --git a/debian/rules b/debian/rules new file mode 100755 index 00000000..b5d8b914 --- /dev/null +++ b/debian/rules @@ -0,0 +1,11 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +export PYBUILD_DESTDIR_python2=debian/python-botocore/ +export PYBUILD_DESTDIR_python3=debian/python3-botocore/ + +%: + dh $@ --with python2,python3 --buildsystem=pybuild diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 00000000..b6c0e941 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://pypi.python.org/packages/source/b/botocore/botocore-(.*).tar.gz From 9b8717c909a2b78a5be020dd04b3f16106c5ab1e Mon Sep 17 00:00:00 2001 From: Takaki Taniguchi Date: Sun, 5 Jan 2014 14:00:53 +0000 Subject: [PATCH 2/3] repack upstream --- debian/changelog | 6 +++ debian/patches/remove-duplicated-code | 72 +++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 79 insertions(+) create mode 100644 debian/patches/remove-duplicated-code create mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 871971f8..cd574616 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-botocore (0.29.0+repack-1) UNRELEASED; urgency=medium + + * Remove duplicated code from upstream tarball. + + -- TANIGUCHI Takaki Sun, 05 Jan 2014 22:31:26 +0900 + python-botocore (0.29.0-1) unstable; urgency=low * Initial release (Closes: #733214) diff --git a/debian/patches/remove-duplicated-code b/debian/patches/remove-duplicated-code new file mode 100644 index 00000000..46b2833c --- /dev/null +++ b/debian/patches/remove-duplicated-code @@ -0,0 +1,72 @@ +Description: Remove duplicate code + Upstream code contains duplicate code (requests and urllib3). + Remove this code from orig-tarball and modify import directives. + . + python-botocore (0.29.0+repack-1) UNRELEASED; urgency=medium + . + * Remove duplicated code from upstream tarball. +Author: TANIGUCHI Takaki + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +--- python-botocore-0.29.0+repack.orig/botocore/awsrequest.py ++++ python-botocore-0.29.0+repack/botocore/awsrequest.py +@@ -23,8 +23,8 @@ + import logging + + import six +-from botocore.vendored.requests import models +-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 + from botocore.exceptions import UnseekableStreamError +--- python-botocore-0.29.0+repack.orig/botocore/credentials.py ++++ python-botocore-0.29.0+repack/botocore/credentials.py +@@ -21,7 +21,7 @@ + # IN THE SOFTWARE. + # + import os +-from botocore.vendored import requests ++import requests + import logging + + from six.moves import configparser +--- python-botocore-0.29.0+repack.orig/botocore/endpoint.py ++++ python-botocore-0.29.0+repack/botocore/endpoint.py +@@ -25,8 +25,8 @@ import logging + import time + import threading + +-from botocore.vendored.requests.sessions import Session +-from botocore.vendored.requests.utils import get_environ_proxies ++from requests.sessions import Session ++from requests.utils import get_environ_proxies + import six + + import botocore.response +--- python-botocore-0.29.0+repack.orig/botocore/retryhandler.py ++++ python-botocore-0.29.0+repack/botocore/retryhandler.py +@@ -25,8 +25,8 @@ import functools + import logging + from binascii import crc32 + +-from botocore.vendored.requests import ConnectionError +-from botocore.vendored.requests.packages.urllib3.exceptions import ClosedPoolError ++from requests import ConnectionError ++from urllib3.exceptions import ClosedPoolError + + from botocore.exceptions import ChecksumError + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..36fe1cc0 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +remove-duplicated-code From d6262da730ec5628688cce0a3290de9b47bfd53c Mon Sep 17 00:00:00 2001 From: Takaki Taniguchi Date: Sun, 5 Jan 2014 14:03:08 +0000 Subject: [PATCH 3/3] prepare release --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index cd574616..68671441 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -python-botocore (0.29.0+repack-1) UNRELEASED; urgency=medium +python-botocore (0.29.0+repack-1) unstable; urgency=medium * Remove duplicated code from upstream tarball. - -- TANIGUCHI Takaki Sun, 05 Jan 2014 22:31:26 +0900 + -- TANIGUCHI Takaki Sun, 05 Jan 2014 23:02:56 +0900 python-botocore (0.29.0-1) unstable; urgency=low