[pkg-java] r16772 - in trunk/hsqldb1.8.0/debian: . patches
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Tue May 28 12:46:09 UTC 2013
Author: ebourg-guest
Date: 2013-05-28 12:46:09 +0000 (Tue, 28 May 2013)
New Revision: 16772
Removed:
trunk/hsqldb1.8.0/debian/etc/
trunk/hsqldb1.8.0/debian/hsqldb-server.default
trunk/hsqldb1.8.0/debian/hsqldb-server.dirs
trunk/hsqldb1.8.0/debian/hsqldb-server.docs
trunk/hsqldb1.8.0/debian/hsqldb-server.install
trunk/hsqldb1.8.0/debian/hsqldb-server.links
trunk/hsqldb1.8.0/debian/hsqldb-server.postinst
trunk/hsqldb1.8.0/debian/hsqldb.conf
trunk/hsqldb1.8.0/debian/patches/hsqldb-init-provides.diff
trunk/hsqldb1.8.0/debian/patches/hsqldb-init-restart.diff
trunk/hsqldb1.8.0/debian/patches/hsqldb-init-tempfile.diff
trunk/hsqldb1.8.0/debian/patches/insserv-defaults.diff
Modified:
trunk/hsqldb1.8.0/debian/control
trunk/hsqldb1.8.0/debian/patches/series
trunk/hsqldb1.8.0/debian/rules
Log:
Removed the hsqldb-server package
Modified: trunk/hsqldb1.8.0/debian/control
===================================================================
--- trunk/hsqldb1.8.0/debian/control 2013-05-28 12:26:38 UTC (rev 16771)
+++ trunk/hsqldb1.8.0/debian/control 2013-05-28 12:46:09 UTC (rev 16772)
@@ -39,24 +39,6 @@
.
This package contains the documentation of HSQLDB.
-Package: hsqldb-server
-Section: database
-Architecture: all
-Depends: default-jre-headless | java6-runtime-headless, libhsqldb-java (= ${binary:Version}),
- adduser, lsb-base (>= 3.0-3), ${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.
-
Package: hsqldb-utils
Section: database
Architecture: all
Deleted: trunk/hsqldb1.8.0/debian/hsqldb-server.default
===================================================================
--- trunk/hsqldb1.8.0/debian/hsqldb-server.default 2013-05-28 12:26:38 UTC (rev 16771)
+++ trunk/hsqldb1.8.0/debian/hsqldb-server.default 2013-05-28 12:46:09 UTC (rev 16772)
@@ -1,5 +0,0 @@
-# Set to 'WebServer' to start a HSQLDB WebServer instead of a Server.
-# Defaults to 'Server'.
-TARGET_CLASS=Server
-#TARGET_CLASS=WebServer
-
Deleted: trunk/hsqldb1.8.0/debian/hsqldb-server.dirs
===================================================================
--- trunk/hsqldb1.8.0/debian/hsqldb-server.dirs 2013-05-28 12:26:38 UTC (rev 16771)
+++ trunk/hsqldb1.8.0/debian/hsqldb-server.dirs 2013-05-28 12:46:09 UTC (rev 16772)
@@ -1 +0,0 @@
-var/lib/hsqldb
Deleted: trunk/hsqldb1.8.0/debian/hsqldb-server.docs
===================================================================
--- trunk/hsqldb1.8.0/debian/hsqldb-server.docs 2013-05-28 12:26:38 UTC (rev 16771)
+++ trunk/hsqldb1.8.0/debian/hsqldb-server.docs 2013-05-28 12:46:09 UTC (rev 16772)
@@ -1 +0,0 @@
-NEWS
Deleted: trunk/hsqldb1.8.0/debian/hsqldb-server.install
===================================================================
--- trunk/hsqldb1.8.0/debian/hsqldb-server.install 2013-05-28 12:26:38 UTC (rev 16771)
+++ trunk/hsqldb1.8.0/debian/hsqldb-server.install 2013-05-28 12:46:09 UTC (rev 16772)
@@ -1,3 +0,0 @@
-debian/etc/server.properties etc/hsqldb
-debian/etc/webserver.properties etc/hsqldb
-debian/etc/sqltool.rc etc/hsqldb
Deleted: trunk/hsqldb1.8.0/debian/hsqldb-server.links
===================================================================
--- trunk/hsqldb1.8.0/debian/hsqldb-server.links 2013-05-28 12:26:38 UTC (rev 16771)
+++ trunk/hsqldb1.8.0/debian/hsqldb-server.links 2013-05-28 12:46:09 UTC (rev 16772)
@@ -1,2 +0,0 @@
-etc/hsqldb/server.properties var/lib/hsqldb/server.properties
-etc/hsqldb/webserver.properties var/lib/hsqldb/webserver.properties
Deleted: trunk/hsqldb1.8.0/debian/hsqldb-server.postinst
===================================================================
--- trunk/hsqldb1.8.0/debian/hsqldb-server.postinst 2013-05-28 12:26:38 UTC (rev 16771)
+++ trunk/hsqldb1.8.0/debian/hsqldb-server.postinst 2013-05-28 12:46:09 UTC (rev 16772)
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-getent passwd hsqldb >/dev/null 2>&1 ||
- adduser --system --shell /bin/bash --no-create-home --home /var/lib/hsqldb --group --gecos "HSQLDB system user" hsqldb
-
-chown hsqldb:hsqldb /var/lib/hsqldb
-chmod 600 /etc/hsqldb/sqltool.rc
-
-#DEBHELPER#
Deleted: trunk/hsqldb1.8.0/debian/hsqldb.conf
===================================================================
--- trunk/hsqldb1.8.0/debian/hsqldb.conf 2013-05-28 12:26:38 UTC (rev 16771)
+++ trunk/hsqldb1.8.0/debian/hsqldb.conf 2013-05-28 12:46:09 UTC (rev 16772)
@@ -1,140 +0,0 @@
-# $Id: sample-hsqldb.cfg,v 1.16 2005/07/24 18:33:13 unsaved Exp $
-
-# Sample configuration file for HSQLDB database server.
-# See the "UNIX Quick Start" chapter of the Hsqldb User Guide.
-
-# N.b.!!!! You must place this in the right location for your type of UNIX.
-# See the init script "hsqldb" to see where this must be placed and
-# what it should be renamed to.
-
-# This file is "sourced" by a Bourne shell, so use Bourne shell syntax.
-
-# This file WILL NOT WORK until you set (at least) the non-commented
-# variables to the appropriate values for your system.
-# Life will be easier if you avoid all filepaths with spaces or any other
-# funny characters. Don't ask for support if you ignore this advice.
-
-# Thanks to Meikel Bisping for his contributions. -- Blaine
-
-JAVA_EXECUTABLE=/usr/bin/java
-
-# Unless you copied a hsqldb.jar file from another system, this typically
-# resides at $HSQLDB_HOME/lib/hsqldb.jar, where $HSQLDB_HOME is your HSQLDB
-# software base directory.
-HSQLDB_JAR_PATH=/usr/share/java/hsqldb.jar
-
-# Where the file "server.properties" resides.
-SERVER_HOME=/var/lib/hsqldb
-
-# What UNIX user the server will run as.
-# (The shutdown client is always run as root or the invoker of the init script).# Runs as root by default, but you should take the time to set database file
-# ownerships to another user and set that user name here.
-HSQLDB_OWNER=hsqldb
-
-# The HSQLDB jar file specified in HSQLDB_JAR_PATH above will automatically
-# be in the class path. This arg specifies additional classpath elements.
-# To embed your own application, add your jar file(s) or class base
-# directories here, and add your main class to the INVOC_ADDL_ARGS setting
-# below.
-#SERVER_ADDL_CLASSPATH=/usr/local/dist/currencybank.jar
-
-# We require all Server/WebServer instances to be accessible within
-# $MAX_START_SECS from when the Server/WebServer is started.
-# Defaults to 60.
-# Raise this is you are running lots of DB instances or have a slow server.
-#MAX_START_SECS=200
-# Time to allow for JVM to die after all HSQLDB instances stopped.
-# Defaults to 1.
-#MAX_TERMINATE_SECS=0
-
-# These are "urlid" values from a SqlTool authentication file
-# ** IN ADDITION TO THOSE IN YOUR server.properties OR webserver.properties **
-# file. All server.urlid.X values from your properties file will automatically
-# be started/stopped/tested. $SHUTDOWN_URLIDS is for additional urlids which
-# will stopped. (Therefore, most users will not set this at all).
-# Separate multiple values with white space. NO OTHER SPECIAL CHARACTERS!
-# Make sure to quote the entire value if it contains white space separator(s).
-# Defaults to none (i.e., only urlids set in properties file will be stopped).
-#SHUTDOWN_URLIDS='sa mygms'
-
-# SqlTool authentication file used only for shutdown.
-# The default value will be sqltool.rc in root's home directory, since it is
-# root who runs the init script.
-# (See the SqlTool chapter of the HSQLDB User Guide if you don't understand
-# this).
-AUTH_FILE=/etc/hsqldb/sqltool.rc
-
-# Set this to either 'WebServer' or 'Server'. Defaults to Server.
-# The JVM that is started can invoke many classes (see the following item
-# about that), but this is the Server that is used (1) to check status,
-# (2) to shut down the JVM, (3) to get urlids for #1 from the
-# server's server/webserver.properties file.
-#TARGET_CLASS=WebServer
-# Note that you don't specify the org.hsqldb package, since you have no
-# choice in the matter (you can only run org.hsqldb.Server or
-# org.hsqldb.WebServer). If you specify additional classes with
-# INVOC_ADDL_ARGS (described next), you do need to specify the
-# full class name with package name.
-
-# This is where you specify exactly what your HSQLDB JVM will run.
-# The class org.hsqldb.util.MainInvoker will run the TARGET_CLASS
-# specified above with any arguments supplied here + any other classes
-# and arguments. Every additional class (in addition to the TARGET_CLASS)
-# must be preceded with an empty string, so that MainInvoker will know
-# you are giving a class name. MainInvoker will invoke the normal
-# static main(String[]) method of each such class.
-# By default, MainInvoker will just run TARGET_CLASS with no args.
-# Example that runs just the TARGET_CLASS with the specified arguments:
-#INVOC_ADDL_ARGS='-silent false'
-# Example that runs the TARGET_CLASS plus a WebServer:
-#INVOC_ADDL_ARGS='"" org.hsqldb.WebServer'
-# Note the empty string preceding the class name.
-# Example that starts TARGET_CLASS with an argument + a WebServer +
-# your own application with its args (i.e., the HSQLDB Servers are
-# "embedded" in your application). (Set SERVER_ADDL_CLASSPATH too).:
-#INVOC_ADDL_ARGS='-silent false "" org.hsqldb.WebServer "" com.acme.Stone --env prod localhost'
-# Example to run a non-TLS server in same JVM with a TLS server. In this
-# case, TARGET_CLASS is Server which will run in TLS mode by virtue of
-# setting TLS_KEYSTORE and TLS_PASSWORD above. The "additional" Server
-# here overrides the 'tls' and 'port' settings:
-#INVOC_ADDL_ARGS="'' org.hsqldb.Server -port 9002 -tls false"
-# Note that you use nested quotes to group arguments and to specify the
-# empty-string delimiter.
-
-# For TLS encryption for your Server, set these two variables.
-# N.b.: If you set these, then make this file unreadable to non-root users!!!!
-# See the TLS chapter of the HSQLDB User Guide, paying attention to the
-# security warning(s).
-# If you are running with a private server cert, then you will also need to
-# set "truststore" in the your SqlTool config file (location is set by the
-# AUTH_FILE variable in this file, or it must be at the default location for
-# HSQLDB_OWNER).
-#TLS_KEYSTORE=/path/to/jks/server.store
-#TLS_PASSWORD=password
-
-# Any JVM args for the invocation of the JDBC client used to verify DB
-# instances and to shut them down (SqlToolSprayer).
-# This example specifies the location of a private trust store for TLS
-# encryption.
-# For multiple args, put quotes around entire value.
-#CLIENT_JVMARGS=-Djavax.net.debug=ssl
-
-# Any JVM args for the server.
-# For multiple args, put quotes around entire value.
-#
-# N.B.!
-# The default value of SERVER_JVMARGS sets the system property
-# hsqldb.method_class_names to be empty. This is in order to lessen the
-# security risk posed by HSQLDB allowing Java method calls in SQL statements.
-# The implications of changing this value (as explained by the authors of
-# HSQLDB) are as follows:
-# If [it] is not set, then static methods of all available Java classes
-# can be accessed as functions in HSQLDB. If the property is set, then
-# only the list of semicolon seperated method names becomes accessible.
-# An empty property value means no class is accessible.
-# Regardless of the value of hsqldb.method_class_names, methods in
-# org.hsqldb.Library will be accessible.
-# Before making changes to the value below, please be advised of the possible
-# dangers involved in allowing SQL queries to contain Java method calls.
-SERVER_JVMARGS=-Dhsqldb.method_class_names=\"\"
-
Deleted: trunk/hsqldb1.8.0/debian/patches/hsqldb-init-provides.diff
===================================================================
--- trunk/hsqldb1.8.0/debian/patches/hsqldb-init-provides.diff 2013-05-28 12:26:38 UTC (rev 16771)
+++ trunk/hsqldb1.8.0/debian/patches/hsqldb-init-provides.diff 2013-05-28 12:46:09 UTC (rev 16772)
@@ -1,11 +0,0 @@
---- a/bin/hsqldb
-+++ b/bin/hsqldb
-@@ -47,7 +47,7 @@
- # config: /etc/sysconfig/hsqldb
-
- ### BEGIN INIT INFO
--# Provides: HSQLDB-Server
-+# Provides: hsqldb-server
- # Required-Start: $syslog $remote_fs $network $named
- # Required-Stop: $remote_fs
- # Default-Start: 2 3 4 5
Deleted: trunk/hsqldb1.8.0/debian/patches/hsqldb-init-restart.diff
===================================================================
--- trunk/hsqldb1.8.0/debian/patches/hsqldb-init-restart.diff 2013-05-28 12:26:38 UTC (rev 16771)
+++ trunk/hsqldb1.8.0/debian/patches/hsqldb-init-restart.diff 2013-05-28 12:46:09 UTC (rev 16772)
@@ -1,18 +0,0 @@
-Description: Add a force-reload command to the init.d script
---- hsqldb-1.8.0.10/bin/hsqldb-old 2009-08-17 21:03:33.000000000 +0200
-+++ hsqldb-1.8.0.10/bin/hsqldb 2009-08-17 21:04:14.000000000 +0200
-@@ -461,11 +461,11 @@
- echo "Successful shutdown ${SHUTDOWN_OPTION} (for the $TARGET_CLASS process)!"
- exit 0
- ;;
-- restart|restartcompacted)
-+ restart|restartcompacted|force-reload)
- STOP_COMMAND=stop
- [ "$COMMAND" = restartcompacted ] && STOP_COMMAND=stopcompact
-- "${INVOC_PATH}"hsqldb $STOP_COMMAND || exit $?
-- exec "${INVOC_PATH}"/hsqldb start
-+ $0 $STOP_COMMAND || exit $?
-+ $0 start
- ;;
- *)
- echo "$SYNTAX_MSG" 1>&2
Deleted: trunk/hsqldb1.8.0/debian/patches/hsqldb-init-tempfile.diff
===================================================================
--- trunk/hsqldb1.8.0/debian/patches/hsqldb-init-tempfile.diff 2013-05-28 12:26:38 UTC (rev 16771)
+++ trunk/hsqldb1.8.0/debian/patches/hsqldb-init-tempfile.diff 2013-05-28 12:46:09 UTC (rev 16772)
@@ -1,11 +0,0 @@
---- a/bin/hsqldb
-+++ b/bin/hsqldb
-@@ -109,7 +109,7 @@
- SU_ECHO_SECS=1
- # File used as semaphore. If file is removed, a running pid checker
- # process will exit.
--PIDCHECKER_FLAGFILE=/tmp/pidchecker.run
-+PIDCHECKER_FLAGFILE=`mktemp /tmp/hsqldb.XXXXXXXX`
- # The following settings get overridden by optional setting in the config file.
- # Time to allow for JVM to die after all HSQLDB instances stopped.
- MAX_TERMINATE_SECS=1
Deleted: trunk/hsqldb1.8.0/debian/patches/insserv-defaults.diff
===================================================================
--- trunk/hsqldb1.8.0/debian/patches/insserv-defaults.diff 2013-05-28 12:26:38 UTC (rev 16771)
+++ trunk/hsqldb1.8.0/debian/patches/insserv-defaults.diff 2013-05-28 12:46:09 UTC (rev 16772)
@@ -1,19 +0,0 @@
---- a/bin/hsqldb
-+++ b/bin/hsqldb
-@@ -46,13 +46,12 @@
- # pidfile: /var/run/hsqldb.pid
- # config: /etc/sysconfig/hsqldb
-
--# This stuff for SuSE Linux. Contributed by M. Bisping.
- ### BEGIN INIT INFO
- # Provides: HSQLDB-Server
- # Required-Start: $syslog $remote_fs $network $named
--# Required-Stop:
--# Default-Start: 3 5
--# Default-Stop: 0 1 2 6
-+# Required-Stop: $remote_fs
-+# Default-Start: 2 3 4 5
-+# Default-Stop: 0 1 6
- # Short-Description: HSQLDB-Server
- # Description: Hsqldb, A High Performance Java Database Server
- ### END INIT INFO
Modified: trunk/hsqldb1.8.0/debian/patches/series
===================================================================
--- trunk/hsqldb1.8.0/debian/patches/series 2013-05-28 12:26:38 UTC (rev 16771)
+++ trunk/hsqldb1.8.0/debian/patches/series 2013-05-28 12:46:09 UTC (rev 16772)
@@ -1,11 +1,7 @@
bitxor2.diff
hsqldb-demos.patch
-hsqldb-init-restart.diff
hsqldb-prefs-file.patch
-insserv-defaults.diff
fix-lock.patch
-hsqldb-init-provides.diff
-hsqldb-init-tempfile.diff
i104901.patch
use-system-servlet.jar.diff
java7-jdbc-4.1.patch
Modified: trunk/hsqldb1.8.0/debian/rules
===================================================================
--- trunk/hsqldb1.8.0/debian/rules 2013-05-28 12:26:38 UTC (rev 16771)
+++ trunk/hsqldb1.8.0/debian/rules 2013-05-28 12:46:09 UTC (rev 16772)
@@ -64,17 +64,10 @@
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/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
rm -Rf target
rm -Rf doc/src/*.html doc/src/package-list doc/src/org doc/src/resources
More information about the pkg-java-commits
mailing list