[pkg-java] r14734 - trunk/java-access-bridge/debian

[Damien Raude-Morvan]

Author: drazzib
Date: 2011-09-06 22:02:47 +0000 (Tue, 06 Sep 2011)
New Revision: 14734

Modified:
   trunk/java-access-bridge/debian/changelog
   trunk/java-access-bridge/debian/control
   trunk/java-access-bridge/debian/rules
Log:
* d/rules: Handle both multi-arch or single-arch openjdk-{6,7},
  it should help to fix FTBFS on ia64.
* d/control: Force a Depends on openjdk-7 for [hurd-any] even
  it's not, yet, ported. Will set a Dep-Wait state for buildd.

Modified: trunk/java-access-bridge/debian/changelog
===================================================================
--- trunk/java-access-bridge/debian/changelog	2011-09-06 20:55:37 UTC (rev 14733)
+++ trunk/java-access-bridge/debian/changelog	2011-09-06 22:02:47 UTC (rev 14734)
@@ -1,3 +1,12 @@
+java-access-bridge (1.26.2-8) unstable; urgency=medium
+
+  * d/rules: Handle both multi-arch or single-arch openjdk-{6,7},
+    it should help to fix FTBFS on ia64.
+  * d/control: Force a Depends on openjdk-7 for [hurd-any] even
+    it's not, yet, ported. Will set a Dep-Wait state for buildd.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 06 Sep 2011 23:52:05 +0200
+
 java-access-bridge (1.26.2-7) unstable; urgency=low
 
   [ Niels Thykier ]

Modified: trunk/java-access-bridge/debian/control
===================================================================
--- trunk/java-access-bridge/debian/control	2011-09-06 20:55:37 UTC (rev 14733)
+++ trunk/java-access-bridge/debian/control	2011-09-06 22:02:47 UTC (rev 14734)
@@ -13,8 +13,7 @@
                libatspi-dev,
                libbonobo2-dev,
                libgtk2.0-dev,
-               openjdk-6-jdk [linux-any],
-               openjdk-7-jdk [kfreebsd-any],
+               openjdk-6-jdk [linux-any] | openjdk-7-jdk [kfreebsd-any hurd-any],
                pkg-config,
                x11-utils
 Build-Conflicts: dh-buildinfo

Modified: trunk/java-access-bridge/debian/rules
===================================================================
--- trunk/java-access-bridge/debian/rules	2011-09-06 20:55:37 UTC (rev 14733)
+++ trunk/java-access-bridge/debian/rules	2011-09-06 22:02:47 UTC (rev 14734)
@@ -5,9 +5,9 @@
 
 # Use openjdk-7 by default under kfreebsd
 ifneq (,$(filter $(DEB_HOST_ARCH), kfreebsd-amd64 kfreebsd-i386))
-  export JAVA_HOME := /usr/lib/jvm/java-1.7.0-openjdk-$(DEB_HOST_ARCH)
+  export JAVA_HOME := $(firstword $(wildcard /usr/lib/jvm/java-1.7.0-openjdk-$(DEB_HOST_ARCH) /usr/lib/jvm/java-7-openjdk))
 else
-  export JAVA_HOME := /usr/lib/jvm/java-1.6.0-openjdk-$(DEB_HOST_ARCH)
+  export JAVA_HOME := $(firstword $(wildcard /usr/lib/jvm/java-1.6.0-openjdk-$(DEB_HOST_ARCH) /usr/lib/jvm/java-6-openjdk))
 endif
 
 export PATH      := $(JAVA_HOME)/bin:$(PATH)