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

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2008-05-01 21:39:35 +0000 (Thu, 01 May 2008)
New Revision: 6385

Modified:
   trunk/cacao/debian/
   trunk/cacao/debian/changelog
   trunk/cacao/debian/control
   trunk/cacao/debian/rules
Log:
cacao (0.99~rc3-1) experimental; urgency=low

  * New upstream release.
    - fixes build issue on mips/el. Closes: #477317
  * Build-Depends on default-jdk-builddep instead of java-gcj-compat-dev.
    Closes: #477854

 -- Michael Koch <konqueror at gmx.de>  Thu, 01 May 2008 22:47:05 +0200




Property changes on: trunk/cacao/debian
___________________________________________________________________
Name: svn:ignore
   - stamp-*
*.debhelper
*.substvars
cacao
files
patched
tmp

   + stamp-*
*.debhelper
*.debhelper.log
*.substvars
cacao
files
patched
tmp


Modified: trunk/cacao/debian/changelog
===================================================================
--- trunk/cacao/debian/changelog	2008-05-01 18:59:36 UTC (rev 6384)
+++ trunk/cacao/debian/changelog	2008-05-01 21:39:35 UTC (rev 6385)
@@ -1,3 +1,12 @@
+cacao (0.99~rc3-1) experimental; urgency=low
+
+  * New upstream release.
+    - fixes build issue on mips/el. Closes: #477317
+  * Build-Depends on default-jdk-builddep instead of java-gcj-compat-dev.
+    Closes: #477854
+
+ -- Michael Koch <konqueror at gmx.de>  Thu, 01 May 2008 22:47:05 +0200
+
 cacao (0.99~rc1-1) experimental; urgency=low
 
   * New upstream release. Closes: #441122, #449185, #458631.

Modified: trunk/cacao/debian/control
===================================================================
--- trunk/cacao/debian/control	2008-05-01 18:59:36 UTC (rev 6384)
+++ trunk/cacao/debian/control	2008-05-01 21:39:35 UTC (rev 6385)
@@ -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), java-gcj-compat-dev, classpath (>= 2:0.96.1), classpath-common (>= 2:0.96.1), zlib1g-dev, libltdl3-dev, zip
+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
 Standards-Version: 3.7.3
 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-05-01 18:59:36 UTC (rev 6384)
+++ trunk/cacao/debian/rules	2008-05-01 21:39:35 UTC (rev 6385)
@@ -4,8 +4,8 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS := --with-classpath-prefix=/usr --with-classpath-includedir=/usr/include/classpath --disable-disassembler --libdir=/usr/lib/cacao
-DEB_CONFIGURE_SCRIPT_ENV += JAVAC="/usr/lib/jvm/java-gcj/bin/javac"
+DEB_CONFIGURE_EXTRA_FLAGS := --with-classpath-prefix=/usr --with-classpath-includedir=/usr/include/classpath --disable-disassembler --libdir=/usr/lib/cacao --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"
 ifeq (kfreebsd,$(DEB_HOST_ARCH_OS))
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-__thread
 else
@@ -16,7 +16,6 @@
 binary-predeb/cacao::
 	# Move executables
 	mv $(CURDIR)/debian/cacao/usr/bin/java $(CURDIR)/debian/cacao/usr/lib/jvm/cacao/bin/
-
 	# Remove unecessary directories
 	rm -rf $(CURDIR)/debian/cacao/usr/include