Package: hsqldb
Version: 2.2.9+dfsg-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu saucy ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Merge from Debian unstable. Remaining changes:
- d/control:
+ Transition libservlet2.5-java -> libservlet3.0-java.
+ BD on default-jdk instead of openjdk-7 as its the default in Ubuntu.
- d/p/use-system-servlet.jar.diff: Update to use servlet-api-3.0.
* d/control: Drop Suggests on removed -gcj package.
* d/control: Depend on default-jre-headless | java2-runtime-headless for
hsqldb-utils.
1) tomcat6 will be removed from unstable soon - package will need to transition
to
servlet 3.0 as provided by tomcat7.
2) openjdk-7 should soon become default-java as well.
3) A few misc tidies; specifically the -gcj package no longer exists and I made
the
runtime depends for the -utils package more standard for java apps.
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers raring-updates
APT policy: (500, 'raring-updates'), (500, 'raring-security'), (500,
'raring-proposed'), (500, 'raring'), (100, 'raring-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.8.0-20-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u hsqldb-2.2.9+dfsg/debian/control hsqldb-2.2.9+dfsg/debian/control
--- hsqldb-2.2.9+dfsg/debian/control
+++ hsqldb-2.2.9+dfsg/debian/control
@@ -2,14 +2,14 @@
Section: libs
Priority: optional
Maintainer: Debian QA Group <packa...@qa.debian.org>
-Build-Depends: cdbs (>= 0.4.39), debhelper (>= 5), openjdk-6-jdk, ant (>= 1.7), libservlet2.5-java, maven-repo-helper, javahelper, dpkg-dev (>= 1.16.1)
+Build-Depends: cdbs (>= 0.4.39), debhelper (>= 5), default-jdk, ant (>= 1.7), libservlet3.0-java, maven-repo-helper, javahelper, dpkg-dev (>= 1.16.1)
Standards-Version: 3.7.2
Package: libhsqldb-java
Section: java
Architecture: all
-Depends: libservlet2.5-java, ${misc:Depends}
-Suggests: java-virtual-machine, libhsqldb-java-doc, libhsqldb-java-gcj
+Depends: libservlet3.0-java, ${misc:Depends}
+Suggests: java-virtual-machine, libhsqldb-java-doc
Conflicts: openoffice.org-base, libreoffice-base (<< 1:4.0.2~rc2-2), libhsqldb2.2-java
Replaces: libhsqldb2.2-java
Provides: libhsqldb2.2-java
@@ -45,7 +45,7 @@
Package: hsqldb-utils
Section: database
Architecture: all
-Depends: libhsqldb-java (= ${binary:Version}), gij | java-gcj-compat | java2-runtime, ${misc:Depends}
+Depends: libhsqldb-java (= ${binary:Version}), default-jre-headless | java2-runtime-headless, ${misc:Depends}
Replaces: libhsqldb-java (<< 1.8.1.1~)
Conflicts: hsqldb-utils
Description: Java SQL database engine (utilities)
diff -u hsqldb-2.2.9+dfsg/debian/changelog hsqldb-2.2.9+dfsg/debian/changelog
diff -u hsqldb-2.2.9+dfsg/debian/rules hsqldb-2.2.9+dfsg/debian/rules
--- hsqldb-2.2.9+dfsg/debian/rules
+++ hsqldb-2.2.9+dfsg/debian/rules
@@ -5,7 +5,7 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/dpkg/architecture.mk
-JAVA_HOME = /usr/lib/jvm/java-6-openjdk-$(DEB_HOST_ARCH)
+JAVA_HOME = /usr/lib/jvm/default-java
DEB_JARS = servlet-api
DEB_ANT_BUILDFILE = hsqldb/build/build.xml
DEB_ANT_BUILD_TARGET = hsqldb hsqldbutil
@@ -27,8 +27,8 @@
mh_installjar -plibhsqldb-java -e$(DEB_UPSTREAM_VERSION) -l debian/pom.xml hsqldb/lib/hsqldb.jar
# there is no POM file for hsqldbutil
$(call install-jar,hsqldbutil)
- jh_classpath -plibhsqldb-java --classpath=/usr/share/java/servlet-api-2.5.jar \
- $(CURDIR)/debian/libhsqldb-java/usr/share/java/hsqldb-$(DEB_UPSTREAM_VERSION).jar
+ jh_classpath -plibhsqldb-java --classpath=/usr/share/java/servlet-api-3.0.jar \
+ $(CURDIR)/debian/libhsqldb-java/usr/share/java/hsqldb-$(DEB_UPSTREAM_VERSION).jar
install/hsqldb-utils:: DEB_FINALDIR=$(CURDIR)/debian/hsqldb-utils/
install/hsqldb-utils::
diff -u hsqldb-2.2.9+dfsg/debian/patches/use-system-servlet.jar.diff hsqldb-2.2.9+dfsg/debian/patches/use-system-servlet.jar.diff
--- hsqldb-2.2.9+dfsg/debian/patches/use-system-servlet.jar.diff
+++ hsqldb-2.2.9+dfsg/debian/patches/use-system-servlet.jar.diff
@@ -5,7 +5,7 @@
<!-- N.b. Compilation optimization only has effect with JDK 1.1 and 1.2 -->
- <property name="servletapi.lib" value="lib/servlet-2_3-fcs-classfiles.zip"/>
-+ <property name="servletapi.lib" value="/usr/share/java/servlet-api-2.5.jar"/>
++ <property name="servletapi.lib" value="/usr/share/java/servlet-api-3.0.jar"/>
<property name="junit38.lib" value="lib/junit.jar"/>
<property name='jflex.lib' value='lib/JFlex.jar'/>
