[Python-modules-commits] r21964 - in packages/python-crypto/trunk/debian (4 files)

[sramacher-guest at users.alioth.debian.org]

    Date: Monday, May 28, 2012 @ 10:08:15
  Author: sramacher-guest
Revision: 21964

* debian/compat: Bump to 9.
* debian/control: Bump Build-Dep on debhelper to >= 9.
* debian/rules:
  - Run loops with set -ex.
  - Merge Python 2 and Python 3 loops. This can be done at once.
  - Don't call dh_install twice.
  - Build documentation in override_dh_auto_build.
  - Drop the *FLAGS exports.

Modified:
  packages/python-crypto/trunk/debian/changelog
  packages/python-crypto/trunk/debian/compat
  packages/python-crypto/trunk/debian/control
  packages/python-crypto/trunk/debian/rules

Modified: packages/python-crypto/trunk/debian/changelog
===================================================================
--- packages/python-crypto/trunk/debian/changelog	2012-05-28 00:36:09 UTC (rev 21963)
+++ packages/python-crypto/trunk/debian/changelog	2012-05-28 10:08:15 UTC (rev 21964)
@@ -3,6 +3,14 @@
   * debian/patches/fix-cipher-iv-documentation.patch: Add patch from Stefano
     Rivera to document the actual behavior of the ciphers' new method with
     respect to the IV.
+  * debian/compat: Bump to 9.
+  * debian/control: Bump Build-Dep on debhelper to >= 9.
+  * debian/rules:
+    - Run loops with set -ex.
+    - Merge Python 2 and Python 3 loops. This can be done at once.
+    - Don't call dh_install twice.
+    - Build documentation in override_dh_auto_build.
+    - Drop the *FLAGS exports.
 
  -- Sebastian Ramacher <s.ramacher at gmx.at>  Mon, 28 May 2012 01:15:25 +0200
 

Modified: packages/python-crypto/trunk/debian/compat
===================================================================
--- packages/python-crypto/trunk/debian/compat	2012-05-28 00:36:09 UTC (rev 21963)
+++ packages/python-crypto/trunk/debian/compat	2012-05-28 10:08:15 UTC (rev 21964)
@@ -1 +1 @@
-8
+9

Modified: packages/python-crypto/trunk/debian/control
===================================================================
--- packages/python-crypto/trunk/debian/control	2012-05-28 00:36:09 UTC (rev 21963)
+++ packages/python-crypto/trunk/debian/control	2012-05-28 10:08:15 UTC (rev 21964)
@@ -4,9 +4,15 @@
 Maintainer: Sebastian Ramacher <s.ramacher at gmx.at>
 Uploaders: Andreas Rottmann <rotty at debian.org>,
  Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 8.1.0~), python-all-dev (>= 2.6.6-3~),
- python-all-dbg, libgmp-dev, python-epydoc, python-docutils,
- python3-all-dev, python3-all-dbg
+Build-Depends:
+ debhelper (>= 9),
+ python-all-dev (>= 2.6.6-3~),
+ python-all-dbg,
+ libgmp-dev, 
+ python3-all-dev,
+ python3-all-dbg,
+ python-epydoc,
+ python-docutils
 X-Python-Version: >= 2.1
 X-Python3-Version: >= 3.0
 Standards-Version: 3.9.3

Modified: packages/python-crypto/trunk/debian/rules
===================================================================
--- packages/python-crypto/trunk/debian/rules	2012-05-28 00:36:09 UTC (rev 21963)
+++ packages/python-crypto/trunk/debian/rules	2012-05-28 10:08:15 UTC (rev 21964)
@@ -16,10 +16,6 @@
 export DEB_CFLAGS_MAINT_APPEND=-O3
 endif
 
-export CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
-export CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
-export LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
-
 %:
 	dh $@ --with=python2,python3
 
@@ -32,31 +28,18 @@
 	dh_clean -XLEGAL/copy/LICENSE.orig
 
 override_dh_auto_build:
-	set -e && for pyvers in $(PYVERS); do \
+	set -ex && for pyvers in $(PYVERS) $(PY3VERS); do \
 		python$$pyvers setup.py build; \
 		python$$pyvers-dbg setup.py build; \
 	done
-	set -e && for pyvers in $(PY3VERS); do \
-		python$$pyvers setup.py build; \
-		python$$pyvers-dbg setup.py build; \
-	done
+	PYTHONPATH=$(call pythonpath,${PYVERSION}) epydoc --config Doc/epydoc-config
 
 override_dh_auto_install:
-	set -e && for pyvers in $(PYVERS); do \
+	set -ex && for pyvers in $(PYVERS) $(PY3VERS); do \
 		python$$pyvers setup.py install --install-layout=deb --root $(CURDIR)/debian/tmp; \
 		python$$pyvers-dbg setup.py install --install-layout=deb --root $(CURDIR)/debian/tmp; \
 	done
-	set -e && for pyvers in $(PY3VERS); do \
-		python$$pyvers setup.py install --install-layout=deb --root $(CURDIR)/debian/tmp; \
-		python$$pyvers-dbg setup.py install --install-layout=deb --root $(CURDIR)/debian/tmp; \
-	done
-	dh_install
 
-override_dh_installdocs:
-	# Build documentation
-	PYTHONPATH=$(call pythonpath,${PYVERSION}) epydoc --config Doc/epydoc-config
-	dh_installdocs
-
 override_dh_install:
 	# Install everything excluding the *_d.so/*dmu.so debug extensions to python(3)-crypto
 	dh_install -X"_d.so" -X"python3" "debian/tmp/*" -p python-crypto
@@ -69,19 +52,12 @@
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	set -e && for py in $(PYVERS); do \
+	set -ex && for py in $(PYVERS) $(PY3VERS); do \
 		PYTHONPATH=$(call pythonpath,$$py) python$$py setup.py test ;\
 		PYTHONPATH=$(call pythonpath_dbg,$$py) python$$py-dbg setup.py test ;\
 	done
-	set -e && for py in $(PY3VERS); do \
-		PYTHONPATH=$(call pythonpath,$$py) python$$py setup.py test ;\
-		PYTHONPATH=$(call pythonpath_dbg,$$py) python$$py-dbg setup.py test ;\
-	done
 endif
 
 override_dh_strip:
-# ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
 	dh_strip -X"python3" --dbg-package=python-crypto-dbg
 	dh_strip -X"python2" --dbg-package=python3-crypto-dbg
-#	cd debian/*-dbg/usr/lib/debug/usr/lib && mv pyshared pymodules
-# endif