[med-svn] [ball] 01/02: Use dh
Andreas Tille
tille at debian.org
Thu Jan 7 12:07:34 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository ball.
commit b361c3dc29754034e8e9eac7c91f68b10430e941
Author: Andreas Tille <tille at debian.org>
Date: Thu Jan 7 11:53:03 2016 +0100
Use dh
---
debian/changelog | 2 +
debian/rules | 109 +++++--------------------------------------------------
2 files changed, 11 insertions(+), 100 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c576766..58cfa49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ ball (1.4.3~beta1-1) UNRELEASED; urgency=medium
* Cherry-pick from upstream "Use c++11 on Clang"
* Andreas Hildebrandt does not work on the packaging any more
* cme fix dpkg-control
+ * debian/rules: use dh
+ Closes: #787888
-- Andreas Tille <tille at debian.org> Thu, 07 Jan 2016 08:47:19 +0100
diff --git a/debian/rules b/debian/rules
index b44932e..da751c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,26 +16,15 @@ BALL_INSTALL_PATH=build
PYTHON_VERSION=2.6
PYTHON_SITE_PATH=$(shell python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(0,0)[4:];")
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- #bash debian/debian-ball-install configure
+%:
+ dh $@ --buildsystem=cmake
+
+override_dh_auto_configure:
mkdir -p build
cd build && LDFLAGS="$(LDFLAGS)" CXXFLAGS="$(CXXFLAGS)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
cmake .. -DCMAKE_SOURCE_DIR=$(CURDIR) -DCMAKE_INSTALL_PREFIX=./usr -DBALL_PATH=/usr -DBALL_DATA_PATH=/usr/share/BALL-$(SOVERSION)/data
- touch $@
-
-#build: build-stamp
-#build-stamp: build-arch-stamp build-indep-stamp
-# touch $@
-
-build:
- echo "Please call either build-arch or build-indep"
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp
- dh_testdir
- #bash debian/debian-ball-install build-arch
+override_dh_auto_build-arch:
## Fix upstream issue of missing UI files
uic-qt4 source/VIEW/DIALOGS/assignBondOrderConfigurationDialog.ui > include/BALL/VIEW/UIC/ui_assignBondOrderConfigurationDialog.h
uic-qt4 source/VIEW/DIALOGS/assignBondOrderResultsDialog.ui > include/BALL/VIEW/UIC/ui_assignBondOrderResultsDialog.h
@@ -49,20 +38,11 @@ build-arch-stamp: configure-stamp
## ADD_BALL_UIFILES("VIEW/DIALOGS" "${UI_LIST}")
## needs to be called before the build code below can be started
make -C build BALL VIEW BALLView install
- touch $@
-# The arch dependent bits need to be uilt also for the independent bits
-build-indep: build-arch-stamp build-indep-stamp
-build-indep-stamp: configure-stamp
- dh_testdir
- #bash debian/debian-ball-install build-arch
+override_dh_auto_build-indep:
make -C build doc doc_tutorial install
- touch $@
-clean:
- dh_testdir
- dh_testroot
- #bash debian/debian-ball-install clean
+override_dh_auto_clean:
[ -d source ] && cd source ; \
if [ -f Makefile ] ; \
then \
@@ -87,14 +67,8 @@ clean:
include/BALL/VIEW/UIC/ui_assignBondOrderResultsDialog.h \
include/BALL/VIEW/UIC/ui_atomOverview.h
- dh_clean build-stamp configure-stamp build-arch-stamp build-indep-stamp
-
-install-arch: build-arch
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
+override_dh_auto_install-arch:
mkdir -p debian/libball$(SOVERSION)/usr/lib \
debian/libball$(SOVERSION)-data/usr/share/BALL-$(SOVERSION) \
debian/libballview$(SOVERSION)/usr/lib \
@@ -141,15 +115,7 @@ install-arch: build-arch
chrpath -d debian/ballview/usr/bin/BALLView
find debian -name "*.so" | xargs -r chrpath -d
- dh_python2 -s
- dh_sip -s
-
-install-indep: build-indep
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
+override_dh_auto_install-indep:
mkdir -p debian/libball$(SOVERSION)-doc/usr/share/doc/libball$(SOVERSION)/html \
debian/libball$(SOVERSION)-data/usr/share/BALL-$(SOVERSION)/doc
@@ -162,60 +128,3 @@ install-indep: build-indep
cp -r $(BALL_INSTALL_PATH)/usr/share/BALL/data debian/libball$(SOVERSION)-data/usr/share/BALL-$(SOVERSION)
-
- # This should already be fixed, by the debian permcheck
- #chmod ugo-x debian/libball$(SOVERSION)-data/usr/share/BALL-$(SOVERSION)/data/QSAR/*
- #chmod ugo-x debian/libball$(SOVERSION)-data/usr/share/BALL-$(SOVERSION)/data/CHARMM/charmm*
- #chmod ugo-x debian/libball$(SOVERSION)-data/usr/share/BALL-$(SOVERSION)/data/graphics/*
- ##chmod 755 debian/libball$(SOVERSION)-data/usr/share/BALL-$(SOVERSION)/data/graphics/QuEasy/
- #chmod 755 debian/libball$(SOVERSION)-data/usr/share/BALL-$(SOVERSION)/data/graphics/icons/
- #chmod ugo-x debian/libball$(SOVERSION)-data/usr/share/BALL-$(SOVERSION)/data/structures/*
- #chmod 755 debian/libball$(SOVERSION)-data/usr/share/BALL-$(SOVERSION)/data/structures/DB/
-
-
- # links shoulds become relative
- # FIXME investigate how to achieve that properly
- #ln -s ${LIBBALL_TARGET} libball$(SOVERSION)-dev/usr/lib/libBALL.so
- #ln -s ${LIBVIEW_TARGET} libballview$(SOVERSION)-dev/usr/lib/libVIEW.so
-
- dh_python2 -i
- dh_sip -i
-
-
-binary-common:
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_install
- dh_installmenu
- dh_installman
- dh_link
- dh_strip --dbg-package=ballview-dbg
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
- $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-get-orig-source:
- if [ -x /usr/bin/uscan ]; then \
- uscan --verbose --force-download ; \
- else \
- echo "uscan is not installed to perform the download." ; \
- fi
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure build-arch build-indep
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ball.git
More information about the debian-med-commit
mailing list