[Python-modules-commits] [pyasn1] 02/02: Switch to pybuild

[Vincent Bernat]

This is an automated email from the git hooks/post-receive script.

bernat pushed a commit to branch master
in repository pyasn1.

commit 84124b34493a30ed206170c1a62ae5ab83937199
Author: Vincent Bernat <vincent at bernat.im>
Date:   Sat Sep 10 14:28:32 2016 +0200

    Switch to pybuild
    
    Far simpler. Everything works out-of-the box  (including tests)
---
 debian/changelog              |  4 ++--
 debian/control                |  3 +--
 debian/pypy-pyasn1.install    |  1 -
 debian/python-pyasn1.install  |  1 -
 debian/python3-pyasn1.install |  1 -
 debian/rules                  | 54 +++----------------------------------------
 6 files changed, 6 insertions(+), 58 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cef484f..75e7c2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,8 @@ pyasn1 (0.1.9-2) unstable; urgency=medium
   * Fixed VCS URL (https)
 
   [ Vincent Bernat ]
-  * Fix FTBFS due to a target having both ":" and "::" variants.
-    Closes: #837025.
+  * Switch to pybuild for build. It's far easier to get proper pypy
+    support this way.  This happens to closes: #837025 (FTBFS).
 
  -- Vincent Bernat <bernat at debian.org>  Sat, 10 Sep 2016 14:22:55 +0200
 
diff --git a/debian/control b/debian/control
index e0d2ea8..1dd201e 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,7 @@ Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.o
            Vincent Bernat <bernat at debian.org>,
            Tristan Seligmann <mithrandi at debian.org>
 Standards-Version: 3.9.8
-Build-Depends: cdbs (>= 0.4.90~),
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                dh-python,
                pypy,
                python-all (>= 2.6.6-3~),
diff --git a/debian/pypy-pyasn1.install b/debian/pypy-pyasn1.install
deleted file mode 100644
index 39cee25..0000000
--- a/debian/pypy-pyasn1.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/pypy*
diff --git a/debian/python-pyasn1.install b/debian/python-pyasn1.install
deleted file mode 100644
index e2e74a3..0000000
--- a/debian/python-pyasn1.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/python2*
diff --git a/debian/python3-pyasn1.install b/debian/python3-pyasn1.install
deleted file mode 100644
index c97e193..0000000
--- a/debian/python3-pyasn1.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/python3*
diff --git a/debian/rules b/debian/rules
index ef72aa1..e8a6ae7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,55 +1,7 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
+export PYBUILD_NAME=pyasn1
 
-# pypy binary package
-pypy_package = pypy-pyasn1
-
-# Install egg-info directories
-DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed \
-	--install-layout=deb
-
-# hook pypy-pyasn1 into existing cdbs build stage
-build/$(pypy_package):: build/%: debian/python-module-stampdir/%
-debian/python-module-stampdir/$(pypy_package)::
-	cd $(cdbs_python_distutils_srcdir) && \
-		pypy $(cdbs_python_setup_cmd) build \
-		$(cdbs_python_build_args)
-	touch $@
-
-# hook pypy-pyasn1 into existing cdbs install stage
-install/$(pypy_package)::
-	cd $(cdbs_python_distutils_srcdir) && \
-		pypy $(cdbs_python_setup_cmd) install \
-		--root="$(cdbs_python_destdir)" \
-		--install-purelib=$(call cdbs_expand_python_distutils_installdir,pypy) \
-		$(cdbs_python_install_args)
-
-# hook in binary-post-install to invoke dh_pypy to calculate
-# dependencies, add maintainer script and byte compile files.
-binary-post-install/$(pypy_package):: binary-post-install/%: binary-install-python/%
-binary-install-python/$(pypy_package):: binary-install-python/%: binary-install/%
-	dh_pypy -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_PYTHONHELPER_ARGS) $(call cdbs_expand_curvar, DEB_PYTHON_PRIVATE_MODULE_DIRS)
-
-python-module-clean/$(pypy_package)::
-	-cd $(cdbs_python_distutils_srcdir) && \
-		pypy $(cdbs_python_setup_cmd) clean \
-		$(cdbs_python_clean_args)
-
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-install/python-pyasn1 install/python3-pyasn1::
-	set -e; cd test; for buildver in $(cdbs_curpythonbuildversions); do \
-        echo "I: Running pyasn1 unittests using python$$buildver"; \
-        pd=$$(/bin/ls -d $(CURDIR)/build/$(if $(filter $(cdbs_curpythonstem),3),lib,lib.*-$$buildver)) && \
-        PYTHONPATH=$$pd $(call cdbs_python_binary,python$$buildver) suite.py; \
-    done
-
-install/pypy-pyasn1::
-	set -e; cd test; \
-        echo "I: Running pyasn1 unittests using pypy"; \
-        pd=$$(/bin/ls -d $(CURDIR)/build/lib) && \
-        PYTHONPATH=$$pd pypy suite.py; \
-    done
-endif
+%:
+	dh $@ --with python2,python3,pypy --buildsystem=pybuild

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyasn1.git