r2194 - trunk/cacao/debian

Michael Koch mkoch at costa.debian.org
Thu Jun 8 05:52:09 UTC 2006 

Author: mkoch
Date: 2006-06-08 05:52:07 +0000 (Thu, 08 Jun 2006)
New Revision: 2194

Modified:
   trunk/cacao/debian/
   trunk/cacao/debian/cacao.dirs
   trunk/cacao/debian/cacao.links
   trunk/cacao/debian/cacao.lintian-overrides
   trunk/cacao/debian/changelog
   trunk/cacao/debian/control
   trunk/cacao/debian/rules
Log:
cacao (0.96-1) unstable; urgency=low

  * Acknowledge NMU (Closes: #367502, #370044).
  * Updated (Build-)Depends to classpath 0.91.
  * Added some more lintian overrides to cacao.lintian-overrides.
  * Moved executables provided by cacao instead of symlinking.
  * Added symlink for tools.jar.
  * Updated Standards-Version to 3.7.2.

 -- Michael Koch <konqueror at gmx.de>  Wed,  7 Jun 2006 20:47:38 +0000

cacao (0.96-0.1) unstable; urgency=high

  * Non-maintainer upload.
  * New upstream release.
    * Supports GNU Classpath 0.91; fixes FTBFS. (Closes: #367502)
    * Give /usr/include/classpath for Classpath include files to
      configure.
    * Bump the versioned build-dependency on Classpath to 2:0.91-3, as
      the include path change appeared there.

 -- Steinar H. Gunderson <sesse at debian.org>  Fri,  2 Jun 2006 23:03:47 +0200




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


Modified: trunk/cacao/debian/cacao.dirs
===================================================================
--- trunk/cacao/debian/cacao.dirs	2006-06-06 10:52:49 UTC (rev 2193)
+++ trunk/cacao/debian/cacao.dirs	2006-06-08 05:52:07 UTC (rev 2194)
@@ -1,5 +1,6 @@
 usr/lib/jvm/cacao/bin
 usr/lib/jvm/cacao/include/linux
+usr/lib/jvm/cacao/lib
 usr/lib/jvm/cacao/man/man1
 usr/lib/jvm/cacao/jre/bin
 usr/lib/jvm/cacao/jre/lib

Modified: trunk/cacao/debian/cacao.links
===================================================================
--- trunk/cacao/debian/cacao.links	2006-06-06 10:52:49 UTC (rev 2193)
+++ trunk/cacao/debian/cacao.links	2006-06-08 05:52:07 UTC (rev 2194)
@@ -4,7 +4,6 @@
 usr/bin/javap usr/lib/jvm/cacao/bin/javap
 usr/bin/javadoc usr/lib/jvm/cacao/bin/javadoc
 usr/bin/jar usr/lib/jvm/cacao/bin/jar
-usr/bin/rmic usr/lib/jvm/cacao/bin/rmic
 usr/lib/jvm/cacao/jre/bin/rmiregistry usr/lib/jvm/cacao/bin/rmiregistry
 usr/bin/serialver usr/lib/jvm/cacao/bin/serialver
 usr/lib/jvm/cacao/jre/bin/javaw usr/lib/jvm/cacao/bin/javaw
@@ -23,6 +22,8 @@
 usr/bin/rmiregistry usr/lib/jvm/cacao/jre/bin/rmiregistry
 usr/lib/jvm/cacao/jre/bin/java usr/lib/jvm/cacao/jre/bin/javaw
 
+usr/share/classpath/tools.zip usr/lib/jvm/cacao/lib/tools.jar
+
 usr/share/classpath/glibj.zip usr/lib/jvm/cacao/jre/lib/jaas.jar
 usr/share/classpath/glibj.zip usr/lib/jvm/cacao/jre/lib/jdbc-stdext.jar
 usr/share/classpath/glibj.zip usr/lib/jvm/cacao/jre/lib/jndi.jar

Modified: trunk/cacao/debian/cacao.lintian-overrides
===================================================================
--- trunk/cacao/debian/cacao.lintian-overrides	2006-06-06 10:52:49 UTC (rev 2193)
+++ trunk/cacao/debian/cacao.lintian-overrides	2006-06-08 05:52:07 UTC (rev 2194)
@@ -1,3 +1,4 @@
+cacao: compressed-symlink-with-wrong-ext usr/lib/jvm/cacao/lib/tools.jar ../../../../share/classpath/tools.zip
 cacao: compressed-symlink-with-wrong-ext usr/lib/jvm/cacao/jre/lib/jsse.jar ../../../../../share/classpath/glibj.zip
 cacao: compressed-symlink-with-wrong-ext usr/lib/jvm/cacao/jre/lib/rt.jar ../../../../../share/classpath/glibj.zip
 cacao: compressed-symlink-with-wrong-ext usr/lib/jvm/cacao/jre/lib/jndi.jar ../../../../../share/classpath/glibj.zip
@@ -3,2 +4,4 @@
 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	2006-06-06 10:52:49 UTC (rev 2193)
+++ trunk/cacao/debian/changelog	2006-06-08 05:52:07 UTC (rev 2194)
@@ -1,3 +1,26 @@
+cacao (0.96-1) unstable; urgency=low
+
+  * Acknowledge NMU (Closes: #367502, #370044).
+  * Updated (Build-)Depends to classpath 0.91.
+  * Added some more lintian overrides to cacao.lintian-overrides.
+  * Moved executables provided by cacao instead of symlinking.
+  * Added symlink for tools.jar.
+  * Updated Standards-Version to 3.7.2.
+
+ -- Michael Koch <konqueror at gmx.de>  Wed,  7 Jun 2006 20:47:38 +0000
+
+cacao (0.96-0.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * New upstream release.
+    * Supports GNU Classpath 0.91; fixes FTBFS. (Closes: #367502)
+    * Give /usr/include/classpath for Classpath include files to
+      configure.
+    * Bump the versioned build-dependency on Classpath to 2:0.91-3, as
+      the include path change appeared there.
+
+ -- Steinar H. Gunderson <sesse at debian.org>  Fri,  2 Jun 2006 23:03:47 +0200
+
 cacao (0.95-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/cacao/debian/control
===================================================================
--- trunk/cacao/debian/control	2006-06-06 10:52:49 UTC (rev 2193)
+++ trunk/cacao/debian/control	2006-06-08 05:52:07 UTC (rev 2194)
@@ -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 (>= 0.19), classpath-common (>= 0.19), gcj, jikes-classpath, zlib1g-dev, binutils-dev, libltdl3-dev, zip, cdbs (>= 0.4.17)
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 4.0.0), classpath (>= 2:0.91), classpath-common (>= 2:0.91), gcj, jikes-classpath, zlib1g-dev, binutils-dev, libltdl3-dev, zip, cdbs (>= 0.4.17)
+Standards-Version: 3.7.2
 
 Package: cacao
 Architecture: any
-Depends: classpath (>= 0.19), classpath-common (>= 0.19), ${shlibs:Depends}
+Depends: classpath (>= 2:0.91), classpath-common (>= 2:0.91), ${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	2006-06-06 10:52:49 UTC (rev 2193)
+++ trunk/cacao/debian/rules	2006-06-08 05:52:07 UTC (rev 2194)
@@ -4,14 +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
+DEB_CONFIGURE_EXTRA_FLAGS := --with-classpath-prefix=/usr --with-classpath-includedir=/usr/include/classpath
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="$(LDFLAGS) -Wl,-z,defs" \
         JAVAC="jikes-classpath"
 
 binary-predeb/cacao::
-	# Remove files, which conflicts with other programs
-	rm $(CURDIR)/debian/cacao/usr/bin/rmiregistry
-	rm $(CURDIR)/debian/cacao/usr/bin/java
+	# 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

More information about the pkg-java-commits mailing list