[hsqldb] 02/26: Imported Debian patch 1.8.0.10-9
Markus Koschany
apo-guest at moszumanska.debian.org
Thu Sep 17 20:04:40 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository hsqldb.
commit 1ff9e13290ad334740245e3682d56cd7726f4e24
Merge: 2c1374f 635aca1
Author: Rene Engelhard <rene at debian.org>
Date: Mon Jun 21 18:51:08 2010 +0200
Imported Debian patch 1.8.0.10-9
debian/changelog | 24 ------------------------
debian/control | 8 ++++----
debian/maven.publishedRules | 1 -
debian/patches/use-system-servlet.jar.diff | 29 -----------------------------
debian/rules | 7 -------
lib/servlet.jar | Bin 0 -> 74969 bytes
6 files changed, 4 insertions(+), 65 deletions(-)
diff --cc debian/changelog
index a0686af,0000000..5d6835e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,253 -1,0 +1,229 @@@
- hsqldb (1.8.0.10+dfsg-0+deb7u1) testing-proposed-updates; urgency=low
-
- * remove lib/servlet.jar and make the build actually use
- /usr/share/java/servlet-api-2.5.jar...
-
- -- Rene Engelhard <rene at debian.org> Tue, 19 Mar 2013 14:37:34 +0100
-
- hsqldb (1.8.0.10-11) unstable; urgency=low
-
- * add maven.publishedRules (patch by twerner, closes: #641691)
- * stop building -gcj - except on kfreebsd-*
-
- -- Rene Engelhard <rene at debian.org> Mon, 26 Sep 2011 16:14:57 +0000
-
- hsqldb (1.8.0.10-10) unstable; urgency=low
-
- * fix builddep: s/default-jdk-builddep/default-jdk, gcj-native-helper/
- * libhsqldb-java-gcj: libs->java
- * add missing run to mh_clean
- * build-depend on javahelper and add Class-Path: to hsqldb-1.8.0.10.jar...
- * stop depending on a jre on libhsqldb-java
-
- -- Rene Engelhard <rene at debian.org> Fri, 19 Aug 2011 20:54:56 +0000
-
+hsqldb (1.8.0.10-9) unstable; urgency=low
+
+ * oops, readd lost changes of -6.1 and fix changelog snafu
+
+ -- Rene Engelhard <rene at debian.org> Mon, 21 Jun 2010 18:51:08 +0200
+
+hsqldb (1.8.0.10-8) unstable; urgency=low
+
+ * hardcode JAVA_EXECUTABLE to /usr/lib/jvm/java-gcj/bin/java
+ (closes: #579740)
+ * add $remote_fs to Required-Stop:
+ * build with libservlet2.5-java
+
+ -- Rene Engelhard <rene at debian.org> Mon, 21 Jun 2010 12:03:42 +0200
+
+hsqldb (1.8.0.10-6.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Install POM file for hsqldb.jar. (Closes: #581851)
+
+ -- Torsten Werner <twerner at debian.org> Sun, 16 May 2010 23:08:11 +0200
+
+hsqldb (1.8.0.10-6) unstable; urgency=low
+
+ * split utilities (hsqldb-*) into hsqldb-utils to allow
+ co-installation of libraries of different versions
+
+ -- Rene Engelhard <rene at debian.org> Sun, 25 Oct 2009 02:19:13 +0200
+
+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
+
+ -- Rene Engelhard <rene at debian.org> Sat, 19 Sep 2009 00:56:41 +0200
+
+hsqldb (1.8.0.10-4) unstable; urgency=low
+
+ * fix hsqldb-init-tempfile to actually be applied
+ * readd WebServer support
+ * use template for hsqldb.conf which has more info
+ * add SERVER_JVMARGS=-Dhsqldb.method_class_names=\"\" to hsqldb.conf to
+ disallow execution of Java code inside SQL per default
+ * import default server.properties and webserver.properties and
+ default sqltool.rc from Fedora
+
+ -- Rene Engelhard <rene at debian.org> Mon, 17 Aug 2009 22:33:02 +0200
+
+hsqldb (1.8.0.10-3) unstable; urgency=medium
+
+ * add patch from http://www.openoffice.org/issues/show_bug.cgi?id=103528
+ to fix BITXOR
+ * build with target/source for 1.5 as default-jdk is now OpenJDK 1.6
+ * remove old hsqldb-server.init. Use bin/hsqldb. Add /etc/hsqldb.conf.
+ Make it work. Finetuning probably still needed but it at least now
+ has working (re)start/stop/status.
+ (closes: #466421)
+ * move libhsqldb-java to java and hsqldb-server to databases
+ * fix doc-base section
+
+ -- Rene Engelhard <rene at debian.org> Mon, 17 Aug 2009 21:05:08 +0200
+
+hsqldb (1.8.0.10-2) unstable; urgency=low
+
+ * fix creation of .lock file for OOo (from OOo svn)
+
+ -- Rene Engelhard <rene at debian.org> Wed, 25 Feb 2009 13:44:50 +0100
+
+hsqldb (1.8.0.10-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene at debian.org> Tue, 12 Aug 2008 10:49:33 -0300
+
+hsqldb (1.8.0.9-3) unstable; urgency=low
+
+ * make myself Maintainer: and remove Peter, by Peterss request
+ * use default-jdk-builddep (closes: #477862)
+
+ -- Rene Engelhard <rene at debian.org> Sun, 27 Apr 2008 00:17:18 +0200
+
+hsqldb (1.8.0.9-2) unstable; urgency=low
+
+ * upload to unstable
+ * mention CVE-2007-4575 in previous release
+
+ -- Rene Engelhard <rene at debian.org> Tue, 27 Nov 2007 11:37:11 +0100
+
+hsqldb (1.8.0.9-1) experimental; urgency=high
+
+ * New upstream release
+ - fixes CVE-2007-4575
+
+ -- Rene Engelhard <rene at debian.org> Sun, 04 Nov 2007 19:20:16 +0100
+
+hsqldb (1.8.0.8.dfsg-2) unstable; urgency=low
+
+ * get regression fix from upstream
+ * merge from Ubuntu:
+ - build -gcj subpackage (closes: #437629)
+
+ -- Rene Engelhard <rene at debian.org> Sun, 04 Nov 2007 19:03:03 +0100
+
+hsqldb (1.8.0.8.dfsg-1) unstable; urgency=high
+
+ * oops, we need to remove servlet.jar from the .orig
+
+ -- Rene Engelhard <rene at debian.org> Mon, 24 Sep 2007 10:26:49 +0200
+
+hsqldb (1.8.0.8-1) unstable; urgency=low
+
+ * New upstream release
+ - includes all Ooo 2.3 patches (closes: #437630)
+ * switch to java-gcj-compat-dev as jikes can't build us anymore but
+ ecj can
+ * add myself to Uploaders
+ * make hsqldb-server depend on libhsqldb-java (= ${binary:Version})
+ as $|Source-Version} is deprecated
+ * Apps/Databases -> Applications/Data Management for the new menu policy
+
+ -- Rene Engelhard <rene at debian.org> Fri, 31 Aug 2007 11:30:39 +0200
+
+hsqldb (1.8.0.7-3) unstable; urgency=low
+
+ * Changed dependencies to libservlet2.4-java (closes: #422555)
+
+ -- Peter Eisentraut <petere at debian.org> Mon, 07 May 2007 16:03:36 +0200
+
+hsqldb (1.8.0.7-2) unstable; urgency=low
+
+ * Corrected URL in hsqldb-sqltool man page
+ * Added sqltool.rc example to installation
+ * Improved start order dependencies of init script
+
+ -- Peter Eisentraut <petere at debian.org> Fri, 13 Apr 2007 01:54:00 +0200
+
+hsqldb (1.8.0.7-1) unstable; urgency=low
+
+ * New upstream release
+ * Updated watch file
+ * Removed hsqldb-nio.patch, which is no longer needed
+
+ -- Peter Eisentraut <petere at debian.org> Fri, 27 Oct 2006 09:59:02 +0200
+
+hsqldb (1.8.0.5-2) unstable; urgency=low
+
+ * Fixed dependency information in init script LSB header
+
+ -- Peter Eisentraut <petere at debian.org> Wed, 13 Sep 2006 19:18:37 +0200
+
+hsqldb (1.8.0.5-1) experimental; urgency=low
+
+ * New upstream release
+ * Fixed Build-Depends vs. Build-Depends-Indep
+ * Updated standards version
+ * debian/rules simplifications facilitated by newer cdbs
+ * Removed outdated OpenOffice patches
+ * Create /var/run/hsqldb in the init script rather than in the package
+ * Changed to Debhelper level 5
+ * Fixed su invocation in init script
+
+ -- Peter Eisentraut <petere at debian.org> Thu, 31 Aug 2006 12:57:30 +0200
+
+hsqldb (1.8.0.2-2) unstable; urgency=low
+
+ * Added hsqldbutil.jar to re-add Transfer and QueryTool tools, which
+ were removed from the main jar (closes: #341427)
+ * Do not allow tools to create prefs file automatically
+
+ -- Peter Eisentraut <petere at debian.org> Sun, 11 Dec 2005 14:43:02 +0100
+
+hsqldb (1.8.0.2-1) unstable; urgency=low
+
+ * New upstream release
+ * Updated hsqldb-gcj-access-problems.patch for new release
+ * Changed watch file to version 3 format
+ * Added dependency on adduser
+ * Changed init script to LSB style
+ * Changed build dependency to ant
+
+ -- Peter Eisentraut <petere at debian.org> Sat, 24 Sep 2005 23:07:44 +0200
+
+hsqldb (1.8.0.0-2) experimental; urgency=low
+
+ * Moved java-virtual-machine to a suggestion (closes: #316986)
+ * Made hsqldb-server depend on the library of the same version
+ (closes: #316987)
+ * Applied bug fix patch from OOo2 (hsqldb-ooo2.patch) (closes: #316937)
+ * Applied patch by Rene Engelhard to work with GCJ in OOo2
+ (hsqldb-gcj-access-problems.patch) (closes: #316937)
+ * Now using simple-patchsys.mk for patches
+
+ -- Peter Eisentraut <petere at debian.org> Mon, 11 Jul 2005 22:40:39 +0200
+
+hsqldb (1.8.0.0-1) experimental; urgency=low
+
+ * New upstream release
+ * Updated standards version
+
+ -- Peter Eisentraut <petere at debian.org> Mon, 4 Jul 2005 18:03:23 +0200
+
+hsqldb (1.7.3.3-3) unstable; urgency=low
+
+ * Changed maintainer address
+ * Added server mode
+
+ -- Peter Eisentraut <petere at debian.org> Thu, 9 Jun 2005 16:02:21 +0200
+
+hsqldb (1.7.3.3-2) experimental; urgency=low
+
+ * Disabled use of NIO locking (doesn't work with kaffe)
+ * Changed run-time dependencies to kaffe
+ * Moved to main
+ * Added PostgreSQL and MySQL JDBC drivers to classpath of GUI applications
+
+ -- Peter Eisentraut <peter_e at gmx.net> Fri, 6 May 2005 13:22:03 +0200
+
+hsqldb (1.7.3.3-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Peter Eisentraut <peter_e at gmx.net> Wed, 30 Mar 2005 10:39:03 +0200
+
+hsqldb (1.7.3.2-1) experimental; urgency=low
+
+ * Initial release (closes: #121613)
+
+ -- Peter Eisentraut <peter_e at gmx.net> Sun, 6 Feb 2005 13:05:40 +0100
diff --cc debian/control
index 15ebc8d,0000000..f97181e
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,99 -1,0 +1,99 @@@
+Source: hsqldb
+Section: libs
+Priority: optional
+Maintainer: Rene Engelhard <rene at debian.org>
- Build-Depends: cdbs (>= 0.4.39), debhelper (>= 5), default-jdk, gcj-native-helper [kfreebsd-i386 kfreebsd-amd64], ant (>= 1.7), libservlet2.5-java, maven-repo-helper, javahelper
++Build-Depends: cdbs (>= 0.4.39), debhelper (>= 5), default-jdk-builddep, ant (>= 1.7), libservlet2.5-java, maven-repo-helper
+Standards-Version: 3.7.2
+
+Package: libhsqldb-java
+Section: java
+Architecture: all
- Depends: libservlet2.5-java, ${misc:Depends}
++Depends: gij | java-gcj-compat | java2-runtime, libservlet2.5-java, ${misc:Depends}
+Suggests: java-virtual-machine, libhsqldb-java-doc, libhsqldb-java-gcj
+Conflicts: openoffice.org-base (<< 1:2.3.1~m8)
+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
+ SQL:1999 and SQL:2003 enhancements. It offers a small, fast database
+ engine that offers both in-memory and disk-based tables. Embedded and
+ 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-gcj
- Section: java
- Architecture: kfreebsd-i386 kfreebsd-amd64
++Section: libs
++Architecture: any
+Depends: libhsqldb-java (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
+Suggests: java-virtual-machine, libhsqldb-java-doc
+Description: Java SQL database engine (native code)
+ 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
+ SQL:1999 and SQL:2003 enhancements. It offers a small, fast database
+ engine that offers both in-memory and disk-based tables. Embedded and
+ 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.
+ .
+ This package contains the natively compiled code for use by gij.
+
+Package: libhsqldb-java-doc
+Section: doc
+Architecture: all
+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
+ SQL:1999 and SQL:2003 enhancements. It offers a small, fast database
+ engine that offers both in-memory and disk-based tables. Embedded and
+ 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.
+ .
+ This package contains the documentation of HSQLDB.
+ .
+ Web site: http://hsqldb.org/
+
+Package: hsqldb-server
+Section: database
+Architecture: all
+Depends: libhsqldb-java (= ${binary:Version}), adduser, lsb-base (>= 3.0-3), gcj-jre, ${misc:Depends}
+Description: Java SQL database server
+ 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
+ SQL:1999 and SQL:2003 enhancements. It offers a small, fast database
+ engine that offers both in-memory and disk-based tables. Embedded and
+ 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.
+ .
+ This package contains the files necessary to run an HSQLDB server. More
+ commonly, HSQLDB is used as an embedded database engine, which does not
+ require this package.
+ .
+ Web site: http://hsqldb.org/
+
+Package: hsqldb-utils
+Section: database
+Architecture: all
+Depends: libhsqldb-java (= ${binary:Version}), gij | java-gcj-compat | java2-runtime, ${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
+ SQL:1999 and SQL:2003 enhancements. It offers a small, fast database
+ engine that offers both in-memory and disk-based tables. Embedded and
+ 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.
+ .
+ This package contains some scripts to invoke the Utilities of HSQLDB
+ (org.hsqldb.util.*):
+ - hsqldb-databasemanager: DatabaseManager
+ - hsqldb-databasemanagerswing: DatabaseManagerSwing
+ - hsqldb-transfer: Transfer
+ - hsqldb-querytool: QueryTool
+ - hsqldb-sqltool: SqlTool
+
diff --cc debian/rules
index ea22ecc,0000000..18c99bf
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,81 -1,0 +1,74 @@@
+#!/usr/bin/make -f
+
+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
+
+JAVA_HOME = /usr/lib/jvm/default-java
+DEB_JARS = servlet-api
+DEB_ANT_BUILDFILE = build/build.xml
+DEB_ANT_BUILD_TARGET = hsqldb hsqldbutil
+DEB_ANT_ARGS += -Dant.build.javac.target=1.5 -Dant.build.javac.source=1.5
+
+DEB_INSTALL_DOCS_ALL = -X .cvsignore
+DEB_INSTALL_CHANGELOGS_ALL = changelog.combined
+
- DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
+build/hsqldb-utils::
+ $(MAKE) -C debian/bin all
+
+common-build-indep:: changelog.combined NEWS
+
+define combine-changelog
+( \
+ set -e; \
+ set `echo $^ | tr ' ' '\n' | sort -r`; \
+ for f; do \
+ if [ $$f != $$1 ]; then \
+ echo; echo; \
+ for i in `seq 80`; do echo -n '='; done; \
+ echo; echo; \
+ fi; \
+ fold -s $$f; \
+ done \
+) >$@
+endef
+
+changelog.combined: $(wildcard doc/changelist_*.txt)
+ $(combine-changelog)
+
+NEWS: $(wildcard doc/changelog_*.txt)
+ $(combine-changelog)
+
+
+define install-jar
+install -m 644 -D lib/$(1).jar $(DEB_FINALDIR)/usr/share/java/$(1)-$(DEB_UPSTREAM_VERSION).jar
+dh_link /usr/share/java/$(1)-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/$(1).jar
+endef
+
+install/libhsqldb-java:: DEB_FINALDIR=$(CURDIR)/debian/libhsqldb-java/
+install/libhsqldb-java::
+ mh_installpom -plibhsqldb-java -e$(DEB_UPSTREAM_VERSION) debian/pom.xml
+ mh_installjar -plibhsqldb-java -e$(DEB_UPSTREAM_VERSION) -l debian/pom.xml 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
+
+install/hsqldb-utils:: DEB_FINALDIR=$(CURDIR)/debian/hsqldb-utils/
+install/hsqldb-utils::
+ install -d $(DEB_FINALDIR)/usr/bin
+ install -m 755 debian/bin/hsqldb-* $(DEB_FINALDIR)/usr/bin/
+ install -m 644 -D debian/bin/hsqldb.xpm $(DEB_FINALDIR)/usr/share/pixmaps/hsqldb.xpm
+
+install/hsqldb-server::
+ install -D -m644 debian/hsqldb.conf debian/hsqldb-server/etc/hsqldb.conf
+ sed -i s,JAVA_EXECUTABLE=.*,JAVA_EXECUTABLE=/usr/lib/jvm/java-gcj/bin/java,g \
+ debian/hsqldb-server/etc/hsqldb.conf
+ cp bin/hsqldb debian/hsqldb-server.init
+
+clean::
+ rm -f lib/hsqldb*.jar
+ $(MAKE) -C debian/bin clean
+ rm -f changelog.combined NEWS
+ rm -f debian/hsqldb-server.init
- mh_clean
+
- ifneq (,$(findstring kfreebsd,$(DEB_BUILD_ARCH)))
+install/libhsqldb-java-gcj:: install-indep
+ dh_nativejava -plibhsqldb-java-gcj
- endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/hsqldb.git
More information about the pkg-java-commits
mailing list