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

Tue Feb 25 20:09:23 UTC 2014

Date: Tuesday, February 25, 2014 @ 20:09:22
  Author: sramacher
Revision: 27929

* debian/python3-crypto{,-dbg}.install: Fix wildcards to not include debug
  extensions with arm in the name in python3-crypto. (Closes: #740086)
* Use pybuild buildsystem:
  - debian/control: Add dh-python to Build-Depends.
  - debian/rules:
    + Pass --buildsystem=pybuild to dh.
    + Remove dh_auto_clean, dh_auto_build and dh_auto_install overrides.
    + Adapt dh_auto_test override for pybuild.
* Build documention in -indep targets:
  - debian/control: Move python-docutils and python-epydoc to
    Build-Depends-Indep.
  - debian/rules: Build documentation in override_dh_auto_build-indep.
TODO: python-module-in-wrong-location (due to whitespace differences files
end up in /usr/lib/python3.4)

Modified:
  packages/python-crypto/trunk/debian/changelog
  packages/python-crypto/trunk/debian/control
  packages/python-crypto/trunk/debian/python3-crypto-dbg.install
  packages/python-crypto/trunk/debian/python3-crypto.install
  packages/python-crypto/trunk/debian/rules

Modified: packages/python-crypto/trunk/debian/changelog
===================================================================

--- packages/python-crypto/trunk/debian/changelog	2014-02-25 18:23:22 UTC (rev 27928)
+++ packages/python-crypto/trunk/debian/changelog	2014-02-25 20:09:22 UTC (rev 27929)
@@ -1,3 +1,23 @@
+python-crypto (2.6.1-4) UNRELEASED; urgency=medium
+
+  * debian/python3-crypto{,-dbg}.install: Fix wildcards to not include debug
+    extensions with arm in the name in python3-crypto. (Closes: #740086)
+  * Use pybuild buildsystem:
+    - debian/control: Add dh-python to Build-Depends.
+    - debian/rules:
+      + Pass --buildsystem=pybuild to dh.
+      + Remove dh_auto_clean, dh_auto_build and dh_auto_install overrides.
+      + Adapt dh_auto_test override for pybuild.
+  * Build documention in -indep targets:
+    - debian/control: Move python-docutils and python-epydoc to
+      Build-Depends-Indep.
+    - debian/rules: Build documentation in override_dh_auto_build-indep.
+
+  TODO: python-module-in-wrong-location (due to whitespace differences files
+  end up in /usr/lib/python3.4)
+
+ -- Sebastian Ramacher <sramacher at debian.org>  Tue, 25 Feb 2014 18:36:18 +0100
+
 python-crypto (2.6.1-3) unstable; urgency=low
 
   * debian/control:

Modified: packages/python-crypto/trunk/debian/control
===================================================================
--- packages/python-crypto/trunk/debian/control	2014-02-25 18:23:22 UTC (rev 27928)
+++ packages/python-crypto/trunk/debian/control	2014-02-25 20:09:22 UTC (rev 27929)
@@ -6,11 +6,13 @@
  Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Build-Depends:
  debhelper (>= 9),
- python-all-dev (>= 2.6.6-3~),
+ dh-python,
+ python-all-dev,
  python-all-dbg,
  libgmp-dev,
  python3-all-dev,
- python3-all-dbg,
+ python3-all-dbg
+Build-Depends-Indep:
  python-epydoc,
  python-docutils
 X-Python-Version: >= 2.1

Modified: packages/python-crypto/trunk/debian/python3-crypto-dbg.install
===================================================================
--- packages/python-crypto/trunk/debian/python3-crypto-dbg.install	2014-02-25 18:23:22 UTC (rev 27928)
+++ packages/python-crypto/trunk/debian/python3-crypto-dbg.install	2014-02-25 20:09:22 UTC (rev 27929)
@@ -1 +1 @@
-usr/lib/python3/*-packages/Crypto/*/*.cpython-*d*.so
+usr/lib/python3*/*-packages/Crypto/*/*.cpython-3[0-9]dm-*.so

Modified: packages/python-crypto/trunk/debian/python3-crypto.install
===================================================================
--- packages/python-crypto/trunk/debian/python3-crypto.install	2014-02-25 18:23:22 UTC (rev 27928)
+++ packages/python-crypto/trunk/debian/python3-crypto.install	2014-02-25 20:09:22 UTC (rev 27929)
@@ -1,6 +1,6 @@
-usr/lib/python3/*-packages/*.egg-info
-usr/lib/python3/*-packages/Crypto/*.py
-usr/lib/python3/*-packages/Crypto/*/*.py
-usr/lib/python3/*-packages/Crypto/*/*/*.py
-usr/lib/python3/*-packages/Crypto/SelfTest/*
-usr/lib/python3/*-packages/Crypto/*/*.*[!d]m*.so
+usr/lib/python3*/*-packages/*.egg-info
+usr/lib/python3*/*-packages/Crypto/*.py
+usr/lib/python3*/*-packages/Crypto/*/*.py
+usr/lib/python3*/*-packages/Crypto/*/*/*.py
+usr/lib/python3*/*-packages/Crypto/SelfTest/*
+usr/lib/python3*/*-packages/Crypto/*/*.cpython-3[0-9]m-*.so

Modified: packages/python-crypto/trunk/debian/rules
===================================================================
--- packages/python-crypto/trunk/debian/rules	2014-02-25 18:23:22 UTC (rev 27928)
+++ packages/python-crypto/trunk/debian/rules	2014-02-25 20:09:22 UTC (rev 27929)
@@ -1,52 +1,24 @@
 #!/usr/bin/make -f
 
-# Get the supported Python versions
-PYVERS = $(shell pyversions -vr)
-# Get the default Python version
-PYVERSION = $(shell pyversions -vd)
-# Get the supported Python3 versions
-PY3VERS = $(shell py3versions -vr)
-
-# Callable functions to determine the correct PYTHONPATH
-pythonpath = $$(ls -d $(CURDIR)/build/lib.*-$(1))
-pythonpath_dbg = $$(ls -d $(CURDIR)/build/lib_d.*-$(1) 2>/dev/null || ls -d $(CURDIR)/build/lib.*$(1)-pydebug)
-
 # build with -O3 (as upstream does) if noopt is not set
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 export DEB_CFLAGS_MAINT_APPEND=-O3
 endif
 
 %:
-	dh $@ --with=python2,python3
+	dh $@ --with=python2,python3 --buildsystem=pybuild
 
-override_dh_auto_clean:
-	rm -rf build
-	dh_auto_clean
-
 override_dh_clean:
 	# Keep LEGAL/copy/LICENSE.orig
 	dh_clean -XLEGAL/copy/LICENSE.orig
 
-override_dh_auto_build:
-	set -ex && for pyvers in $(PYVERS) $(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_build-indep:
+	pybuild --build -p $(shell pyversions -vd)
+	pybuild -s custom --build \
+		--build-args="env PYTHONPATH={build_dir} epydoc --config Doc/epydoc-config"
 
-override_dh_auto_install:
-	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
-
 override_dh_auto_test:
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	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
-endif
+	dh_auto_test -- -s custom --test-args="{interpreter} setup.py test"
 
 override_dh_strip:
 	dh_strip -X"python3" --dbg-package=python-crypto-dbg


