Merge lp:~peter-pearse/ubuntu/natty/db4.8/prop001 into lp:ubuntu/natty/db4.8

[Peter Pearse]

Dropped java for cross builds.
Needed to awk debian/files otherwise dpkg-genchanges barfs.

Unmerged revisions

18. By Peter Pearse on 2011-04-05

No java for cross builds.

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-17 01:10:56 +0000
+++ debian/changelog	2011-04-05 15:24:42 +0000
@@ -1,3 +1,9 @@
+db4.8 (4.8.30-5ubuntu3) natty; urgency=low
+
+  * No java for cross builds
+
+ -- Peter Pearse <[e-mail]>  Tue, 05 Apr 2011 15:16:28 +0000
+
 db4.8 (4.8.30-5ubuntu2) natty; urgency=low
 
   * Build for multiarch, adding Pre-Depends: multiarch-support to the shared
 
=== modified file 'debian/rules'
--- debian/rules	2011-03-05 08:06:57 +0000
+++ debian/rules	2011-04-05 15:24:42 +0000
@@ -30,7 +30,7 @@
 CFLAGS += -mno-vsx
 endif
 
-JAVA_UNSUPPORTED_CPUS = zm32rz zhppaz zavr32z
+JAVA_UNSUPPORTED_CPUS = zm32rz zhppaz zavr32z zarmz
 JAVA_UNSUPPORTED_SYSTEMS = zgnuz zknetbsd-gnuz
 -include /usr/share/gcj/debian_defaults
 
@@ -39,7 +39,7 @@
 	TCLDIR=/usr/lib/tcl8.5
 else
         CONFIGURE_VARS = CC=$(DEB_HOST_GNU_TYPE)-gcc CXX=$(DEB_HOST_GNU_TYPE)-g++ CFLAGS="$(CFLAGS)" CPPFLAGS="-I/usr/$(DEB_HOST_GNU_TYPE)/include/tcl8.5"
-	TCLDIR=/usr/$(DEB_HOST_GNU_TYPE)/lib/tcl8.5
+	TCLDIR=/usr/$(DEB_HOST_GNU_TYPE)/lib/tcl8.5 --disable-java
 endif
 
 CONFIGURE_SWITCHES =    --prefix=/usr \
@@ -139,6 +139,7 @@
 	-rm -rf debian/tmp debian/$(package)* debian/lib$(package)* core
 	-rm -f debian/substvars.*
 	rm -rf debian/libdb*
+	-rm debian/files.org debian/files
 
 install-stamp: build
 	$(checkdir)
@@ -152,7 +153,6 @@
 
 binary-indep: checkroot build install-stamp
 	$(checkdir)
-
 	rm -rf debian/$(package)-doc
 	$(INSTALL_DIR) debian/$(package)-doc/usr/share/doc debian/$(package)-doc/DEBIAN
 
@@ -169,6 +169,14 @@
 	chmod -R ugo=rX,u+w debian/$(package)-doc
 	dpkg --build debian/$(package)-doc ..
 
+ifeq (,$(JAVA_BIiN))
+	if [ -f debian/files ];	then						 \
+		echo "No java support on this platform"				;\
+		mv debian/files debian/files.org				;\
+		awk '/java/{next;};{print;}' debian/files.org  > debian/files	;\
+        fi
+endif
+
 binary-arch: checkroot build install-stamp
 	$(checkdir)