Imported Debian patch 0.29.0+repack-1
This commit is contained in:
TANIGUCHI Takaki
commit
a49ddbbde0
11
debian/changelog
vendored
Normal file
11
debian/changelog
vendored
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
python-botocore (0.29.0+repack-1) unstable; urgency=medium
|
||||
|
||||
* Remove duplicated code from upstream tarball.
|
||||
|
||||
-- TANIGUCHI Takaki <takaki@debian.org> Sun, 05 Jan 2014 23:02:56 +0900
|
||||
|
||||
python-botocore (0.29.0-1) unstable; urgency=low
|
||||
|
||||
* Initial release (Closes: #733214)
|
||||
|
||||
-- TANIGUCHI Takaki <takaki@debian.org> Fri, 27 Dec 2013 16:45:14 +0900
|
||||
1
debian/compat
vendored
Normal file
1
debian/compat
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
9
|
||||
32
debian/control
vendored
Normal file
32
debian/control
vendored
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
Source: python-botocore
|
||||
Section: python
|
||||
Priority: optional
|
||||
Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
|
||||
Uploaders: TANIGUCHI Takaki <takaki@debian.org>
|
||||
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.
|
||||
30
debian/copyright
vendored
Normal file
30
debian/copyright
vendored
Normal file
|
|
@ -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 <garnaat@amazon.com>
|
||||
License: MIT
|
||||
|
||||
Files: debian/*
|
||||
Copyright: 2013 TANIGUCHI Takaki <takaki@debian.org>
|
||||
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.
|
||||
2
debian/docs
vendored
Normal file
2
debian/docs
vendored
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
README.rst
|
||||
requirements.txt
|
||||
72
debian/patches/remove-duplicated-code
vendored
Normal file
72
debian/patches/remove-duplicated-code
vendored
Normal file
|
|
@ -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 <takaki@debian.org>
|
||||
|
||||
---
|
||||
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: <vendor|upstream|other>, <url of original patch>
|
||||
Bug: <url in upstream bugtracker>
|
||||
Bug-Debian: http://bugs.debian.org/<bugnumber>
|
||||
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
|
||||
Forwarded: <no|not-needed|url proving that it has been forwarded>
|
||||
Reviewed-By: <name and email of someone who approved the patch>
|
||||
Last-Update: <YYYY-MM-DD>
|
||||
|
||||
--- 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
|
||||
|
||||
1
debian/patches/series
vendored
Normal file
1
debian/patches/series
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
remove-duplicated-code
|
||||
11
debian/rules
vendored
Executable file
11
debian/rules
vendored
Executable file
|
|
@ -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
|
||||
1
debian/source/format
vendored
Normal file
1
debian/source/format
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
3.0 (quilt)
|
||||
2
debian/watch
vendored
Normal file
2
debian/watch
vendored
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
version=3
|
||||
http://pypi.python.org/packages/source/b/botocore/botocore-(.*).tar.gz
|
||||
Loading…
Reference in a new issue