This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository hsqldb.
commit 41c7b387de324ee575fd1e6b192840421c764290 Author: Markus Koschany <[email protected]> Date: Wed Sep 16 23:22:04 2015 +0200 Imported Debian patch 2.2.9+dfsg-5 --- debian/README.maintainer | 7 - debian/changelog | 53 ++++++-- debian/compat | 2 +- debian/control | 60 ++++++--- debian/copyright | 146 +++++++++++---------- debian/libhsqldb-java-gcj.substvars | 1 - debian/patches/series | 1 + ...rvlet.jar.diff => use-system-servlet.jar.patch} | 16 ++- debian/rules | 8 +- debian/source/format | 1 + debian/watch | 3 +- 11 files changed, 183 insertions(+), 115 deletions(-) diff --git a/debian/README.maintainer b/debian/README.maintainer deleted file mode 100644 index c6ea5e4..0000000 --- a/debian/README.maintainer +++ /dev/null @@ -1,7 +0,0 @@ -Steps to produce a .orig tarball from the upstream distribution zips: - -unzip hsqldb_1_7_3_2.zip -rm hsqldb/lib/hsqldb.jar -rm hsqldb/lib/servlet.jar -tar -c -f hsqldb_1.7.3.2.orig.tar hsqldb/ -gzip --best hsqldb_1.7.3.2.orig.tar diff --git a/debian/changelog b/debian/changelog index be7fc1a..c120d82 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,36 @@ +hsqldb (2.2.9+dfsg-5) UNRELEASED; urgency=medium + + [ Markus Koschany ] + * Depend on default-jdk and default-jre-headless. + Switch to libservlet3.0-java. + Thanks to James Page for the report and patch. (Closes: #708118) + * Imported Upstream version 1.8.0.10 + * Imported Upstream version 1.8.0.10+dfsg + + [ Niels Thykier ] + * Imported Debian patch 2.2.9+dfsg-4 + + [ Markus Koschany ] + * wrap-and-sort -sa + * Grooming. Remove trailing whitespace + * New maintainer Debian Java Team. Add myself as Uploader. (Closes: #707122) + * debian/rules: Add get-orig-source target. + * Use compat level 9 and require debhelper >= 9. + * Add Homepage field. + * Move the package to Git. + * Declare compliance with Debian Policy 3.9.6 + * hsqldb-utils: Remove Conflicts hsqldb-utils + * Drop README.maintainer. + * Switch to source format 3.0 (quilt). + * Drop use-system-servlet.jar.diff + * Add use-system-servlet.jar.patch + * Remove obsolete libhsqldb-java-gcj.substvar file + * Start new changelog entry + * Switch to copyright format 1.0. + * Improve debian/watch and mangle the version correctly. + + -- Markus Koschany <[email protected]> Wed, 16 Sep 2015 23:22:04 +0200 + hsqldb (2.2.9+dfsg-4) unstable; urgency=low * QA upload. @@ -10,7 +43,7 @@ hsqldb (2.2.9+dfsg-4) unstable; urgency=low hsqldb (2.2.9+dfsg-3) unstable; urgency=low - * upload to unstable + * upload to unstable * orphan package, set maintainer to Debian QA Group * update debian/watch * remove Conflicts: libreoffice-base; @@ -21,20 +54,20 @@ hsqldb (2.2.9+dfsg-3) unstable; urgency=low hsqldb (2.2.9+dfsg-2) experimental; urgency=low * remove lib/servlet-api*.jar and make the build actually use - /usr/share/java/servlet-api-2.5.jar... + /usr/share/java/servlet-api-2.5.jar... -- Rene Engelhard <[email protected]> Mon, 18 Mar 2013 23:16:14 +0100 hsqldb (2.2.9-3) experimental; urgency=low * stop building -gcj and build using openjdk-6-jdk explicitely - (this apparently doesn't build with gcj anymore) + (this apparently doesn't build with gcj anymore) -- Rene Engelhard <[email protected]> Mon, 07 Jan 2013 18:33:16 +0100 hsqldb (2.2.9-2) experimental; urgency=low - * rename back to hsqldb and libhsqldb-java + * rename back to hsqldb and libhsqldb-java * fix servlet dependency -- Rene Engelhard <[email protected]> Wed, 02 Jan 2013 21:37:42 +0100 @@ -47,7 +80,7 @@ hsqldb2.2 (2.2.9-1) experimental; urgency=low hsqldb2.2 (2.2.8-2) experimental; urgency=low - * remove build/gradle*... (unused, and contains sourceless jar.) + * remove build/gradle*... (unused, and contains sourceless jar.) -- Rene Engelhard <[email protected]> Sun, 20 May 2012 13:45:15 +0200 @@ -71,7 +104,7 @@ hsqldb2.2 (2.2.8-1) experimental; urgency=low hsqldb2.0 (2.0.0-3) experimental; urgency=low - * gah, I forgot the maven-repo-helper builddep + * gah, I forgot the maven-repo-helper builddep -- Rene Engelhard <[email protected]> Wed, 23 Jun 2010 09:34:43 +0200 @@ -125,8 +158,8 @@ hsqldb (1.8.1.1-1) experimental; urgency=low hsqldb (1.8.0.10-5) unstable; urgency=low * add i104901.patch from OOo to fix autoincrement behaviour which - otherwise can cause db corruption - * bin/hsqldb: Provides: hsqldb-server, thanks lintian + otherwise can cause db corruption + * bin/hsqldb: Provides: hsqldb-server, thanks lintian -- Rene Engelhard <[email protected]> Sat, 19 Sep 2009 00:56:41 +0200 @@ -199,7 +232,7 @@ hsqldb (1.8.0.8.dfsg-2) unstable; urgency=low hsqldb (1.8.0.8.dfsg-1) unstable; urgency=high - * oops, we need to remove servlet.jar from the .orig + * oops, we need to remove servlet.jar from the .orig -- Rene Engelhard <[email protected]> Mon, 24 Sep 2007 10:26:49 +0200 @@ -308,7 +341,7 @@ hsqldb (1.7.3.3-2) experimental; urgency=low * Changed run-time dependencies to kaffe * Moved to main * Added PostgreSQL and MySQL JDBC drivers to classpath of GUI applications - + -- Peter Eisentraut <[email protected]> Fri, 6 May 2005 13:22:03 +0200 hsqldb (1.7.3.3-1) experimental; urgency=low diff --git a/debian/compat b/debian/compat index 7ed6ff8..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/debian/control b/debian/control index 7ae1930..528e70f 100644 --- a/debian/control +++ b/debian/control @@ -1,18 +1,40 @@ Source: hsqldb Section: libs Priority: optional -Maintainer: Debian QA Group <[email protected]> -Build-Depends: cdbs (>= 0.4.39), debhelper (>= 5), openjdk-7-jdk, ant (>= 1.7), libservlet2.5-java, maven-repo-helper, javahelper, dpkg-dev (>= 1.16.1) -Standards-Version: 3.7.2 +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: + Markus Koschany <[email protected]> +Build-Depends: + ant (>= 1.7), + cdbs (>= 0.4.39), + debhelper (>= 9), + default-jdk, + dpkg-dev (>= 1.16.1), + javahelper, + libservlet3.0-java, + maven-repo-helper +Standards-Version: 3.9.6 +Vcs-Git: git://anonscm.debian.org/pkg-java/hsqldb.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/hsqldb.git +Homepage: http://hsqldb.org/ Package: libhsqldb-java Section: java Architecture: all -Depends: libservlet2.5-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 +Depends: + libservlet3.0-java, + ${misc:Depends} +Suggests: + java-virtual-machine, + libhsqldb-java-doc +Conflicts: + libhsqldb2.2-java, + libreoffice-base (<< 1:4.0.2~rc2-2), + openoffice.org-base +Replaces: + libhsqldb2.2-java +Provides: + libhsqldb2.2-java Description: Java SQL database engine HSQLDB is an SQL relational database engine written in Java. It has a JDBC driver and supports a rich subset of SQL-92 (BNF tree format) plus @@ -21,14 +43,14 @@ Description: Java SQL database engine server modes are available. Additionally, it includes tools such as a minimal web server, in-memory query and management tools (can be run as applets), and a number of demonstration examples. - . - Web site: http://hsqldb.org/ Package: libhsqldb-java-doc Section: doc Architecture: all -Depends: ${misc:Depends} -Suggests: libhsqldb-java +Depends: + ${misc:Depends} +Suggests: + libhsqldb-java Description: documentation for HSQLDB HSQLDB is an SQL relational database engine written in Java. It has a JDBC driver and supports a rich subset of SQL-92 (BNF tree format) plus @@ -39,17 +61,16 @@ Description: documentation for HSQLDB applets), and a number of demonstration examples. . This package contains the documentation of HSQLDB. - . - Web site: http://hsqldb.org/ Package: hsqldb-utils Section: database Architecture: all -Depends: libhsqldb-java (= ${binary:Version}), - default-jre | java5-runtime | java6-runtime | java7-runtime, - ${misc:Depends} -Replaces: libhsqldb-java (<< 1.8.1.1~) -Conflicts: hsqldb-utils +Depends: + default-jre-headless | java7-runtime-headless, + libhsqldb-java (= ${binary:Version}), + ${misc:Depends} +Replaces: + libhsqldb-java (<< 1.8.1.1~) Description: Java SQL database engine (utilities) HSQLDB is an SQL relational database engine written in Java. It has a JDBC driver and supports a rich subset of SQL-92 (BNF tree format) plus @@ -66,4 +87,3 @@ Description: Java SQL database engine (utilities) - hsqldb-transfer: Transfer - hsqldb-querytool: QueryTool - hsqldb-sqltool: SqlTool - diff --git a/debian/copyright b/debian/copyright index ad35cec..5227190 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,72 +1,80 @@ -This Debian package was created by Peter Eisentraut <[email protected]> -on 5 Feb 2005. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: HSQLDB +Source: http://hsqldb.org/ +Files-Excluded: + *.jar -The source was downloaded from <http://hsqldb.sourceforge.net/>. The -hsqldb.xpm icon was created by Peter Eisentraut from the file logo.gif -available in the HSQLDB CVS repository. - -Upstream authors: Fred Toussi <[email protected]> and others +Files: * +Copyright: Fred Toussi and others +License: HSQLDB-license +Files: debian/* Copyright: - - Copyright (c) 2001-2004, The HSQL Development Group - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the HSQL Development Group nor the names of its - contributors may be used to endorse or promote products derived from this - software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, - OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - - Copyright (c) 1995-2000, The Hypersonic SQL Group. - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Hypersonic SQL Group nor the names of its - contributors may be used to endorse or promote products derived from this - software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE HYPERSONIC SQL GROUP, - OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - This software consists of voluntary contributions made by many individuals - on behalf of the Hypersonic SQL Group. +License: Apache-2.0 + +License: Apache-2.0 + On Debian systems, the full text of the Apache-2.0 license + can be found in the file '/usr/share/common-licenses/Apache-2.0' + +License: HSQLDB-license + Copyright (c) 2001-2004, The HSQL Development Group + All rights reserved. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + . + Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + . + Neither the name of the HSQL Development Group nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, + OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License: Hypersonic-license + Copyright (c) 1995-2000, The Hypersonic SQL Group. + All rights reserved. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + . + Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + . + Neither the name of the Hypersonic SQL Group nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE HYPERSONIC SQL GROUP, + OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + . + This software consists of voluntary contributions made by many individuals + on behalf of the Hypersonic SQL Group. diff --git a/debian/libhsqldb-java-gcj.substvars b/debian/libhsqldb-java-gcj.substvars deleted file mode 100644 index abd3ebe..0000000 --- a/debian/libhsqldb-java-gcj.substvars +++ /dev/null @@ -1 +0,0 @@ -misc:Depends= diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..0057254 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +use-system-servlet.jar.patch diff --git a/debian/patches/use-system-servlet.jar.diff b/debian/patches/use-system-servlet.jar.patch similarity index 53% rename from debian/patches/use-system-servlet.jar.diff rename to debian/patches/use-system-servlet.jar.patch index 547c6b4..1bc54a7 100644 --- a/debian/patches/use-system-servlet.jar.diff +++ b/debian/patches/use-system-servlet.jar.patch @@ -1,11 +1,21 @@ ---- hsqldb/build/build.xml-old 2013-03-18 22:36:36.349496090 +0100 -+++ hsqldb/build/build.xml 2013-03-18 22:37:35.149494353 +0100 +From: Markus Koschany <[email protected]> +Date: Wed, 16 Sep 2015 22:07:22 +0200 +Subject: use system servlet.jar + +--- + hsqldb/build/build.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hsqldb/build/build.xml b/hsqldb/build/build.xml +index ae8b37b..07fcefd 100644 +--- a/hsqldb/build/build.xml ++++ b/hsqldb/build/build.xml @@ -57,7 +57,7 @@ <property name="build.optimize" value="false"/> <!-- 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'/> diff --git a/debian/rules b/debian/rules index b2173e5..6b8c097 100755 --- a/debian/rules +++ b/debian/rules @@ -2,10 +2,9 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/dpkg/architecture.mk -JAVA_HOME = /usr/lib/jvm/java-7-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,7 +26,7 @@ install/libhsqldb-java:: 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 \ + 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/ @@ -41,3 +40,6 @@ clean:: $(MAKE) -C debian/bin clean mkdir -p hsqldb/doc-src mh_clean + +get-orig-source: + uscan --verbose --download-current-version --force-download --repack --compression xz diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch index 619d343..8609003 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,3 @@ version=3 -http://sf.net/hsqldb/hsqldb-([0-9]).([0-9]).([0-9]).zip +opts=dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/ \ +http://sf.net/hsqldb/hsqldb-(.+)\.(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/hsqldb.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
