Bug#703378: unblock: hsqldb/1.8.0.10+dfsg-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package hsqldb
> Changes:
> hsqldb (1.8.0.10+dfsg-1) unstable; urgency=low
> .
> * remove lib/servlet.jar and make the build actually use
> /usr/share/java/servlet-api-2.5.jar...
Except the rm, there only is:
diff -Nru hsqldb-1.8.0.10/debian/changelog hsqldb-1.8.0.10+dfsg/debian/changelog
--- hsqldb-1.8.0.10/debian/changelog 2013-03-18 23:30:42.000000000 +0100
+++ hsqldb-1.8.0.10+dfsg/debian/changelog 2013-03-18 23:30:42.000000000 +0100
@@ -1,3 +1,10 @@
+hsqldb (1.8.0.10+dfsg-1) unstable; urgency=low
+
+ * remove lib/servlet.jar and make the build actually use
+ /usr/share/java/servlet-api-2.5.jar...
+
+ -- Rene Engelhard <rene@debian.org> Mon, 18 Mar 2013 22:30:20 +0100
+
hsqldb (1.8.0.10-14) unstable; urgency=low
* revert -13 changes, apply fix from upstream to fix preprocessing,
diff -Nru hsqldb-1.8.0.10/debian/patches/use-system-servlet.jar.diff hsqldb-1.8.0.10+dfsg/debian/patches/use-system-servlet.jar.diff
--- hsqldb-1.8.0.10/debian/patches/use-system-servlet.jar.diff 1970-01-01 01:00:00.000000000 +0100
+++ hsqldb-1.8.0.10+dfsg/debian/patches/use-system-servlet.jar.diff 2013-03-18 23:30:42.000000000 +0100
@@ -0,0 +1,29 @@
+--- hsqldb-1.8.0.10+dfsg.orig/build/build.xml
++++ hsqldb-1.8.0.10+dfsg/build/build.xml
+@@ -313,7 +313,7 @@
+ optimize="${build.optimize}"^M
+ >^M
+ <classpath>^M
+- <pathelement location="lib/servlet.jar"/>^M
++ <pathelement location="/usr/share/java/servlet-api-2.5.jar"/>^M
+ </classpath>^M
+ <include name="*.java"/>^M
+ <include name="org/hsqldb/*.java"/>^M
+@@ -775,7 +775,7 @@
+ ${src}/org/hsqldb/util/RCData.java,^M
+ ${src}/org/hsqldb/util/SqlTool.java"^M
+ destdir="${basedir}/doc/src"^M
+- classpath="${basedir}/lib/servlet.jar;${basedir}/lib/junit.jar"^M
++ classpath="/usr/share/java/servlet-api-2.5.jar;${basedir}/lib/junit.jar"^M
+ author="true"^M
+ version="false"^M
+ use="true"^M
+@@ -796,7 +796,7 @@
+ <javadoc packagenames="org.hsqldb.*,org.hsqldb.jdbc.*,org.hsqldb.lib.*,org.hsqldb.util.*"^M
+ sourcepath="${src}"^M
+ destdir="${basedir}/doc/src"^M
+- classpath="${basedir}/lib/servlet.jar;${basedir}/lib/junit.jar"^M
++ classpath="/usr/share/java/servlet-api-2.5.jar;${basedir}/lib/junit.jar"^M
+ author="true"^M
+ version="false"^M
+ use="true"^M
unblock hsqldb/1.8.0.10+dfsg-1
Regards,
Rene
-- System Information:
Debian Release: 7.0
APT prefers testing
APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Reply to: