[libfann] 10/34: d/rules: Drop Python build stuff

Christian Kastner chrisk-guest at moszumanska.debian.org
Thu Oct 1 18:06:20 UTC 2015


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

chrisk-guest pushed a commit to branch master
in repository libfann.

commit 630fcb2c353e4d13ae292c3b572fff2a46290118
Author: Christian Kastner <ckk at kvr.at>
Date:   Thu Oct 1 11:01:08 2015 +0200

    d/rules: Drop Python build stuff
---
 debian/rules | 49 ++++++-------------------------------------------
 1 file changed, 6 insertions(+), 43 deletions(-)

diff --git a/debian/rules b/debian/rules
index 7359eb6..4cfc2f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,16 +7,13 @@
 # These get included in the build flags by debhelper
 export DEB_CFLAGS_MAINT_APPEND = -Wall
 
-# For pybuild
-export PYBUILD_NAME=pyfann
-
 # For get-orig-source
 PKGDIR := $(dir $(firstword $(MAKEFILE_LIST)))..
 UPVER := $(shell dpkg-parsechangelog -l$(PKGDIR)/debian/changelog -S Version | \
 		sed -re 's/\+ds-.*//')
 
 %:
-	dh $@ --with autoreconf,python2
+	dh $@ --with autoreconf
 
 
 override_dh_autoreconf:
@@ -34,12 +31,6 @@ override_dh_auto_configure-indep:
 override_dh_auto_build-arch:
 	# Library
 	dh_auto_build
-	# Python extension. Must be run twice, because distutils runs build_py
-	# before build_ext, but build_py relies on output from build_ext (from
-	# SWIG), and the order cannot be changed. This is a known issue, see
-	# http://bugs.python.org/issue7562
-	dh_auto_build --buildsystem=pybuild --sourcedirectory=python
-	dh_auto_build --buildsystem=pybuild --sourcedirectory=python
 
 
 override_dh_auto_build-indep:
@@ -50,28 +41,16 @@ override_dh_auto_build-indep:
 
 override_dh_auto_test-arch:
 	# Simulate partial autopkgtest run by providing an ADTTMP and setting
-	# CPATH/LIBRARY_PATH/LD_LIBRARY_PATH for the build test, and
-	# LD_LIBRARY_PATH/PYTHONPATH for the Python test.
-	#
-	# We don't create a separate $ADTTMP for all of the tests because it
-	# is not possible -- we only have one Pybuild command, but it may
-	# perform tests for more than one version, so we just manually clean it
-	# before each test using PYBUILD_BEFORE_TEST.
+	# CPATH/LIBRARY_PATH/LD_LIBRARY_PATH for the build test
 	testrundir=$$(mktemp -d) ;\
 		ADTTMP=$$testrundir \
 		CPATH=$(CURDIR)/src/include \
 		LIBRARY_PATH=$(CURDIR)/src/.libs \
 		LD_LIBRARY_PATH=$(CURDIR)/src/.libs \
 	/bin/sh $(CURDIR)/debian/tests/build ;\
-	[ $$? -eq 0 ] || exit 1 ;\
-	\
-		ADTTMP=$$testrundir \
-		LD_LIBRARY_PATH=$(CURDIR)/src/.libs \
-		PYBUILD_SYSTEM=custom \
-		PYBUILD_BEFORE_TEST="cd $$ADTTMP && rm -rf *" \
-		PYBUILD_TEST_ARGS="PYINTERPRETER={interpreter} /bin/sh $(CURDIR)/debian/tests/python-build" ;\
-	du_auto_test --buildsystem=pybuild ;\
-	rm -rf "$$testrundir"
+	res=$$? ;\
+	rm -rf "$$testrundir" ;\
+	exit $$res
 
 
 override_dh_auto_test-indep:
@@ -85,9 +64,6 @@ override_dh_auto_install-arch:
 	# Clear .la dependency_libs as required by Policy 10.2
 	sed -i -e "s/dependency_libs='.*'/dependency_libs=''/" \
 		debian/tmp/usr/lib/*/*.la
-	
-	# Python extension
-	dh_auto_install --buildsystem=pybuild --sourcedirectory=python
 
 
 override_dh_auto_install-indep:
@@ -101,16 +77,11 @@ override_dh_install:
 override_dh_installexamples-indep:
 	dh_installexamples -i
 	
-	# Copy Python examples to a subdir in examples/
-	cp -r python/examples \
-		debian/libfann-doc/usr/share/doc/libfann-doc/examples/python
-	
 	# Modify dataset paths in examples to point to libfann-doc datasets. This
 	# was not implemented as a patch to upstream to preserve the ability to
 	# run upstream's own tests within the source dir.
 	sed -i -r -f debian/example-paths.sed \
-		debian/libfann-doc/usr/share/doc/libfann-doc/examples/*.c \
-		debian/libfann-doc/usr/share/doc/libfann-doc/examples/python/*.py
+		debian/libfann-doc/usr/share/doc/libfann-doc/examples/*.c
 	
 	# Add Makefile & compile/run instructions for the examples
 	cp debian/Makefile.examples \
@@ -128,7 +99,6 @@ override_dh_fixperms-indep:
 override_dh_link:
 	# dh_link does not remove pre-existing destination dirs, only files
 	rm -rf debian/libfann-dbg/usr/share/doc/libfann-dbg
-	rm -rf debian/python-pyfann-dbg/usr/share/doc/python-pyfann-dbg
 	dh_link
 
 
@@ -140,19 +110,12 @@ override_dh_strip:
 	# Can't use --dbg-package because we have multiple debug packages
 	dh_strip -k -a
 	mv debian/libfann2/usr/lib/debug debian/libfann-dbg/usr/lib
-	mv debian/python-pyfann/usr/lib/debug debian/python-pyfann-dbg/usr/lib
 
 
 override_dh_auto_clean:
 	# Perform regular clean process
 	dh_auto_clean
 	
-	# Python clean
-	dh_auto_clean --buildsystem=pybuild --sourcedirectory=python
-	
-	# SWIG stuff
-	rm -rf python/pyfann/pyfann_wrap.cpp python/pyfann/libfann.py
-	
 	# Remove output generated by naturaldocs
 	rm -rf doc/proj doc/html
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libfann.git



More information about the debian-science-commits mailing list