10 files changed, 185 insertions, 123 deletions
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index c887ccf..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,2 +0,0 @@
-Files under requests/packages/urllib3/ are not an embedded copy but a fork of
-that library.
diff --git a/debian/changelog b/debian/changelog
index 429b329..8aed937 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,34 @@
+requests (1.1.0-1) experimental; urgency=low
+
+  * New upstream release (Closes: #692602)
+    - Thanks to Barry Warsaw for report
+  * debian/control
+    - Added python-chardet, python3-chardet to Build-Depends and moved
+      them from Recommends to Depends since chardet is now required
+    - Added python(3)-urllib3 (>= 1.5) to Build-Depends and Depends
+      since the embedded copy is no more a fork
+    - Removed python(3)-six since python(3)-urllib3 is not embedded
+      anymore
+    - Removed python-gevent and python-oauthlib from Recommends
+      since upstream is not using them anymore
+    - Bumped Standards-Version to 3.9.4 (no changes needed)
+    - Fixed lintian vcs-field-not-canonical
+  * debian/copyright
+    - Updated to reflect upstream switch to Apache 2.0 and updated
+      copyright years
+  * debian/patches/01_do-not-use-python-certifi.patch
+    - Removed because no longer necessary
+  * debian/patches/02_do-not-use-embedded-python-six.patch
+    - Removed because no longer necessary
+  * debian/patches/01_use-system-ca-certificates.patch
+    - Use the bundle provided by ca-certificates instead of
+      the embedded one
+  * debian/patches/02_use-system-chardet-and-urllib3.patches
+    - Use the system python-chardet and python-urllib3 instead of the
+      embedded copies
+
+ -- Daniele Tricoli <eriol@mornie.org>  Sun, 20 Jan 2013 23:03:45 +0100
+
 requests (0.12.1-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index d30000c..366731d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,15 +6,17 @@ Priority: optional
 Build-Depends:
  debhelper (>= 7.0.50~),
  python-all (>= 2.6.6-3),
- python-six,
+ python-chardet,
+ python-urllib3 (>= 1.5),
  python3-all,
- python3-six
-Standards-Version: 3.9.3
+ python3-chardet,
+ python3-urllib3 (>= 1.5)
+Standards-Version: 3.9.4
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.0
 Homepage: http://python-requests.org
-Vcs-Svn: svn://svn.debian.org/python-modules/packages/requests/trunk/
-Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/requests/trunk/
+Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/requests/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/requests/trunk/
 
 Package: python-requests
 Architecture: all
@@ -22,11 +24,8 @@ Depends:
  ${misc:Depends},
  ${python:Depends},
  ca-certificates,
- python-six
-Recommends:
  python-chardet,
- python-gevent,
- python-oauthlib
+ python-urllib3 (>= 1.5),
 Description: elegant and simple HTTP library for Python, built for human beings
  Requests allow you to send HTTP/1.1 requests. You can add headers, form data,
  multipart files, and parameters with simple Python dictionaries, and access the
@@ -52,9 +51,8 @@ Depends:
  ${misc:Depends},
  ${python3:Depends},
  ca-certificates,
- python3-six
-Recommends:
- python3-chardet
+ python3-chardet,
+ python3-urllib3 (>= 1.5)
 Description: elegant and simple HTTP library for Python3, built for human beings
  Requests allow you to send HTTP/1.1 requests. You can add headers, form data,
  multipart files, and parameters with simple Python dictionaries, and access the
diff --git a/debian/copyright b/debian/copyright
index 5cbc66a..15df1b8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,16 +4,16 @@ Upstream-Contact: Kenneth Reitz <me@kennethreitz.com>
 Source: http://pypi.python.org/pypi/requests
 
 Files: *
-Copyright: 2011-2012, Kenneth Reitz
-License: ISC
+Copyright: 2011-2013, Kenneth Reitz
+License: Apache
 
 Files: requests/packages/urllib3/*
 Copyright: 2008-2011, Andrey Petrov
 License: Expat
 
-Files: requests/packages/urllib3/packages/mimetools_choose_boundary/__init__.py
-Copyright: 2010, Python Software Foundation
-License: PSF-2
+Files: requests/packages/urllib3/packages/ordered_dict.py
+Copyright: 2009, Raymond Hettinger
+License: Expat
 
 Files: requests/packages/urllib3/packages/ssl_match_hostname/__init__.py
 Copyright: 2011, Python Software Foundation
@@ -23,43 +23,34 @@ Files: requests/packages/urllib3/packages/six.py
 Copyright: 2010-2011, Benjamin Peterson
 License: Expat
 
-Files: requests/packages/oreos/monkeys.py
-Copyright: 2000, Timothy O'Malley
-License:
- Permission to use, copy, modify, and distribute this software
- and its documentation for any purpose and without fee is hereby
- granted, provided that the above copyright notice appear in all
- copies and that both that copyright notice and this permission
- notice appear in supporting documentation, and that the name of
- Timothy O'Malley  not be used in advertising or publicity
- pertaining to distribution of the software without specific, written
- prior permission.
- .
- Timothy O'Malley DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS, IN NO EVENT SHALL Timothy O'Malley BE LIABLE FOR
- ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- PERFORMANCE OF THIS SOFTWARE.
+Files: requests/packages/charade/*
+Copyright: 2006-2008, Mark Pilgrim
+           2012-2013, Ian Cordasco
+License: LGPL-2.1+
+
+Files: requests/cacert.pem
+Copyright: 2013, Mozilla
+License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2011-2012, Daniele Tricoli <eriol@mornie.org>
-License: ISC
+Copyright: 2011-2013, Daniele Tricoli <eriol@mornie.org>
+License: Apache
 
-License: ISC
- Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
+License: Apache
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this software except in compliance with the License.
+ You may obtain a copy of the License at
  .
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- PERFORMANCE OF THIS SOFTWARE.
+   http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the full text of the Apache License, Version 2.0 can be
+ found in the file `/usr/share/common-licenses/Apache-2.0'.
 
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining
@@ -126,3 +117,11 @@ License: PSF-2
  .
  8. By copying, installing or otherwise using Python, Licensee agrees
  to be bound by the terms and conditions of this License Agreement.
+
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of the
+ License, or (at your option) any later version.
+ .
+ See /usr/share/common-licenses/LGPL-2.1 for the full license text.
diff --git a/debian/patches/01_do-not-use-python-certifi.patch b/debian/patches/01_do-not-use-python-certifi.patch
deleted file mode 100644
index 74fb4d0..0000000
--- a/debian/patches/01_do-not-use-python-certifi.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: To verify SSL certificates for HTTPS requests, use the bundle
- provided by ca-certificates instead of python-certifi.
-Author: Daniele Tricoli <eriol@mornie.org>
-Forwarded: not-needed
-Last-Update: 2012-05-04
-
---- a/setup.py
-+++ b/setup.py
-@@ -32,7 +32,7 @@
- # On certain supported platforms (e.g., Red Hat / Debian / FreeBSD), Requests can
- # use the system CA bundle instead; see `requests.utils` for details.
- # If your platform is supported, set `requires` to [] instead:
--requires = ['certifi>=0.0.7']
-+requires = []
-
- # chardet is used to optimally guess the encodings of pages that don't declare one.
- # At this time, chardet is not a required dependency. However, it's sufficiently
diff --git a/debian/patches/01_use-system-ca-certificates.patch b/debian/patches/01_use-system-ca-certificates.patch
new file mode 100644
index 0000000..5fec645
--- /dev/null
+++ b/debian/patches/01_use-system-ca-certificates.patch
@@ -0,0 +1,28 @@
+Description: Use the bundle provided by ca-certificates instead of
+ the embedded one.
+Author: Daniele Tricoli <eriol@mornie.org>
+Forwarded: not-needed
+Last-Update: 2013-01-19
+
+--- a/requests/certs.py
++++ b/requests/certs.py
+@@ -25,7 +25,7 @@
+     if certifi:
+         return certifi.where()
+
+-    return os.path.join(os.path.dirname(__file__), 'cacert.pem')
++    return '/etc/ssl/certs/ca-certificates.crt'
+
+ if __name__ == '__main__':
+     print(where())
+--- a/setup.py
++++ b/setup.py
+@@ -35,7 +35,7 @@
+     author_email='me@kennethreitz.com',
+     url='http://python-requests.org',
+     packages=packages,
+-    package_data={'': ['LICENSE', 'NOTICE'], 'requests': ['*.pem']},
++    package_data={'': ['LICENSE', 'NOTICE'],},
+     package_dir={'requests': 'requests'},
+     include_package_data=True,
+     install_requires=requires,
diff --git a/debian/patches/02_do-not-use-embedded-python-six.patch b/debian/patches/02_do-not-use-embedded-python-six.patch
deleted file mode 100644
index f045f5a..0000000
--- a/debian/patches/02_do-not-use-embedded-python-six.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Description: Do not use embedded copy of python-six.
-Author: Daniele Tricoli <eriol@mornie.org>
-Forwarded: not-needed
-Last-Update: 2012-03-19
-
---- a/requests/packages/urllib3/connectionpool.py
-+++ b/requests/packages/urllib3/connectionpool.py
-@@ -51,7 +51,7 @@
- )
-
- from .packages.ssl_match_hostname import match_hostname, CertificateError
--from .packages import six
-+import six
-
-
- xrange = six.moves.xrange
---- a/requests/packages/urllib3/filepost.py
-+++ b/requests/packages/urllib3/filepost.py
-@@ -14,8 +14,8 @@
-
- from io import BytesIO
-
--from .packages import six
--from .packages.six import b
-+import six
-+from six import b
-
- writer = codecs.lookup('utf-8')[3]
-
---- a/requests/packages/urllib3/response.py
-+++ b/requests/packages/urllib3/response.py
-@@ -11,7 +11,7 @@
- from io import BytesIO
-
- from .exceptions import HTTPError
--from .packages.six import string_types as basestring
-+from six import string_types as basestring
-
-
- log = logging.getLogger(__name__)
---- a/requests/packages/urllib3/util.py
-+++ b/requests/packages/urllib3/util.py
-@@ -16,7 +16,7 @@
-     except ImportError: # `select` doesn't exist on AppEngine.
-         select = False
-
--from .packages import six
-+import six
- from .exceptions import LocationParseError
diff --git a/debian/patches/02_use-system-chardet-and-urllib3.patch b/debian/patches/02_use-system-chardet-and-urllib3.patch
new file mode 100644
index 0000000..62d14ef
--- /dev/null
+++ b/debian/patches/02_use-system-chardet-and-urllib3.patch
@@ -0,0 +1,77 @@
+Description: Use the system python-chardet and python-urllib3 instead of the
+ embedded copies.
+Author: Daniele Tricoli <eriol@mornie.org>
+Forwarded: not-needed
+Last-Update: 2013-01-19
+
+--- a/requests/adapters.py
++++ b/requests/adapters.py
+@@ -11,17 +11,17 @@
+ import socket
+
+ from .models import Response
+-from .packages.urllib3.poolmanager import PoolManager, proxy_from_url
+-from .packages.urllib3.response import HTTPResponse
++from urllib3.poolmanager import PoolManager, proxy_from_url
++from urllib3.response import HTTPResponse
+ from .hooks import dispatch_hook
+ from .compat import urlparse, basestring, urldefrag
+ from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers,
+                     prepend_scheme_if_needed)
+ from .structures import CaseInsensitiveDict
+-from .packages.urllib3.exceptions import MaxRetryError
+-from .packages.urllib3.exceptions import TimeoutError
+-from .packages.urllib3.exceptions import SSLError as _SSLError
+-from .packages.urllib3.exceptions import HTTPError as _HTTPError
++from urllib3.exceptions import MaxRetryError
++from urllib3.exceptions import TimeoutError
++from urllib3.exceptions import SSLError as _SSLError
++from urllib3.exceptions import HTTPError as _HTTPError
+ from .cookies import extract_cookies_to_jar
+ from .exceptions import ConnectionError, Timeout, SSLError
+
+--- a/requests/compat.py
++++ b/requests/compat.py
+@@ -4,7 +4,7 @@
+ pythoncompat
+ """
+
+-from .packages import charade as chardet
++import chardet
+
+ import sys
+
+@@ -89,7 +89,7 @@
+     import cookielib
+     from Cookie import Morsel
+     from StringIO import StringIO
+-    from .packages.urllib3.packages.ordered_dict import OrderedDict
++    from urllib3.packages.ordered_dict import OrderedDict
+
+     builtin_str = str
+     bytes = str
+--- a/requests/models.py
++++ b/requests/models.py
+@@ -17,7 +17,7 @@
+
+ from .auth import HTTPBasicAuth
+ from .cookies import cookiejar_from_dict, get_cookie_header
+-from .packages.urllib3.filepost import encode_multipart_formdata
++from urllib3.filepost import encode_multipart_formdata
+ from .exceptions import HTTPError, RequestException, MissingSchema, InvalidURL
+ from .utils import (
+     stream_untransfer, guess_filename, requote_uri,
+--- a/setup.py
++++ b/setup.py
+@@ -16,11 +16,6 @@
+
+ packages = [
+     'requests',
+-    'requests.packages',
+-	'requests.packages.charade',
+-    'requests.packages.urllib3',
+-    'requests.packages.urllib3.packages',
+-    'requests.packages.urllib3.packages.ssl_match_hostname'
+ ]
+
+ requires = []
diff --git a/debian/patches/series b/debian/patches/series
index 45a01fe..632785a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-01_do-not-use-python-certifi.patch
-02_do-not-use-embedded-python-six.patch
+01_use-system-ca-certificates.patch
+02_use-system-chardet-and-urllib3.patch
diff --git a/debian/rules b/debian/rules
index f14d439..af9831c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,9 +16,6 @@ override_dh_auto_clean:
 	rm -rf build
 	dh_auto_clean
 
-override_dh_auto_configure:
-	rm -f requests/packages/urllib3/packages/six.py
-
 override_dh_auto_install:
 	set -ex; \
 	for python in $(PYVERS); do \