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

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2007-06-27 10:09:10 +0000 (Wed, 27 Jun 2007)
New Revision: 3748

Modified:
   trunk/cacao/debian/changelog
   trunk/cacao/debian/control
   trunk/cacao/debian/rules
Log:
cacao (0.98-1) unstable; urgency=low

  * New upstream release (Closes: #428600)
    - obsoleted debian/patches/cacao-freebsd.patch.
    - fix boehm-gc on kfreebsd/amd64 (Closes: #396699).

 -- Michael Koch <konqueror at gmx.de>  Wed, 27 Jun 2007 07:47:54 +0200



Modified: trunk/cacao/debian/changelog
===================================================================
--- trunk/cacao/debian/changelog	2007-06-26 18:49:22 UTC (rev 3747)
+++ trunk/cacao/debian/changelog	2007-06-27 10:09:10 UTC (rev 3748)
@@ -1,3 +1,39 @@
+cacao (0.98-1) unstable; urgency=low
+
+  * New upstream release (Closes: #428600)
+    - obsoleted debian/patches/cacao-freebsd.patch.
+    - fix boehm-gc on kfreebsd/amd64 (Closes: #396699).
+
+ -- Michael Koch <konqueror at gmx.de>  Wed, 27 Jun 2007 07:47:54 +0200
+
+cacao (0.97-4) unstable; urgency=low
+
+  * Updated debian/patches/cacao-freebsd.patch to fix more kfreebsd
+    issues. Patch by Petr Salinger (Closes #396699).
+
+ -- Michael Koch <konqueror at gmx.de>  Mon, 15 Jan 2007 22:09:49 +0100
+
+cacao (0.97-3) unstable; urgency=low
+
+  * Increased (Build-)Depends on classpath to 2:0.92 (Closes: #400172).
+  * Added support for kfreebsd in debian/rules and added
+    debian/patches/cacao-freebsd.patch. Based on patch by Petr Salinger.
+    (Closes: #396699)
+
+ -- Michael Koch <konqueror at gmx.de>  Mon, 15 Jan 2007 08:40:46 +0100
+
+cacao (0.97-2) unstable; urgency=low
+
+  * Configure with --libdir=/usr/lib/cacao.
+
+ -- Michael Koch <konqueror at gmx.de>  Sun,  5 Nov 2006 17:56:16 +0100
+
+cacao (0.97-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Michael Koch <konqueror at gmx.de>  Tue, 31 Oct 2006 22:20:11 +0100
+
 cacao (0.96-2) unstable; urgency=low
 
   * debian/control: Don't Build-Depends on binutils-dev (Closes: #375657).

Modified: trunk/cacao/debian/control
===================================================================
--- trunk/cacao/debian/control	2007-06-26 18:49:22 UTC (rev 3747)
+++ trunk/cacao/debian/control	2007-06-27 10:09:10 UTC (rev 3748)
@@ -3,12 +3,12 @@
 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 (>= 4.0.0), classpath (>= 2:0.91), classpath-common (>= 2:0.91), gcj, jikes-classpath, zlib1g-dev, libltdl3-dev, zip, cdbs (>= 0.4.17)
+Build-Depends: debhelper (>= 4.1.0), classpath (>= 2:0.92), classpath-common (>= 2:0.92), gcj, jikes-classpath, zlib1g-dev, libltdl3-dev, zip, cdbs (>= 0.4.17)
 Standards-Version: 3.7.2
 
 Package: cacao
 Architecture: any
-Depends: classpath (>= 2:0.91), classpath-common (>= 2:0.91), ${shlibs:Depends}
+Depends: classpath (>= 2:0.92), classpath-common (>= 2:0.92), ${shlibs:Depends}
 Description: Java virtual machine
  CACAO is a free virtual machine for running Java programs
  It has a state-of-the-art optimizing JIT compiler, with 

Modified: trunk/cacao/debian/rules
===================================================================
--- trunk/cacao/debian/rules	2007-06-26 18:49:22 UTC (rev 3747)
+++ trunk/cacao/debian/rules	2007-06-27 10:09:10 UTC (rev 3748)
@@ -4,17 +4,17 @@
 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
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="$(LDFLAGS) -Wl,-z,defs" \
-        JAVAC="jikes-classpath"
+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="jikes-classpath"
+ifeq (kfreebsd,$(DEB_HOST_ARCH_OS))
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-__thread
+else
+DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="$(LDFLAGS) -Wl,-z,defs"
+endif
 
 binary-predeb/cacao::
 	# Move executables
 	mv $(CURDIR)/debian/cacao/usr/bin/java $(CURDIR)/debian/cacao/usr/lib/jvm/cacao/bin/
-	mv $(CURDIR)/debian/cacao/usr/bin/jarsigner $(CURDIR)/debian/cacao/usr/lib/jvm/cacao/bin/
-	mv $(CURDIR)/debian/cacao/usr/bin/keytool $(CURDIR)/debian/cacao/usr/lib/jvm/cacao/bin/
-	mv $(CURDIR)/debian/cacao/usr/bin/rmic $(CURDIR)/debian/cacao/usr/lib/jvm/cacao/bin/
-	mv $(CURDIR)/debian/cacao/usr/bin/rmiregistry $(CURDIR)/debian/cacao/usr/lib/jvm/cacao/jre/bin/
 
 	# Remove unecessary directories
 	rm -rf $(CURDIR)/debian/cacao/usr/include