summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2009-10-03 17:17:55 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2009-10-03 17:17:55 +0000
commit1e53c005f8ddc7ebe6f6167718d12c26c35d23c2 (patch)
treebc3ee7977745208a682f7cd66f2d86e14794c8e1 /dev-db/hsqldb
parentamd64/x86 stable, bug #287316 (diff)
downloadgentoo-2-1e53c005f8ddc7ebe6f6167718d12c26c35d23c2.tar.gz
gentoo-2-1e53c005f8ddc7ebe6f6167718d12c26c35d23c2.tar.bz2
gentoo-2-1e53c005f8ddc7ebe6f6167718d12c26c35d23c2.zip
Cleanup duplicate files from files directory. Fixes bug #286379.
(Portage version: 2.2_rc40/cvs/Linux i686)
Diffstat (limited to 'dev-db/hsqldb')
-rw-r--r--dev-db/hsqldb/ChangeLog6
-rw-r--r--dev-db/hsqldb/files/server.properties-r120
-rw-r--r--dev-db/hsqldb/files/sqltool.rc-r120
3 files changed, 5 insertions, 41 deletions
diff --git a/dev-db/hsqldb/ChangeLog b/dev-db/hsqldb/ChangeLog
index d389dad22aac..cd8f79ffb3b9 100644
--- a/dev-db/hsqldb/ChangeLog
+++ b/dev-db/hsqldb/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-db/hsqldb
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.51 2009/10/03 17:15:25 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.52 2009/10/03 17:17:54 betelgeuse Exp $
+
+ 03 Oct 2009; Petteri Räty <betelgeuse@gentoo.org>
+ -files/server.properties-r1, -files/sqltool.rc-r1:
+ Cleanup duplicate files from files directory. Fixes bug #286379.
03 Oct 2009; Petteri Räty <betelgeuse@gentoo.org>
-hsqldb-1.8.0.9-r1.ebuild:
diff --git a/dev-db/hsqldb/files/server.properties-r1 b/dev-db/hsqldb/files/server.properties-r1
deleted file mode 100644
index 4827d1cb6ec0..000000000000
--- a/dev-db/hsqldb/files/server.properties-r1
+++ /dev/null
@@ -1,20 +0,0 @@
-# Hsqldb Server cfg file.
-# See the UNIX Quick Start and the Advanced Topics chapters
-# of the Hsqldb User Guide.
-
-server.database.0=file:/var/lib/hsqldb/db1
-server.urlid.0=localhost
-
-# Warning!
-# When running hsqldb in Server mode, for each additional database
-# the server.urlid.X entry must have a proper corresponding urlid
-# section in the 'sqltool.rc' file.
-# Otherwise you may have problems with shutting down the server.
-#
-# Note that each server can serve only up to 10 different
-# databases simultaneously (with consecutive {0-9} suffixes).
-
-# An example of additional database.
-#server.database.1=file:/var/lib/hsqldb/newdb/newdb
-#server.dbname.1=newdb
-#server.urlid.1=newdb
diff --git a/dev-db/hsqldb/files/sqltool.rc-r1 b/dev-db/hsqldb/files/sqltool.rc-r1
deleted file mode 100644
index 9284be44867a..000000000000
--- a/dev-db/hsqldb/files/sqltool.rc-r1
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id sqltool.rc,v 1.11 2004/07/18 21:34:35 unsaved Exp $
-
-# This is a sample SqlTool configuration file, a.k.a. rc file.
-
-# This is for a hsqldb Server running with default settings on your local
-# computer (and for which you have not changed the password for "sa").
-urlid localhost
-url jdbc:hsqldb:hsql://localhost
-username sa
-password
-
-# Each urlid section in this file corresponds to one of the
-# server.urlid.X entries in the 'server.properties' file.
-# This is required by the hsqldb init script.
-
-# An example of additional database.
-#urlid newdb
-#url jdbc:hsqldb:hsql://localhost/newdb
-#username sa
-#password