[med-svn] r14290 - trunk/packages/phyml/trunk/debian

[Andreas Tille]

Author: tille
Date: 2013-07-31 08:59:23 +0000 (Wed, 31 Jul 2013)
New Revision: 14290

Modified:
   trunk/packages/phyml/trunk/debian/changelog
   trunk/packages/phyml/trunk/debian/control
   trunk/packages/phyml/trunk/debian/rules
Log:
Use dh more consequently to work around two different configure steps


Modified: trunk/packages/phyml/trunk/debian/changelog
===================================================================
--- trunk/packages/phyml/trunk/debian/changelog	2013-07-31 07:12:28 UTC (rev 14289)
+++ trunk/packages/phyml/trunk/debian/changelog	2013-07-31 08:59:23 UTC (rev 14290)
@@ -9,6 +9,8 @@
   * debian/control:
      - cme fix dpkg-control
      - debhelper 9
+  * debian/rules: Use dh more consequently to work around two different
+    configure steps
 
  -- Charles Plessy <plessy at debian.org>  Mon, 15 Jul 2013 09:55:11 +0900
 

Modified: trunk/packages/phyml/trunk/debian/control
===================================================================
--- trunk/packages/phyml/trunk/debian/control	2013-07-31 07:12:28 UTC (rev 14289)
+++ trunk/packages/phyml/trunk/debian/control	2013-07-31 08:59:23 UTC (rev 14290)
@@ -5,8 +5,8 @@
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               automake,
-               autoconf
+               autotools-dev,
+               dh-autoreconf
 Standards-Version: 3.9.4
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/phyml/trunk/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/phyml/trunk/

Modified: trunk/packages/phyml/trunk/debian/rules
===================================================================
--- trunk/packages/phyml/trunk/debian/rules	2013-07-31 07:12:28 UTC (rev 14289)
+++ trunk/packages/phyml/trunk/debian/rules	2013-07-31 08:59:23 UTC (rev 14290)
@@ -1,49 +1,33 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# This file is public domain software, originally written by Joey Hess. 
+# debian/rules for phyml
 
-# Pasted from Policy 4.9.1 :(but disabled parallel building).
-CFLAGS = -Wall -g
+%:
+	dh $@ --with autoreconf
 
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-    CFLAGS += -O0
-else
-    CFLAGS += -O2
-endif
-ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-    INSTALL_PROGRAM += -s
-endif
-#ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-#    NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-#    MAKEFLAGS += -j$(NUMJOBS)
-#endif
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
 
-build:
-	dh build
-
-clean:
-	dh clean
-
-binary-indep:
-	dh binary-indep
-binary-arch: 
-	dh binary-arch
-
 override_dh_auto_configure:
 override_dh_auto_build:
-	dh_testdir
-	aclocal ; autoconf -f ; automake -f ; ./configure --prefix=/usr
-	$(MAKE) CFLAGS="$(CFLAGS)"
-	$(MAKE) prefix=`pwd`/debian/`dh_listpackages`/usr install
+	# According to README you need different configure options to get different executables
+	# Here we hack in a full build process for phyml executable
+	dh_auto_configure
+	dh_auto_build
+	# move phyml binary to temporary dir inside debian/
+	$(MAKE) prefix=$(CURDIR)/debian install
 	$(MAKE) distclean
-	aclocal ; autoconf -f ; automake -f ; ./configure --prefix=/usr --enable-phytime
-	$(MAKE) CFLAGS="$(CFLAGS)"
-	$(MAKE) prefix=`pwd`/debian/`dh_listpackages`/usr install
-	touch build-stamp
+	dh_auto_configure -- --enable-phytime
+	dh_auto_build
+
 override_dh_auto_install:
+	dh_auto_install
+	# install phyml binary we have kept safe above
+	mv $(CURDIR)/debian/bin/* $(CURDIR)/debian/phyml/usr/bin
 
-override_dh_prep:
-	dh_prep -X debian/phyml
+override_dh_auto_clean:
+	dh_auto_clean
+	# remove temporary bin dir for phyml (see above hack)
+	rm -rf debian/bin
 
 override_dh_installdocs:
 	dh_installdocs
@@ -51,10 +35,3 @@
 
 override_dh_compress:
 	dh_compress --exclude=.pdf
-
-binary: binary-indep binary-arch
-
-build-arch: build
-build-indep:
-
-.PHONY: build-arch build-indep clean binary-indep binary-arch binary