Bug#370044: diff for 0.96-0.1 NMU

[Steinar H. Gunderson]

Package: cacao
Version: 0.95-1
Severity: normal
Tags: patch

Hi,

Attached is the diff for my cacao 0.96-0.1 NMU. Note that this is the
packaging diff only; the upstream diff from 0.95 to 0.96 is of course not
included.

-- 
Homepage: http://www.sesse.net/
-------------- next part --------------
diff -Nru /tmp/wG5xa1GxUp/cacao-0.95/debian/changelog /tmp/RyVg63NZfs/cacao-0.96/debian/changelog
--- /tmp/wG5xa1GxUp/cacao-0.95/debian/changelog	2006-06-02 23:19:06.000000000 +0200
+++ /tmp/RyVg63NZfs/cacao-0.96/debian/changelog	2006-06-02 23:19:12.000000000 +0200
@@ -1,3 +1,15 @@
+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
diff -Nru /tmp/wG5xa1GxUp/cacao-0.95/debian/control /tmp/RyVg63NZfs/cacao-0.96/debian/control
--- /tmp/wG5xa1GxUp/cacao-0.95/debian/control	2006-06-02 23:19:06.000000000 +0200
+++ /tmp/RyVg63NZfs/cacao-0.96/debian/control	2006-06-02 23:19:12.000000000 +0200
@@ -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 (>= 4.0.0), classpath (>= 0.19), classpath-common (>= 0.19), gcj, jikes-classpath, zlib1g-dev, binutils-dev, libltdl3-dev, zip, cdbs (>= 0.4.17)
+Build-Depends: debhelper (>= 4.0.0), classpath (>= 2:0.91-3), classpath-common (>= 2:0.91-3), gcj, jikes-classpath, zlib1g-dev, binutils-dev, libltdl3-dev, zip, cdbs (>= 0.4.17)
 Standards-Version: 3.6.2
 
 Package: cacao
diff -Nru /tmp/wG5xa1GxUp/cacao-0.95/debian/rules /tmp/RyVg63NZfs/cacao-0.96/debian/rules
--- /tmp/wG5xa1GxUp/cacao-0.95/debian/rules	2006-06-02 23:19:06.000000000 +0200
+++ /tmp/RyVg63NZfs/cacao-0.96/debian/rules	2006-06-02 23:19:12.000000000 +0200
@@ -4,7 +4,7 @@
 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"