[med-svn] r16714 - in trunk/packages/autodocksuite/trunk/debian: . patches
Andreas Tille
tille at moszumanska.debian.org
Wed Apr 16 17:08:42 UTC 2014
Author: tille
Date: 2014-04-16 17:08:42 +0000 (Wed, 16 Apr 2014)
New Revision: 16714
Added:
trunk/packages/autodocksuite/trunk/debian/autodock.install
trunk/packages/autodocksuite/trunk/debian/autogrid.install
Modified:
trunk/packages/autodocksuite/trunk/debian/changelog
trunk/packages/autodocksuite/trunk/debian/control
trunk/packages/autodocksuite/trunk/debian/patches/make.patch
trunk/packages/autodocksuite/trunk/debian/patches/series
trunk/packages/autodocksuite/trunk/debian/rules
Log:
Mass commit: Use short dh; fix and run test suite
Added: trunk/packages/autodocksuite/trunk/debian/autodock.install
===================================================================
--- trunk/packages/autodocksuite/trunk/debian/autodock.install (rev 0)
+++ trunk/packages/autodocksuite/trunk/debian/autodock.install 2014-04-16 17:08:42 UTC (rev 16714)
@@ -0,0 +1 @@
+/usr/bin/autodock4
Added: trunk/packages/autodocksuite/trunk/debian/autogrid.install
===================================================================
--- trunk/packages/autodocksuite/trunk/debian/autogrid.install (rev 0)
+++ trunk/packages/autodocksuite/trunk/debian/autogrid.install 2014-04-16 17:08:42 UTC (rev 16714)
@@ -0,0 +1 @@
+/usr/bin/autogrid4
Modified: trunk/packages/autodocksuite/trunk/debian/changelog
===================================================================
--- trunk/packages/autodocksuite/trunk/debian/changelog 2014-04-16 12:45:04 UTC (rev 16713)
+++ trunk/packages/autodocksuite/trunk/debian/changelog 2014-04-16 17:08:42 UTC (rev 16714)
@@ -11,6 +11,10 @@
* debian/control:
- cme fix dpkg-control
- debhelper 9
+ * debian/rules:
+ - short dh
+ - fixed clean target
+ - run testsuite
-- Andreas Tille <tille at debian.org> Tue, 15 Apr 2014 18:01:38 +0200
Modified: trunk/packages/autodocksuite/trunk/debian/control
===================================================================
--- trunk/packages/autodocksuite/trunk/debian/control 2014-04-16 12:45:04 UTC (rev 16713)
+++ trunk/packages/autodocksuite/trunk/debian/control 2014-04-16 17:08:42 UTC (rev 16714)
@@ -8,7 +8,8 @@
Priority: optional
Build-Depends: debhelper (>= 9),
automake,
- csh
+ csh,
+ python
Standards-Version: 3.9.5
Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/autodocksuite/trunk/
Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/autodocksuite/trunk/
Modified: trunk/packages/autodocksuite/trunk/debian/patches/make.patch
===================================================================
--- trunk/packages/autodocksuite/trunk/debian/patches/make.patch 2014-04-16 12:45:04 UTC (rev 16713)
+++ trunk/packages/autodocksuite/trunk/debian/patches/make.patch 2014-04-16 17:08:42 UTC (rev 16714)
@@ -1,11 +1,9 @@
Description: adapt make process to Debian build environment
Author: Thorsten Alteholz <debian at alteholz.de>
Last-Update: 2013-02-16
-Index: src/autogrid/Makefile.am
-===================================================================
---- src.orig/autogrid/Makefile.am 2013-02-17 18:47:22.000000000 +0100
-+++ src/autogrid/Makefile.am 2013-02-17 18:48:18.000000000 +0100
-@@ -155,7 +155,8 @@
+--- a/autogrid/Makefile.am
++++ b/autogrid/Makefile.am
+@@ -155,7 +155,8 @@ main.o : $(srcdir)/../autodock/autocomm.
default_parameters.h : $(srcdir)/../autodock/paramdat2h.csh $(srcdir)/../autodock/AD4_parameters.dat $(srcdir)/../autodock/AD4.1_bound.dat
rm -f $@
csh $(srcdir)/../autodock/paramdat2h.csh $(srcdir)/../autodock/AD4_parameters.dat $(srcdir)/../autodock/AD4.1_bound.dat > $@
Modified: trunk/packages/autodocksuite/trunk/debian/patches/series
===================================================================
--- trunk/packages/autodocksuite/trunk/debian/patches/series 2014-04-16 12:45:04 UTC (rev 16713)
+++ trunk/packages/autodocksuite/trunk/debian/patches/series 2014-04-16 17:08:42 UTC (rev 16714)
@@ -1,3 +1,2 @@
-#does not work?!?#make.patch
-#MoreConst_2013_1.patch
-#MoreConst_2013_2.patch
+make.patch
+fix_test_outputdir.patch
Modified: trunk/packages/autodocksuite/trunk/debian/rules
===================================================================
--- trunk/packages/autodocksuite/trunk/debian/rules 2014-04-16 12:45:04 UTC (rev 16713)
+++ trunk/packages/autodocksuite/trunk/debian/rules 2014-04-16 17:08:42 UTC (rev 16714)
@@ -1,132 +1,68 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-export DH_OPTIONS
-
-SHELL := /bin/bash
-
-CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
-CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
-CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
-LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
-
-
-CXX=g++
-CC=gcc
-#CXX=/usr/lib/gcc-snapshot/bin/g++
-#CC=/usr/lib/gcc-snapshot/bin/gcc
-
# see http://www.gentoo.org/proj/en/qa/asneeded.xml
-LDFLAGS+="-Wl,--as-needed"
+LDFLAGS+=-Wl,--as-needed
-CFLAGS += -Wall -g
-
# link time optimisation - as soon as gcc-4.5 hits the archive
# 20.02.2013, ta, does not really work yet
#CFLAGS += -flto
#LDFLAGS += -flto
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
+SAVEFILES=Makefile.in aclocal.m4 config.guess config.sub configure
-CFLAGS += -Winline -finline-functions
+%:
+ dh $@
-# the suggested const is not working sufficiently, for gcc-4.6 and higher
-#CFLAGS += -Wsuggest-attribute=const
+override_dh_auto_configure:
+ mkdir -p debian/autodock_save
+ cd autodock && cp -a $(SAVEFILES) ../debian/autodock_save && autoreconf -i
+ dh_auto_configure --sourcedirectory=autodock
+ mkdir -p debian/autogrid_save
+ cd autogrid && cp -a $(SAVEFILES) ../debian/autogrid_save && autoreconf -i
+ dh_auto_configure --sourcedirectory=autogrid
-CXXFLAGS+=$(CFLAGS)
+override_dh_auto_build:
+ dh_auto_build --sourcedirectory=autodock
+ dh_auto_build --sourcedirectory=autogrid
-configure: configure-stamp
-configure-stamp: $(QUILT_STAMPFN)
- dh_testdir
- set -e; \
- for d in autodock autogrid; do \
- ( cd $$d && autoreconf -i && ./configure CC="$(CC)" CXX="$(CXX)" LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" --prefix=/usr ) \
- done
- touch configure-stamp
+override_dh_auto_clean:
+ dh_auto_clean --sourcedirectory=autodock
+ dh_auto_clean --sourcedirectory=autogrid
+ rm -rf autodock/usr autogrid/usr
+ rm -rf autodock/compile autogrid/compile
+ rm -rf autogrid/mingw_* autogrid/parse_param_line.* autogrid/printdate.* autogrid/printhms.* autogrid/read_parameter_library* autogrid/stop.* autogrid/timesys*
+ if [ -d debian/autodock_save ] ; then mv debian/autodock_save/* autodock; rmdir debian/autodock_save ; fi
+ if [ -d debian/autogrid_save ] ; then mv debian/autogrid_save/* autogrid; rmdir debian/autogrid_save ; fi
+ # remove test results
+ rm -rf autodock/Tests/popfile autodock/Tests/test_1pgp*.dlg
+ rm -rf autodock_testresults
+ rm -rf autogrid/Tests/hsg1_sm.*.map autogrid/Tests/hsg1_sm.glg autogrid/Tests/hsg1_sm.maps* autogrid/Tests/test_x1* autogrid/Tests/x1hpv.*.map autogrid/Tests/x1hpv.maps.*
+ rm -rf autogrid_testresults
+ find . -name "*.pyc" -delete
-build: build-arch build-indep
+override_dh_auto_test:
+ dh_auto_test --sourcedirectory=autodock
+ dh_auto_test --sourcedirectory=autogrid
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp
- set -e; \
- pwd; \
- for d in autodock autogrid; do $(MAKE) -C $$d; done
- touch $@
-
-build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp
- # Add here commands to compile the indep part of the package.
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-arch-stamp build-indep-stamp configure-stamp
- for d in autodock autogrid; \
- do \
- if [ -r $$d/Makefile ]; then $(MAKE) -C $$d distclean; fi \
- done
- dh_clean configure-stamp
-
-install: install-indep install-arch
-install-indep:
- dh_testdir
- dh_testroot
- dh_prep -i
- dh_installdirs -i
+override_dh_install-indep:
dh_install -i
rm -rf $(CURDIR)/debian/autodock-test/usr/share/autodock/Tests/AutoDockTools
rm -rf $(CURDIR)/debian/autogrid-test/usr/share/autogrid/Tests/CVS/
rm -rf $(CURDIR)/debian/autodock-test/usr/share/autodock/Tests/CVS/
+
+override_dh_fixperms:
+ dh_fixperms
chmod 644 $(CURDIR)/debian/autodock-test/usr/share/autodock/Tests/*
chmod 644 $(CURDIR)/debian/autogrid-test/usr/share/autogrid/Tests/*
-install-arch:
- dh_testdir
- dh_testroot
- dh_prep -s
- dh_installdirs -s
+override_dh_auto_install-arch:
+ dh_auto_install --sourcedirectory=autodock
+ dh_auto_install --sourcedirectory=autogrid
- for d in autodock autogrid; do \
- $(MAKE) -C $$d DESTDIR=$(CURDIR)/debian/$$d install; \
- done
- dh_install -s
-
-binary-common:
- dh_testdir
- dh_testroot
- dh_lintian
+override_dh_installchangelogs:
dh_installchangelogs autodock/RELEASENOTES
- dh_installdocs
- dh_installexamples
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-binary-indep: build-indep install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-binary-arch: build-arch install-arch
- $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-binary: binary-arch binary-indep
-
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
-
get-orig-source:
mkdir -p ../tarballs
uscan --verbose --force-download --destdir=../tarballs
More information about the debian-med-commit
mailing list