Refreshes debian/patches/02_use-system-chardet-and-urllib3.patch,

removes debian/patches/03_fixes-egginfo.patch,
delete egginfo folder on clean.

4 files changed, 17 insertions, 24 deletions

diff --git a/debian/patches/02_use-system-chardet-and-urllib3.patch b/debian/patches/02_use-system-chardet-and-urllib3.patch
index 14636c4..94d6a9f 100644
--- a/debian/patches/02_use-system-chardet-and-urllib3.patch
+++ b/debian/patches/02_use-system-chardet-and-urllib3.patch
@@ -4,8 +4,10 @@ Author: Daniele Tricoli <eriol@mornie.org>
 Forwarded: not-needed
 Last-Update: 2013-01-19
 
---- a/requests/adapters.py	2013-03-22 04:09:32.000000000 +0000
-+++ b/requests/adapters.py	2013-04-25 23:00:25.000000000 +0000
+Index: requests-1.2.0/requests/adapters.py
+===================================================================
+--- requests-1.2.0.orig/requests/adapters.py	2013-05-11 05:21:57.000000000 +0000
++++ requests-1.2.0/requests/adapters.py	2013-05-11 05:22:06.000000000 +0000
 @@ -11,16 +11,16 @@
  import socket
  
@@ -29,8 +31,10 @@ Last-Update: 2013-01-19
  from .cookies import extract_cookies_to_jar
  from .exceptions import ConnectionError, Timeout, SSLError
  from .auth import _basic_auth_str
---- a/requests/compat.py	2013-01-31 13:18:16.000000000 +0000
-+++ b/requests/compat.py	2013-04-25 23:04:23.000000000 +0000
+Index: requests-1.2.0/requests/compat.py
+===================================================================
+--- requests-1.2.0.orig/requests/compat.py	2013-05-11 05:21:57.000000000 +0000
++++ requests-1.2.0/requests/compat.py	2013-05-11 05:22:06.000000000 +0000
 @@ -4,7 +4,7 @@
  pythoncompat
  """
@@ -49,8 +53,10 @@ Last-Update: 2013-01-19
  
      builtin_str = str
      bytes = str
---- a/requests/models.py	2013-03-31 05:22:03.000000000 +0000
-+++ b/requests/models.py	2013-04-25 23:07:32.000000000 +0000
+Index: requests-1.2.0/requests/models.py
+===================================================================
+--- requests-1.2.0.orig/requests/models.py	2013-05-11 05:21:57.000000000 +0000
++++ requests-1.2.0/requests/models.py	2013-05-11 05:22:06.000000000 +0000
 @@ -17,7 +17,7 @@
  
  from .auth import HTTPBasicAuth
@@ -60,8 +66,10 @@ Last-Update: 2013-01-19
  from .exceptions import HTTPError, RequestException, MissingSchema, InvalidURL
  from .utils import (
      stream_untransfer, guess_filename, get_auth_from_url, requote_uri,
---- a/setup.py	2013-01-24 01:08:39.000000000 +0000
-+++ b/setup.py	2013-04-25 23:09:21.000000000 +0000
+Index: requests-1.2.0/setup.py
+===================================================================
+--- requests-1.2.0.orig/setup.py	2013-05-11 05:22:06.000000000 +0000
++++ requests-1.2.0/setup.py	2013-05-11 05:22:06.000000000 +0000
 @@ -16,11 +16,6 @@
  
  packages = [
diff --git a/debian/patches/03_fixes-egginfo.patch b/debian/patches/03_fixes-egginfo.patch
deleted file mode 100644
index 4a49a4e..0000000
--- a/debian/patches/03_fixes-egginfo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Removes difference with egginfo after build
-Author: Thomas Goirand <zigo@debian.org>
-Forwarded: no
-Last-Update: 2013-05-11
-
---- requests-1.2.0.orig/requests.egg-info/SOURCES.txt
-+++ requests-1.2.0/requests.egg-info/SOURCES.txt
-@@ -4,6 +4,7 @@ MANIFEST.in
- NOTICE
- README.rst
- requirements.txt
-+setup.cfg
- setup.py
- test_requests.py
- requests/__init__.py
diff --git a/debian/patches/series b/debian/patches/series
index 15057ca..632785a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01_use-system-ca-certificates.patch
 02_use-system-chardet-and-urllib3.patch
-03_fixes-egginfo.patch
diff --git a/debian/rules b/debian/rules
index af9831c..b49e126 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,7 @@ override_dh_auto_build:
 override_dh_auto_clean:
 	rm -rf build
 	dh_auto_clean
+	rm -rf requests.egg-info
 
 override_dh_auto_install:
 	set -ex; \