[pkg-java] r7129 - trunk/cacao/debian

[doko at alioth.debian.org]

Author: doko
Date: 2008-10-11 18:34:00 +0000 (Sat, 11 Oct 2008)
New Revision: 7129

Modified:
   trunk/cacao/debian/changelog
   trunk/cacao/debian/control
   trunk/cacao/debian/rules
Log:
* Use openjdk-6 on alpha as a build dependency.


Modified: trunk/cacao/debian/changelog
===================================================================
--- trunk/cacao/debian/changelog	2008-10-11 11:07:36 UTC (rev 7128)
+++ trunk/cacao/debian/changelog	2008-10-11 18:34:00 UTC (rev 7129)
@@ -1,3 +1,9 @@
+cacao (0.99.4~20081011-2) UNRELEASED; urgency=low
+
+  * Use openjdk-6 on alpha as a build dependency.
+
+ -- Matthias Klose <doko at debian.org>  Sat, 11 Oct 2008 20:31:57 +0200
+
 cacao (0.99.4~20081011-1) unstable; urgency=low
 
   * Apply patches from the cacao-oj6 package from Ubuntu intrepid:

Modified: trunk/cacao/debian/control
===================================================================
--- trunk/cacao/debian/control	2008-10-11 11:07:36 UTC (rev 7128)
+++ trunk/cacao/debian/control	2008-10-11 18:34:00 UTC (rev 7129)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Stephan Michels <stephan at apache.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 5), cdbs (>= 0.4.17), default-jdk-builddep, classpath (>= 2:0.96.1), classpath-common (>= 2:0.96.1), zlib1g-dev, libltdl3-dev, zip, bzip2
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.17), default-jdk-builddep [!alpha], openjdk-6-jdk [alpha], classpath (>= 2:0.96.1), classpath-common (>= 2:0.96.1), zlib1g-dev, libltdl3-dev, zip, bzip2
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/cacao
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/cacao

Modified: trunk/cacao/debian/rules
===================================================================
--- trunk/cacao/debian/rules	2008-10-11 11:07:36 UTC (rev 7128)
+++ trunk/cacao/debian/rules	2008-10-11 18:34:00 UTC (rev 7129)
@@ -13,7 +13,11 @@
 	--with-jni_h=/usr/include/classpath \
 	--with-jni_md_h=/usr/include/classpath
 
-DEB_CONFIGURE_SCRIPT_ENV += JAVAC="/usr/lib/jvm/default-java/bin/javac"
+ifneq (,$(filter $(DEB_HOST_ARCH), alpha))
+  DEB_CONFIGURE_SCRIPT_ENV += JAVAC="/usr/lib/jvm/java-6-openjdk/bin/javac"
+else
+  DEB_CONFIGURE_SCRIPT_ENV += JAVAC="/usr/lib/jvm/default-java/bin/javac"
+endif
 
 ifeq (kfreebsd,$(DEB_HOST_ARCH_OS))
   DEB_CONFIGURE_EXTRA_FLAGS += --enable-__thread
@@ -46,9 +50,10 @@
 	mkdir -p $(CURDIR)/debian/$(cdbs_curpkg)/usr/src/cacao-$(upstream_version)
 	tar -c --exclude=debian --exclude=build --exclude=*.cdbs-orig --exclude=*.orig -f - . \
 	  | tar -x -C debian/$(cdbs_curpkg)/usr/src/cacao-$(upstream_version) -f -
-	cd debian/$(cdbs_curpkg)/usr/src \
+	cd debian/$(cdbs_curpkg)/usr/src/cacao-$(upstream_version) \
 	  && for i in $(CURDIR)/debian/patches/*; do \
-		echo "Reverting patch $$i; \
+		case "$$i" in *.log) continue; esac; \
+		echo "Reverting patch $$i"; \
 		patch -p1 -R --no-backup < $$i; \
 	     done
 	cd debian/$(cdbs_curpkg)/usr/src \