[libfann] 105/133: Convert debian/rules to dh syntax
Christian Kastner
chrisk-guest at moszumanska.debian.org
Sat Oct 4 21:07:53 UTC 2014
This is an automated email from the git hooks/post-receive script.
chrisk-guest pushed a commit to branch master
in repository libfann.
commit a5059b8d32cd6359d830122ac8c5f18da989d426
Author: Christian Kastner <debian at kvr.at>
Date: Sun Mar 2 11:46:42 2014 +0100
Convert debian/rules to dh syntax
Build result is nearly equivalent to the previous result, save for the location
of files in /usr/lib (now /usr/lib/<triplet>/) and the hardening includes we
get for free.
---
debian/libfann-dev.install | 8 +--
debian/libfann2.install | 2 +-
debian/rules | 130 +++++++++++++++------------------------------
3 files changed, 49 insertions(+), 91 deletions(-)
diff --git a/debian/libfann-dev.install b/debian/libfann-dev.install
index 68a175d..bcc93df 100644
--- a/debian/libfann-dev.install
+++ b/debian/libfann-dev.install
@@ -1,5 +1,5 @@
usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
-usr/lib/*.la
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
+usr/lib/*/*.la
diff --git a/debian/libfann2.install b/debian/libfann2.install
index d0dbfd1..3ddde58 100644
--- a/debian/libfann2.install
+++ b/debian/libfann2.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/rules b/debian/rules
index e14c0ed..50dce1e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,58 +4,47 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-# Standard compiler flags
-CFLAGS += -Wall
+# These get included in the build flags by debhelper
+export DEB_CFLAGS_MAINT_APPEND += -Wall
+# List of supported Python versions
PYVERS = $(shell pyversions -r -v)
-binary: binary-arch binary-indep
-build: build-arch build-indep
-install: install-arch install-indep
+%:
+ dh $@ --with autotools_dev
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- dh_autotools-dev_updateconfig
+override_dh_auto_configure-arch:
dh_auto_configure
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp
- # Perform regular build process
- dh_auto_build -a
+override_dh_auto_configure-indep:
+ # Nothing to do
+
+
+override_dh_auto_build-arch:
+ dh_auto_build
- # Build python extensions in python/
+ # Build extension for every supported Python verson
cd python; \
for py in $(PYVERS); do \
python$$py setup.py build; \
done
-build-indep: build-indep-stamp
-build-indep-stamp:
- dh_testdir
-
- # Build documentation
+override_dh_auto_build-indep:
+ # Build just the documentation
mkdir -p doc/html doc/proj
naturaldocs -i src/include -o HTML doc/html -p doc/proj
-install-arch:
- dh_testdir
- dh_testroot
- dh_prep -a
- dh_installdirs -a
- dh_auto_install -a
+override_dh_auto_install-arch:
+ dh_auto_install
# Clear .la dependency_libs as required by Policy 10.2
sed -i -e "s/dependency_libs='.*'/dependency_libs=''/" \
- debian/tmp/usr/lib/*.la
+ debian/tmp/usr/lib/*/*.la
# Install python extensions from python/, so dh_pysupport can pick them up
cd python; \
@@ -63,47 +52,15 @@ install-arch:
python$$py setup.py install -f --root $(CURDIR)/debian/python-pyfann \
--install-layout=deb; \
done
-
- dh_install -a
+ # FIXME: this builds something
+ dh_pysupport
-install-indep:
- dh_testdir
- dh_testroot
- dh_prep -i
- dh_installdirs -i
- dh_install -i
-
-
-binary-arch: build-arch install-arch
- dh_installdocs -a
- dh_installchangelogs -a
- dh_pysupport -a
-
- # Point doc of -dbg packages to their regular counterparts
- rm -rf debian/libfann-dbg/usr/share/doc/libfann-dbg
- rm -rf debian/python-pyfann-dbg/usr/share/doc/python-pyfann-dbg
- dh_link -a
- dh_compress -a
- dh_fixperms -a
+override_dh_auto_install-indep:
+ # Nothing to do
- # 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
- cd debian/python-pyfann-dbg/usr/lib/debug/usr/lib && mv pyshared pymodules
-
- dh_makeshlibs -a
- dh_shlibdeps -a
- dh_installdeb -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-
-binary-indep: build-indep install-indep
- dh_installdocs -i
- dh_installchangelogs -i
+override_dh_installexamples-indep:
dh_installexamples -i
# Copy Python examples to a subdir in examples/
@@ -123,36 +80,37 @@ binary-indep: build-indep install-indep
cp debian/README-libfann2-examples \
debian/libfann-doc/usr/share/doc/libfann-doc/examples/README
- # Don't compress example files and datasets; documentation .js
- dh_compress -i -Xexamples -Xjavascript
-
+
+override_dh_fixperms-indep:
dh_fixperms -i
# Remove unnecessary executable bits from training data sets
chmod 644 debian/libfann-doc/usr/share/doc/libfann-doc/examples/datasets/*
-
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-clean:
- dh_testdir
- dh_autotools-dev_restoreconfig
-
+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
+
+
+override_dh_compress:
+ dh_compress -Xexamples -Xjavascript
+
+
+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
- dh_clean
# Clean up Python stuff
rm -rf python/build python/pyfann/*.cxx python/pyfann/libfann.py
# Remove output generated by naturaldocs
rm -rf doc/proj doc/html
-
- # Finalize
- rm -f configure-stamp build-arch-stamp build-indep-stamp
-
-
-.PHONY: binary configure build install clean
-.PHONY: binary-arch binary-indep build-arch build-indep install-arch install-indep
--
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