Merge lp:~dev-nigelj/ubuntu/oneiric/zabbix/ftbfs-20110610 into lp:ubuntu/oneiric/zabbix

[Nigel Jones]

This fixes a FTBFS and bad debian/rules behaviour that was discovered as a result of the last merge.

The issue was not apparent in pbuilder and local build tests, but previous builds have been done without patches applied, this causes the 'prepare' rule to be called at the right time, and ensure that patches are applied before building. Also runs autoconf etc which is required for a pre-existing ./configure patch.

No Ubuntu bug for the FTBFS yet, and the debian/rules patch has been sent to Debian as http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=630016

[Dave Walker (davewalker)]

Uploading/Merging with a slight change:
=== modified file 'debian/changelog'
--- debian/changelog 2011-06-10 10:44:51 +0000
+++ debian/changelog 2011-06-10 11:22:49 +0000
@@ -3,6 +3,7 @@
   * debian/rules: change 'prepare' call placement, to ensure sources are
     patched & that autotools are run before building. (Fixes FTBFS as a
     result of ldap-linker-lp722300.patch)
+
  -- Nigel Jones <email address hidden> Fri, 10 Jun 2011 22:00:28 +1200

review: Approve

[Dave Walker (davewalker)]

Rather,
=== modified file 'debian/changelog'
--- debian/changelog 2011-06-10 10:44:51 +0000
+++ debian/changelog 2011-06-10 11:29:49 +0000
@@ -3,7 +3,8 @@
   * debian/rules: change 'prepare' call placement, to ensure sources are
     patched & that autotools are run before building. (Fixes FTBFS as a
     result of ldap-linker-lp722300.patch)
- -- Nigel Jones <email address hidden> Fri, 10 Jun 2011 22:00:28 +1200
+
+ -- Nigel Jones <email address hidden> Fri, 10 Jun 2011 22:00:28 +1200

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-21 21:37:06 +0000
+++ debian/changelog	2011-06-10 10:49:26 +0000
@@ -1,3 +1,10 @@
+zabbix (1:1.8.5-1ubuntu2) oneiric; urgency=low
+
+  * debian/rules: change 'prepare' call placement, to ensure sources are
+    patched & that autotools are run before building. (Fixes FTBFS as a
+    result of ldap-linker-lp722300.patch)
+ -- Nigel Jones <[e-mail]>   Fri, 10 Jun 2011 22:00:28 +1200
+
 zabbix (1:1.8.5-1ubuntu1) oneiric; urgency=low
 
   * Merge from debian unstable (LP: #721707). Remaining changes:

=== modified file 'debian/rules'
--- debian/rules	2011-02-21 22:59:41 +0000
+++ debian/rules	2011-06-10 10:49:26 +0000
@@ -107,7 +107,7 @@
 
 # Copy the source directory (without the 'debian' directory) to other locations
 # to configure and compile the sources there for each database flavor.
-extract: prepare $(foreach s,$(VARIANTS),extract-$(s)-stamp)
+extract: $(foreach s,$(VARIANTS),extract-$(s)-stamp)
 extract-%-stamp:
 	@echo "--------------------------"
 	@echo "Copying source directory to $(BUILDDIR)-$(*) for building the $(*) variant there"
@@ -127,7 +127,7 @@
 	touch $@
 
 # Compile the flavors
-build: $(foreach s,$(VARIANTS),build-$(s)-stamp)
+build: prepare $(foreach s,$(VARIANTS),build-$(s)-stamp)
 build-%-stamp: configure-%-stamp
 	@echo "--------------------------"
 	@echo "Compiling the $(*) flavor in $(BUILDDIR)-$(*)"