Merge tag 'upstream/0.6.0.12'

Upstream version 0.6.0.12

7 files changed, 49 insertions, 59 deletions

diff --git a/debian/changelog b/debian/changelog
index 8272b9c..5191c99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 pycryptopp (0.6.0.12-1) unstable; urgency=low
 
   * Update debian/watch
+  * Refresh patches
+  * Import new upstream version
 
  -- Micah Anderson <micah@debian.org>  Thu, 22 Aug 2013 16:31:55 -0400
 
diff --git a/debian/control b/debian/control
index a63ebed..e5fccd8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: pycryptopp
 Section: python
 Priority: optional
 Maintainer: Bert Agaz <bertagaz@ptitcanardnoir.org>
-Uploaders: Micah Anderson <micah@riseup.net>
+Uploaders: Micah Anderson <micah@debian.org>
 Build-Depends: debhelper (>= 7), python-all-dev (>= 2.6.6-3), python-all-dbg, python-setuptools (>= 0.6b3), libcrypto++-dev
 Standards-Version: 3.9.2
 Vcs-Git: git://anonscm.debian.org/tahoe/pycryptopp.git
diff --git a/debian/patches/do_not_regenerate_darcs_stuff.patch b/debian/patches/do_not_regenerate_darcs_stuff.patch
deleted file mode 100644
index 7472072..0000000
--- a/debian/patches/do_not_regenerate_darcs_stuff.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-# upstream tarball already has all .py files generated by darcs / setuptools_darcs
-# no need to regenerate them
-Index: pycryptopp-0.5.29/setup.py
-===================================================================
---- pycryptopp-0.5.29.orig/setup.py
-+++ pycryptopp-0.5.29/setup.py
-@@ -226,7 +226,7 @@ install_requires = ['setuptools >= 0.6a9
- # that are already in use), you may need to add it to setup.cfg and configure
- # it to run darcsver before your command, if you want the version number to be
- # correct when that command runs.  http://pypi.python.org/pypi/darcsver
--setup_requires.append('darcsver >= 1.6.3')
-+#setup_requires.append('darcsver >= 1.6.3')
- 
- # setuptools_pyflakes is needed only if you want "./setup.py flakes" to run
- # pyflakes on all the pycryptopp modules.
-Index: pycryptopp-0.5.29/setup.cfg
-===================================================================
---- pycryptopp-0.5.29.orig/setup.cfg
-+++ pycryptopp-0.5.29/setup.cfg
-@@ -10,8 +10,8 @@ tag_svn_revision = 0
- sdist_dsc = darcsver --count-all-patches sdist_dsc
- sdist = darcsver --count-all-patches sdist
- trial = darcsver --count-all-patches trial
--build = darcsver --count-all-patches build
--install = darcsver --count-all-patches install
--test = darcsver --count-all-patches test
-+#build = darcsver --count-all-patches build
-+#install = darcsver --count-all-patches install
-+#test = darcsver --count-all-patches test
- bdist_egg = darcsver --count-all-patches bdist_egg
- 
diff --git a/debian/patches/do_not_ship_extraversion.patch b/debian/patches/do_not_ship_extraversion.patch
deleted file mode 100644
index ebbb75e..0000000
--- a/debian/patches/do_not_ship_extraversion.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: pycryptopp/setup.py
-===================================================================
---- pycryptopp.orig/setup.py	2011-06-14 16:41:38.480289242 +0200
-+++ pycryptopp/setup.py	2011-06-14 16:42:05.568309622 +0200
-@@ -260,7 +260,7 @@
- # Note that due to a bug in distutils we also have to maintain a
- # MANIFEST.in file specifying embeddedcryptopp/extraversion.h. This bug was
- # fixed in Python 2.7
--data_files.append((EMBEDDED_CRYPTOPP_DIR, [EMBEDDED_CRYPTOPP_DIR+'/extraversion.h']))
-+#data_files.append((EMBEDDED_CRYPTOPP_DIR, [EMBEDDED_CRYPTOPP_DIR+'/extraversion.h']))
- 
- if ECDSA:
-     long_description='RSA-PSS-SHA256 signatures, ECDSA(1363)/EMSA1(SHA-256) signatures, SHA-256 hashes, and AES-CTR encryption'
diff --git a/debian/patches/move_testvectors_outside_site-packages.patch b/debian/patches/move_testvectors_outside_site-packages.patch
index 956370c..7055927 100644
--- a/debian/patches/move_testvectors_outside_site-packages.patch
+++ b/debian/patches/move_testvectors_outside_site-packages.patch
@@ -1,8 +1,7 @@
-# moves testvecoros (i.e. non .py files) outside site-packages
-Index: pycryptopp-0.5.29/pycryptopp/test/__init__.py
+Index: pycryptopp/src/pycryptopp/test/__init__.py
 ===================================================================
---- /dev/null
-+++ pycryptopp-0.5.29/pycryptopp/test/__init__.py
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ pycryptopp/src/pycryptopp/test/__init__.py	2013-08-22 16:45:30.747903892 -0400
 @@ -0,0 +1,7 @@
 +import os
 +
@@ -11,11 +10,11 @@ Index: pycryptopp-0.5.29/pycryptopp/test/__init__.py
 +
 +def resource_listdir(package_or_requirement, resource_name):
 +    return os.listdir("/usr/share/python-pycryptopp/%s" % resource_name)
-Index: pycryptopp-0.5.29/pycryptopp/test/test_aes.py
+Index: pycryptopp/src/pycryptopp/test/test_aes.py
 ===================================================================
---- pycryptopp-0.5.29.orig/pycryptopp/test/test_aes.py
-+++ pycryptopp-0.5.29/pycryptopp/test/test_aes.py
-@@ -11,7 +11,7 @@ VERBOSE=False
+--- pycryptopp.orig/src/pycryptopp/test/test_aes.py	2013-08-22 16:39:52.488938601 -0400
++++ pycryptopp/src/pycryptopp/test/test_aes.py	2013-08-22 16:46:22.438522135 -0400
+@@ -11,7 +11,7 @@
  
  from pycryptopp.cipher import aes
  
@@ -24,11 +23,11 @@ Index: pycryptopp-0.5.29/pycryptopp/test/test_aes.py
  
  from base64 import b32encode
  def ab(x): # debuggery
-Index: pycryptopp-0.5.29/pycryptopp/test/test_sha256.py
+Index: pycryptopp/src/pycryptopp/test/test_sha256.py
 ===================================================================
---- pycryptopp-0.5.29.orig/pycryptopp/test/test_sha256.py
-+++ pycryptopp-0.5.29/pycryptopp/test/test_sha256.py
-@@ -11,7 +11,7 @@ VERBOSE=False
+--- pycryptopp.orig/src/pycryptopp/test/test_sha256.py	2013-08-22 16:39:52.488938601 -0400
++++ pycryptopp/src/pycryptopp/test/test_sha256.py	2013-08-22 16:46:40.282045087 -0400
+@@ -11,7 +11,7 @@
  
  from pycryptopp.hash import sha256
  
diff --git a/debian/patches/noextraversion.patch b/debian/patches/noextraversion.patch
new file mode 100644
index 0000000..f88c476
--- /dev/null
+++ b/debian/patches/noextraversion.patch
@@ -0,0 +1,34 @@
+Index: pycryptopp/setup.py
+===================================================================
+--- pycryptopp.orig/setup.py	2013-08-22 16:56:10.818783603 -0400
++++ pycryptopp/setup.py	2013-08-22 16:56:44.165896373 -0400
+@@ -304,7 +304,7 @@
+         if mo:
+             return mo.group(1)
+ 
+-EXTRAVERSION_H_FNAME = os.path.join(EMBEDDED_CRYPTOPP_DIR, 'extraversion.h')
++#EXTRAVERSION_H_FNAME = os.path.join(EMBEDDED_CRYPTOPP_DIR, 'extraversion.h')
+ 
+ VERSION_BODY = '''
+ # This is the version of this tree, as created by %(versiontool)s from the
+@@ -335,13 +335,13 @@
+         # Let's avoid touching the change time (ctime) on the files unless
+         # they actually need to be updated.
+ 
+-        if self.read_extraversion_h(EXTRAVERSION_H_FNAME) != version:
+-            self.write_extraversion_h(
+-                PKG,
+-                version,
+-                EXTRAVERSION_H_FNAME,
+-                CPP_GIT_VERSION_BODY
+-                )
++#        if self.read_extraversion_h(EXTRAVERSION_H_FNAME) != version:
++#            self.write_extraversion_h(
++#                PKG,
++#                version,
++#                EXTRAVERSION_H_FNAME,
++#                CPP_GIT_VERSION_BODY
++#                )
+ 
+         if read_version_py(VERSION_PY_FNAME) != version:
+             self.write_version_py(
diff --git a/debian/patches/series b/debian/patches/series
index 7a062a5..37f33e6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 move_testvectors_outside_site-packages.patch
-do_not_regenerate_darcs_stuff.patch
-do_not_ship_extraversion.patch
+noextraversion.patch