From f07437f64db264564627711392daa5012d965889 Mon Sep 17 00:00:00 2001
From: Noah Levitt <nlevitt@archive.org>
Date: Thu, 19 Dec 2013 16:48:28 -0800
Subject: [PATCH 1/3] since we depend on warctools trunk now, update the
 readme, and update the version number, so we can push latest to pypi

---
 README.rst | 10 ----------
 setup.py   |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/README.rst b/README.rst
index f443680..4bcc1f8 100644
--- a/README.rst
+++ b/README.rst
@@ -2,8 +2,6 @@ warcprox - WARC writing MITM HTTP/S proxy
 -----------------------------------------
 .. image:: https://travis-ci.org/internetarchive/warcprox.png?branch=master   
         :target: https://travis-ci.org/internetarchive/warcprox
-.. image:: https://pypip.in/d/warcprox/badge.png
-        :target: https://pypi.python.org/pypi/warcprox
 
 Based on the excellent and simple pymiproxy by Nadeem Douba.
 https://github.com/allfro/pymiproxy
@@ -20,14 +18,6 @@ get the warning when you visit each new site. But worse, any embedded
 https content on a different server will simply fail to load, because
 the browser will reject the certificate without telling you.
 
-Dependencies
-~~~~~~~~~~~~
-
-Currently depends on tweaks branch of my fork of warctools.
-https://github.com/nlevitt/warctools/tree/tweaks Hopefully the changes
-in that branch, or something equivalent, will be incorporated into
-warctools mainline.
-
 Usage
 ~~~~~
 
diff --git a/setup.py b/setup.py
index dfd76c2..a7d2d0b 100755
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 import setuptools 
 
 setuptools.setup(name='warcprox',
-        version='1.0',
+        version='1.1',
         description='WARC writing MITM HTTP/S proxy',
         url='https://github.com/internetarchive/warcprox',
         author='Noah Levitt',

From 115b7c03eee27ff4f7a3ce2e8b62d0a29063e988 Mon Sep 17 00:00:00 2001
From: Noah Levitt <nlevitt@archive.org>
Date: Thu, 19 Dec 2013 17:03:40 -0800
Subject: [PATCH 2/3] add some classifiers

---
 setup.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index a7d2d0b..d51d1a4 100755
--- a/setup.py
+++ b/setup.py
@@ -17,5 +17,18 @@ setuptools.setup(name='warcprox',
         tests_require=['requests>=2.0.1'],  # >=2.0.1 for https://github.com/kennethreitz/requests/pull/1636
         test_suite='warcprox.tests',
         scripts=['bin/dump-anydbm', 'bin/warcprox'],
-        zip_safe=False)
+        zip_safe=False,
+        classifiers=[
+            'Development Status :: 5 - Production/Stable',
+            'Environment :: Console',
+            'License :: OSI Approved :: GNU General Public License (GPL)',
+            'Programming Language :: Python :: 2.7',
+            'Programming Language :: Python :: 3',
+            'Programming Language :: Python :: 3.2',
+            'Programming Language :: Python :: 3.3',
+            'Topic :: Internet :: Proxy Servers',
+            'Topic :: Internet :: WWW/HTTP',
+            'Topic :: Software Development :: Libraries :: Python Modules'
+            'Topic :: System :: Archiving',
+        ])
 

From 3bc42942274eff990a1e311e94f3fe6ba5d92f0c Mon Sep 17 00:00:00 2001
From: Noah Levitt <nlevitt@archive.org>
Date: Thu, 19 Dec 2013 17:08:13 -0800
Subject: [PATCH 3/3] oops, adding missing comma

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index d51d1a4..dabce13 100755
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ setuptools.setup(name='warcprox',
             'Programming Language :: Python :: 3.3',
             'Topic :: Internet :: Proxy Servers',
             'Topic :: Internet :: WWW/HTTP',
-            'Topic :: Software Development :: Libraries :: Python Modules'
+            'Topic :: Software Development :: Libraries :: Python Modules',
             'Topic :: System :: Archiving',
         ])