Merge tag 'upstream/0.6.0.12'
authorMicah Anderson <micah@riseup.net>
Thu, 22 Aug 2013 20:39:52 +0000 (16:39 -0400)
committerMicah Anderson <micah@riseup.net>
Thu, 22 Aug 2013 20:57:38 +0000 (16:57 -0400)
Upstream version 0.6.0.12

1  2 
debian/changelog
debian/control
debian/patches/move_testvectors_outside_site-packages.patch
debian/patches/noextraversion.patch
debian/patches/series

index 8272b9c,0000000..5191c99
mode 100644,000000..100644
--- /dev/null
@@@ -1,56 -1,0 +1,58 @@@
 +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
 +
 +pycryptopp (0.5.29-1) unstable; urgency=low
 +
 +  [ Micah Anderson ]
 +  * Add myself to Uploaders
 +  * Set compat to 7 and adjust Build-Dep
 +
 +  [ Bert Agaz ]
 +  * Bump debhelper compatibility.
 +  * Update Vcs-* in debian/control.
 +  * Bump Standards-Version number.
 +  * Fix typo in debian/copyright.
 +
 +  [ Piotr Ożarowski ]
 +  * New upstream release
 +  * Use dh_pyton2 instead of dh_pysupport
 +    - minimum required python-all build version bymped to 2.6.6-3
 +  * Convert source package format to 3.0 (quilt)
 +  * Bumped Standards-Version to 3.9.1 (no other changes needed)
 +
 + -- Bert Agaz <bertagaz@ptitcanardnoir.org>  Tue, 14 Jun 2011 23:12:11 +0200
 +
 +pycryptopp (0.5.17-1) unstable; urgency=low
 +
 +  [ Piotr Ożarowski ]
 +  * New upstream release
 +
 + -- Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>  Wed, 30 Sep 2009 22:40:25 +0200
 +
 +pycryptopp (0.5.15-2) unstable; urgency=low
 +
 +  [ Piotr Ożarowski ]
 +  * Prepare for Python 2.6:
 +    - add $(py_setup_install_args) to the install args (LP: #427025)
 +
 + -- Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>  Thu, 10 Sep 2009 20:18:04 +0200
 +
 +pycryptopp (0.5.15-1) unstable; urgency=low
 +
 +  [ Piotr Ożarowski ]
 +  * New upstream release
 +  * Bumped Standards-Version to 3.8.3
 +    - add debian/README.source
 +
 + -- Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>  Thu, 27 Aug 2009 00:13:48 +0200
 +
 +pycryptopp (0.5.14-1) unstable; urgency=low
 +
 +  * Initial release (Closes: #503977).
 +
 + -- Zooko O'Whielacronx <zooko@zooko.com>  Mon, 22 Jun 2009 22:20:50 +0200
diff --cc debian/control
index a63ebed,0000000..e5fccd8
mode 100644,000000..100644
--- /dev/null
@@@ -1,35 -1,0 +1,35 @@@
- Uploaders: Micah Anderson <micah@riseup.net>
 +Source: pycryptopp
 +Section: python
 +Priority: optional
 +Maintainer: Bert Agaz <bertagaz@ptitcanardnoir.org>
++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
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=tahoe/pycryptopp.git
 +Homepage: http://allmydata.org/trac/pycryptopp
 +X-Python-Version: >= 2.4
 +
 +Package: python-pycryptopp
 +Architecture: any
 +Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
 +Breaks: ${python:Breaks}
 +Provides: ${python:Provides}
 +Description: Python wrappers for the Crypto++ library
 + PyCryptopp is a set of Python wrappers for a few of the best crypto algorithms
 + from the Crypto++ library (including SHA-256, AES, RSA signatures and Elliptic
 + Curve DSA signatures).
 +
 +Package: python-pycryptopp-dbg
 +Architecture: any
 +Section: debug
 +Priority: extra
 +Depends: python-pycryptopp (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends}
 +Breaks: ${python:Breaks}
 +Provides: ${python:Provides}
 +Description: Python wrappers for the Crypto++ library (debug extension)
 + PyCryptopp is a set of Python wrappers for a few of the best crypto algorithms
 + from the Crypto++ library (including SHA-256, AES, RSA signatures and Elliptic
 + Curve DSA signatures).
 + .
 + This package contains the extension built for the Python debug interpreter.
index 956370c,0000000..7055927
mode 100644,000000..100644
--- /dev/null
@@@ -1,39 -1,0 +1,38 @@@
- # 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
 ++
 ++def resource_string(package_or_requirement, resource_name):
 ++    return file(os.path.join("/usr/share/python-pycryptopp/%s" % resource_name)).read()
 ++
 ++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
 + 
 +-from pkg_resources import resource_string, resource_listdir
 ++from pycryptopp.test import resource_string, resource_listdir
 + 
 + 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
 + 
 +-from pkg_resources import resource_string
 ++from pycryptopp.test import resource_string
 + 
 + def resource_string_lines(pkgname, resname):
 +     return split_on_newlines(resource_string(pkgname, resname))
index 0000000,0000000..f88c476
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,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(
index 7a062a5,0000000..37f33e6
mode 100644,000000..100644
--- /dev/null
@@@ -1,3 -1,0 +1,2 @@@
- do_not_regenerate_darcs_stuff.patch
- do_not_ship_extraversion.patch
 +move_testvectors_outside_site-packages.patch
++noextraversion.patch