[Python-modules-commits] r15817 - in packages/pycryptopp/trunk/debian (7 files)

piotr at users.alioth.debian.org piotr at users.alioth.debian.org
Sun Feb 20 22:38:43 UTC 2011 

    Date: Sunday, February 20, 2011 @ 22:38:37
  Author: piotr
Revision: 15817

* 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)

Modified:
  packages/pycryptopp/trunk/debian/changelog
  packages/pycryptopp/trunk/debian/control
  packages/pycryptopp/trunk/debian/patches/do_not_regenerate_darcs_stuff.patch
  packages/pycryptopp/trunk/debian/patches/move_testvectors_outside_site-packages.patch
  packages/pycryptopp/trunk/debian/rules
  packages/pycryptopp/trunk/debian/source/format
Deleted:
  packages/pycryptopp/trunk/debian/README.source

Deleted: packages/pycryptopp/trunk/debian/README.source
===================================================================
--- packages/pycryptopp/trunk/debian/README.source	2011-02-20 19:05:37 UTC (rev 15816)
+++ packages/pycryptopp/trunk/debian/README.source	2011-02-20 22:38:37 UTC (rev 15817)
@@ -1,2 +0,0 @@
-The package uses the quilt patch system to apply patches.
-See /usr/share/doc/quilt/README.source.

Modified: packages/pycryptopp/trunk/debian/changelog
===================================================================
--- packages/pycryptopp/trunk/debian/changelog	2011-02-20 19:05:37 UTC (rev 15816)
+++ packages/pycryptopp/trunk/debian/changelog	2011-02-20 22:38:37 UTC (rev 15817)
@@ -1,3 +1,18 @@
+pycryptopp (0.5.29-1) UNRELEASED; urgency=low
+
+  * Team upload.
+  TODO: get rid of *.egg and embeddedcryptopp directories or document them 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)
+
+ -- Piotr Ożarowski <piotr at debian.org>  Sun, 20 Feb 2011 23:06:31 +0100
+
 pycryptopp (0.5.17-1) unstable; urgency=low
 
   [ Piotr Ożarowski ]

Modified: packages/pycryptopp/trunk/debian/control
===================================================================
--- packages/pycryptopp/trunk/debian/control	2011-02-20 19:05:37 UTC (rev 15816)
+++ packages/pycryptopp/trunk/debian/control	2011-02-20 22:38:37 UTC (rev 15817)
@@ -3,16 +3,17 @@
 Priority: optional
 Maintainer: Zooko O'Whielacronx <zooko at zooko.com>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5), python-all-dev, python-all-dbg, python-support (>= 0.6.4), python-setuptools (>= 0.6b3), libcrypto++-dev, quilt (>= 0.40)
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 5), python-all-dev (>= 2.6.6-3), python-all-dbg, python-setuptools (>= 0.6b3), libcrypto++-dev
+Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pycryptopp/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pycryptopp/trunk/
 Homepage: http://allmydata.org/trac/pycryptopp
-XS-Python-Version: all
+X-Python-Version: >= 2.4
 
 Package: python-pycryptopp
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}
+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
@@ -23,9 +24,9 @@
 Architecture: any
 Section: debug
 Priority: extra
-Depends: python-pycryptopp (= ${binary:Version}), python-dbg, ${shlibs:Depends}
+Depends: python-pycryptopp (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends}
+Breaks: ${python:Breaks}
 Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
 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

Modified: packages/pycryptopp/trunk/debian/patches/do_not_regenerate_darcs_stuff.patch
===================================================================
--- packages/pycryptopp/trunk/debian/patches/do_not_regenerate_darcs_stuff.patch	2011-02-20 19:05:37 UTC (rev 15816)
+++ packages/pycryptopp/trunk/debian/patches/do_not_regenerate_darcs_stuff.patch	2011-02-20 22:38:37 UTC (rev 15817)
@@ -1,9 +1,22 @@
 # upstream tarball already has all .py files generated by darcs / setuptools_darcs
 # no need to regenerate them
-Index: pycryptopp-0.5.14/setup.cfg
+Index: pycryptopp-0.5.29/setup.py
 ===================================================================
---- pycryptopp-0.5.14.orig/setup.cfg
-+++ pycryptopp-0.5.14/setup.cfg
+--- 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
@@ -16,25 +29,3 @@
 +#test = darcsver --count-all-patches test
  bdist_egg = darcsver --count-all-patches bdist_egg
  
-Index: pycryptopp-0.5.14/setup.py
-===================================================================
---- pycryptopp-0.5.14.orig/setup.py
-+++ pycryptopp-0.5.14/setup.py
-@@ -218,7 +218,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.2.0')
-+#setup_requires.append('darcsver >= 1.2.0')
- 
- # setuptools_pyflakes is needed only if you want "./setup.py flakes" to run
- # pyflakes on all the pycryptopp modules.
-@@ -230,7 +230,7 @@ if 'flakes' in sys.argv[1:]:
- # pycryptopp.egg-info/SOURCES.txt file present which contains a complete list
- # of needed files.
- # http://pypi.python.org/pypi/setuptools_darcs
--setup_requires.append('setuptools_darcs >= 1.0.5')
-+#setup_requires.append('setuptools_darcs >= 1.0.5')
- 
- data_fnames=['COPYING.GPL', 'COPYING.TGPPL.html', 'README.txt']
- 

Modified: packages/pycryptopp/trunk/debian/patches/move_testvectors_outside_site-packages.patch
===================================================================
--- packages/pycryptopp/trunk/debian/patches/move_testvectors_outside_site-packages.patch	2011-02-20 19:05:37 UTC (rev 15816)
+++ packages/pycryptopp/trunk/debian/patches/move_testvectors_outside_site-packages.patch	2011-02-20 22:38:37 UTC (rev 15817)
@@ -1,8 +1,8 @@
 # moves testvecoros (i.e. non .py files) outside site-packages
-Index: pycryptopp-0.5.14/pycryptopp/test/__init__.py
+Index: pycryptopp-0.5.29/pycryptopp/test/__init__.py
 ===================================================================
 --- /dev/null
-+++ pycryptopp-0.5.14/pycryptopp/test/__init__.py
++++ pycryptopp-0.5.29/pycryptopp/test/__init__.py
 @@ -0,0 +1,7 @@
 +import os
 +
@@ -11,10 +11,10 @@
 +
 +def resource_listdir(package_or_requirement, resource_name):
 +    return os.listdir("/usr/share/python-pycryptopp/%s" % resource_name)
-Index: pycryptopp-0.5.14/pycryptopp/test/test_aes.py
+Index: pycryptopp-0.5.29/pycryptopp/test/test_aes.py
 ===================================================================
---- pycryptopp-0.5.14.orig/pycryptopp/test/test_aes.py
-+++ pycryptopp-0.5.14/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
  
  from pycryptopp.cipher import aes
@@ -24,10 +24,10 @@
  
  from base64 import b32encode
  def ab(x): # debuggery
-Index: pycryptopp-0.5.14/pycryptopp/test/test_sha256.py
+Index: pycryptopp-0.5.29/pycryptopp/test/test_sha256.py
 ===================================================================
---- pycryptopp-0.5.14.orig/pycryptopp/test/test_sha256.py
-+++ pycryptopp-0.5.14/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
  
  from pycryptopp.hash import sha256

Modified: packages/pycryptopp/trunk/debian/rules
===================================================================
--- packages/pycryptopp/trunk/debian/rules	2011-02-20 19:05:37 UTC (rev 15816)
+++ packages/pycryptopp/trunk/debian/rules	2011-02-20 22:38:37 UTC (rev 15817)
@@ -2,16 +2,12 @@
 
 #export DH_VERBOSE=1
 
-include /usr/share/quilt/quilt.make
--include /usr/share/python/python.mk
-ifeq (,$(py_libdir))
-    py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
-endif
+include /usr/share/python/python.mk
 
 PYVERS=$(shell pyversions -vr)
 PKGDIR=$(CURDIR)/debian/python-pycryptopp
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -rf dist build build-*
@@ -20,20 +16,20 @@
 		$(PYVERS:%=install-python%) $(PYVERS:%=build-python%) \
 		$(PYVERS:%=install-debug-python%) $(PYVERS:%=build-debug-python%)
 
-build: patch build-stamp
+build: build-stamp
 
 build-stamp: $(PYVERS:%=build-python%) $(PYVERS:%=build-debug-python%)
 	touch $@
 
-build-python%: patch
+build-python%:
 	python$* setup.py build --disable-embedded-cryptopp
 	touch $@
 
-build-debug-python%: patch
+build-debug-python%:
 	python$*-dbg setup.py build --disable-embedded-cryptopp
 	touch $@
 
-install: patch $(PYVERS:%=install-python%) $(PYVERS:%=install-debug-python%)
+install: $(PYVERS:%=install-python%) $(PYVERS:%=install-debug-python%)
 	# pkg_resources is not used (see patches), no need to require setuptools
 	find $(PKGDIR)/usr/ -type f -name requires.txt -delete
 	# docs are in /usr/share/doc/python-pycryptopp/, remove duplicates
@@ -62,7 +58,7 @@
 	dh_testroot
 	dh_installchangelogs
 	dh_installdocs
-	dh_pysupport
+	dh_python2
 	dh_makeshlibs
 	dh_strip --dbg-package=python-pycryptopp-dbg
 	rm -rf $(PKGDIR)-dbg/usr/share/doc/python-pycryptopp-dbg

Modified: packages/pycryptopp/trunk/debian/source/format
===================================================================
--- packages/pycryptopp/trunk/debian/source/format	2011-02-20 19:05:37 UTC (rev 15816)
+++ packages/pycryptopp/trunk/debian/source/format	2011-02-20 22:38:37 UTC (rev 15817)
@@ -1 +1 @@
-1.0
+3.0 (quilt)

More information about the Python-modules-commits mailing list