[Python-modules-commits] [cysignals] 01/01: Discard the pkg.cysignals.pari build-profile

Jerome Benoit calculus-guest at moszumanska.debian.org
Tue Nov 1 03:47:44 UTC 2016 

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

calculus-guest pushed a commit to branch master
in repository cysignals.

commit 45cbc34f23970dd9b800a8ecb5710a29f7806a7b
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Tue Nov 1 03:21:46 2016 +0000

    Discard the pkg.cysignals.pari build-profile
---
 debian/README.source | 16 ----------------
 debian/changelog     |  8 +++++---
 debian/control       |  5 ++---
 debian/rules         | 17 -----------------
 debian/tests/check   | 11 -----------
 debian/tests/control | 10 ++--------
 6 files changed, 9 insertions(+), 58 deletions(-)

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 5e49536..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,16 +0,0 @@
-As explained in debian/README.Debian, Debian distributes `cysignals' Cython
-package in different flavours; two flavours exactly at the time of writing,
-`bare' and `pari'. Unfortunately, at the time of packaging, only the `bare'
-flavour can be supported in Debian because the involved PARI/GP material
-required for the `pari' flavour is not supported in Debian. Nevertheless,
-for development purposes, a Build-Profiles profile [1] has been implemented
-for the `pari' flavour.
-
-This approach allows us (the Debian Sage[Math] Team) to expose the cysignals
-Debian package to the unstable and testing distributions and to step forward
-in the packaging of Sage [2].
-
-[1] https://wiki.debian.org/BuildProfileSpec
-[2] https://wiki.debian.org/DebianScience/Sage
-
- -- Jerome Benoit <calculus at rezozer.net>  Mon, 03 Oct 2016 00:30:39 +0000
diff --git a/debian/changelog b/debian/changelog
index d05da96..4742619 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,15 @@
-cysignals (1.2.0+ds-2) unstable; urgency=medium
+cysignals (1.2.0+ds-2) experimental; urgency=medium
 
   * Debianization:
+    - pkg.cysignals.pari build-profile machinery, discard;
     - debian/control:
       - Depends field for pari flavour, add libpari-dev;
       - Multi-Arch field, add;
     - debian/rules;
-      - reproducible, harden.
+      - reproducible, harden;
+   - debian/README.source, discard as it is now obsolete.
 
- -- Jerome Benoit <calculus at rezozer.net>  Mon, 31 Oct 2016 16:50:31 +0000
+ -- Jerome Benoit <calculus at rezozer.net>  Tue, 01 Nov 2016 03:21:31 +0000
 
 cysignals (1.2.0+ds-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index e264f47..0693256 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
  python-all,
  python-sphinx,
  libpython-dev,
- libpari-dev (>= 2.8) <pkg.cysignals.pari>,
+ libpari-dev (>> 2.8),
  cython (>= 0.24),
  gdb
 Build-Depends-Indep:
@@ -29,12 +29,11 @@ Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/cysignals.git
 Vcs-Browser: https://anonscm.debian.org/git/python-modules/packages/cysignals.git
 
 Package: python-cysignals-pari
-Build-Profiles: <pkg.cysignals.pari>
 Provides: python-cysignals
 Conflicts: python-cysignals-bare
 Architecture: any
 Multi-Arch: same
-Depends: libpari-dev (>= 2.8), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: libpari-dev (>> 2.8), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Recommends: cysignals-tools
 Suggests: python-cysignals-doc (= ${source:Version})
 Description: interrupt and signal handling for Cython -- Python - PARI/GP
diff --git a/debian/rules b/debian/rules
index 7ce5755..175819c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-##export DEB_BUILD_PROFILES ?= pkg.cysignals.pari
-
 export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow
 
 DEB_PKG_VERSION ?= $(shell dpkg-parsechangelog -S Version)
@@ -23,27 +21,21 @@ default:
 
 override_dh_auto_configure-arch:
 	$(call adhoc_dh_auto_configure_do,bare)
-ifneq (,$(findstring pkg.cysignals.pari,$(DEB_BUILD_PROFILES)))
 	$(call adhoc_dh_auto_configure_do,pari)
-endif
 
 override_dh_auto_configure-indep:
 	$(call adhoc_dh_auto_configure_do,bare)
 
 override_dh_auto_build-arch:
 	$(call adhoc_dh_auto_build_do,bare)
-ifneq (,$(findstring pkg.cysignals.pari,$(DEB_BUILD_PROFILES)))
 	$(call adhoc_dh_auto_build_do,pari)
-endif
 
 override_dh_auto_build-indep:
 	$(call adhoc_dh_auto_build_do,bare)
 
 override_dh_auto_test-arch:
 	$(call adhoc_dh_auto_test_do,bare)
-ifneq (,$(findstring pkg.cysignals.pari,$(DEB_BUILD_PROFILES)))
 	$(call adhoc_dh_auto_test_do,pari)
-endif
 
 override_dh_auto_test-indep:
 	$(call adhoc_dh_auto_test_do,bare)
@@ -59,16 +51,7 @@ override_dh_prep-indep:
 
 override_dh_auto_install-arch:
 	$(call adhoc_dh_auto_install_do,bare)
-ifneq (,$(findstring pkg.cysignals.pari,$(DEB_BUILD_PROFILES)))
 	$(call adhoc_dh_auto_install_do,pari)
-endif
-
-override_dh_python2:
-ifeq (,$(findstring pkg.cysignals.pari,$(DEB_BUILD_PROFILES)))
-	dh_python2 -N python-cysignals-pari
-else
-	dh_python2
-endif
 
 override_dh_auto_install-indep:
 	$(call adhoc_dh_auto_install_do,bare)
diff --git a/debian/tests/check b/debian/tests/check
index 5711bd8..a174ec6 100755
--- a/debian/tests/check
+++ b/debian/tests/check
@@ -6,17 +6,6 @@ testname="$1"
 flavour="$2"
 test -n "$testname"
 
-# This is a bit hacky and not ideal; unfortunately autopkgtest is primitive and
-# will cause an error if we hard-depend on python-cysignals-pari in
-# d/tests/control but then don't actually build it.
-if [ "$flavour" = "pari" ] && ! dpkg -s python-cysignals-pari >/dev/null 2>/dev/null; then
-	echo "********************************************************************************"
-	echo "skipping test: python-cysignals-pari not installed, did you build it?"
-	echo "to build it, use \`dpkg-buildpackage -Ppkg.cysignals.pari\`"
-	echo "********************************************************************************"
-	exit 0
-fi
-
 cp -pr "/usr/share/doc/python-cysignals-doc/examples/$testname" "$ADTTMP"
 
 cd "$ADTTMP/$testname"
diff --git a/debian/tests/control b/debian/tests/control
index 8fad01b..ea37c37 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -2,16 +2,10 @@ Test-Command: debian/tests/check doctest bare
 Depends: python-cysignals-bare, cysignals-tools, python-cysignals-doc
 
 Test-Command: debian/tests/check doctest pari
-# autopkgtest is a bit primitive and doesn't support build profiles
-# TODO: rm "| xxx" in when we include pari in the main (no build-profile) build
-Depends: python-cysignals-pari | python-cysignals-bare,
- cysignals-tools, python-cysignals-doc
+Depends: python-cysignals-pari, cysignals-tools, python-cysignals-doc
 
 Test-Command: debian/tests/check example bare
 Depends: python-cysignals-bare, python-cysignals-doc, cython, libpython-dev, build-essential
 
 Test-Command: debian/tests/check example pari
-# autopkgtest is a bit primitive and doesn't support build profiles
-# TODO: rm "| xxx" in when we include pari in the main (no build-profile) build
-Depends: python-cysignals-pari | python-cysignals-bare,
- python-cysignals-doc, cython, libpython-dev, libpari-dev | coreutils, build-essential
+Depends: python-cysignals-pari, python-cysignals-doc, cython, libpython-dev, libpari-dev, build-essential

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

More information about the Python-modules-commits mailing list