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

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2008-02-20 07:21:03 +0000 (Wed, 20 Feb 2008)
New Revision: 5765

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

  * New upstream release. Closes: #441122, #449185, #458631.
  * Build with java-gcj-compat-dev instead of jikes-classpath.
  * Added Homepage, Vcs-Svn and Vcs-Browser fields.
  * Updated Standards-Version to 3.7.3.

 -- Michael Koch <konqueror at gmx.de>  Wed, 20 Feb 2008 08:16:01 +0100



Modified: trunk/cacao/debian/cacao.lintian-overrides
===================================================================
--- trunk/cacao/debian/cacao.lintian-overrides	2008-02-19 22:16:58 UTC (rev 5764)
+++ trunk/cacao/debian/cacao.lintian-overrides	2008-02-20 07:21:03 UTC (rev 5765)
@@ -4,5 +4,3 @@
 cacao: compressed-symlink-with-wrong-ext usr/lib/jvm/cacao/jre/lib/jndi.jar ../../../../../share/classpath/glibj.zip
 cacao: compressed-symlink-with-wrong-ext usr/lib/jvm/cacao/jre/lib/jdbc-stdext.jar ../../../../../share/classpath/glibj.zip
 cacao: compressed-symlink-with-wrong-ext usr/lib/jvm/cacao/jre/lib/jaas.jar ../../../../../share/classpath/glibj.zip
-cacao: shlib-with-executable-stack usr/lib/libjvm-0.96.so
-cacao: package-name-doesnt-match-sonames libjvm-0.96

Modified: trunk/cacao/debian/changelog
===================================================================
--- trunk/cacao/debian/changelog	2008-02-19 22:16:58 UTC (rev 5764)
+++ trunk/cacao/debian/changelog	2008-02-20 07:21:03 UTC (rev 5765)
@@ -1,3 +1,12 @@
+cacao (0.99~rc1-1) experimental; urgency=low
+
+  * New upstream release. Closes: #441122, #449185, #458631.
+  * Build with java-gcj-compat-dev instead of jikes-classpath.
+  * Added Homepage, Vcs-Svn and Vcs-Browser fields.
+  * Updated Standards-Version to 3.7.3.
+
+ -- Michael Koch <konqueror at gmx.de>  Wed, 20 Feb 2008 08:16:01 +0100
+
 cacao (0.98-2) unstable; urgency=low
 
   * Added patch for Debain/kFreeBSD. Closes: #396699.

Modified: trunk/cacao/debian/control
===================================================================
--- trunk/cacao/debian/control	2008-02-19 22:16:58 UTC (rev 5764)
+++ trunk/cacao/debian/control	2008-02-20 07:21:03 UTC (rev 5765)
@@ -3,12 +3,15 @@
 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.1.0), classpath (>= 2:0.95), classpath-common (>= 2:0.95), gcj, jikes-classpath, zlib1g-dev, libltdl3-dev, zip, cdbs (>= 0.4.17)
-Standards-Version: 3.7.2
+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
+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
+Homepage: http://www.cacaojvm.org/
 
 Package: cacao
 Architecture: any
-Depends: classpath (>= 2:0.95), classpath-common (>= 2:0.95), ${shlibs:Depends}
+Depends: classpath (>= 2:0.96.1), classpath-common (>= 2:0.96.1), ${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 
@@ -18,5 +21,3 @@
  other free virtual machine.)  This is because some aspects of Java
  -- such as the Swing extensions -- are not implemented by the
  free GNU Classpath libraries, which the CACAO runtime uses.
- .
-  Homepage: http://www.cacaojvm.org/

Modified: trunk/cacao/debian/rules
===================================================================
--- trunk/cacao/debian/rules	2008-02-19 22:16:58 UTC (rev 5764)
+++ trunk/cacao/debian/rules	2008-02-20 07:21:03 UTC (rev 5765)
@@ -5,12 +5,13 @@
 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="jikes-classpath"
+DEB_CONFIGURE_SCRIPT_ENV += JAVAC="/usr/lib/jvm/java-gcj/bin/javac"
 ifeq (kfreebsd,$(DEB_HOST_ARCH_OS))
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-__thread
 else
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="$(LDFLAGS) -Wl,-z,defs"
 endif
+DEB_DH_MAKESHLIBS_ARGS := -X/usr/lib/cacao
 
 binary-predeb/cacao::
 	# Move executables