[med-svn] r6816 - trunk/packages/ensembl/ensembl/62/debian

[Steffen Möller]

Author: moeller
Date: 2011-05-11 17:47:17 +0000 (Wed, 11 May 2011)
New Revision: 6816

Modified:
   trunk/packages/ensembl/ensembl/62/debian/changelog
   trunk/packages/ensembl/ensembl/62/debian/rules
Log:
Fixed building with -B for autobuilders


Modified: trunk/packages/ensembl/ensembl/62/debian/changelog
===================================================================
--- trunk/packages/ensembl/ensembl/62/debian/changelog	2011-05-11 17:20:04 UTC (rev 6815)
+++ trunk/packages/ensembl/ensembl/62/debian/changelog	2011-05-11 17:47:17 UTC (rev 6816)
@@ -1,3 +1,9 @@
+ensembl (62-2) UNRELEASED; urgency=low
+
+  * Fixed -B build for buildds
+
+ -- Steffen Moeller <moeller at debian.org>  Wed, 11 May 2011 19:46:34 +0200
+
 ensembl (62-1ubuntu1) lucid; urgency=low
 
   * Uploading to Debian PPA

Modified: trunk/packages/ensembl/ensembl/62/debian/rules
===================================================================
--- trunk/packages/ensembl/ensembl/62/debian/rules	2011-05-11 17:20:04 UTC (rev 6815)
+++ trunk/packages/ensembl/ensembl/62/debian/rules	2011-05-11 17:47:17 UTC (rev 6816)
@@ -17,6 +17,7 @@
 	touch configure-stamp
 
 build: build-indep-stamp build-arch
+
 build-arch: ensembl-variation/C_code/calc_genotypes
 ensembl-variation/C_code/calc_genotypes:
 	$(MAKE) -C ensembl-variation/C_code calc_genotypes
@@ -126,11 +127,6 @@
 	rm -rf debian/libensembl-variation-perl/usr/share/ensembl/ensembl-variation/C_code
 
 
-
-binary-arch: build-arch install-arch
-
-binary-indep: install-indep
-
 clean:
 	rm -f ensembl-variation/C_code/calc_genotypes.o ensembl-variation/C_code/calc_genotypes
 	debconf-updatepo
@@ -138,7 +134,7 @@
 		build-stamp build-indep-stamp build-arch-stamp \
 		configure-stamp 
 
-binary: binary-indep binary-arch
+binary-common:
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs
@@ -158,6 +154,15 @@
 	dh_md5sums
 	dh_builddeb
 
+binary-indep: install-indep
+	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: install-arch
+	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
+
+binary: binary-arch binary-indep
+
 get-orig-source:
 	./debian/prepare_ensembl_source_packages.sh