Author: ebourg-guest
Date: 2013-05-28 13:08:40 +0000 (Tue, 28 May 2013)
New Revision: 16773
Removed:
trunk/hsqldb1.8.0/debian/bin/
trunk/hsqldb1.8.0/debian/hsqldb-utils.examples
trunk/hsqldb1.8.0/debian/hsqldb-utils.manpages
trunk/hsqldb1.8.0/debian/hsqldb-utils.menu
trunk/hsqldb1.8.0/debian/man/
Modified:
trunk/hsqldb1.8.0/debian/control
trunk/hsqldb1.8.0/debian/rules
Log:
Removed the hsqldb-utils package
Modified: trunk/hsqldb1.8.0/debian/control
===================================================================
--- trunk/hsqldb1.8.0/debian/control 2013-05-28 12:46:09 UTC (rev 16772)
+++ trunk/hsqldb1.8.0/debian/control 2013-05-28 13:08:40 UTC (rev 16773)
@@ -38,26 +38,3 @@
applets), and a number of demonstration examples.
.
This package contains the documentation of HSQLDB.
-
-Package: hsqldb-utils
-Section: database
-Architecture: all
-Depends: default-jre-headless | java6-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
- 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
-
Deleted: trunk/hsqldb1.8.0/debian/hsqldb-utils.examples
===================================================================
--- trunk/hsqldb1.8.0/debian/hsqldb-utils.examples 2013-05-28 12:46:09 UTC
(rev 16772)
+++ trunk/hsqldb1.8.0/debian/hsqldb-utils.examples 2013-05-28 13:08:40 UTC
(rev 16773)
@@ -1 +0,0 @@
-src/org/hsqldb/sample/sqltool.rc
Deleted: trunk/hsqldb1.8.0/debian/hsqldb-utils.manpages
===================================================================
--- trunk/hsqldb1.8.0/debian/hsqldb-utils.manpages 2013-05-28 12:46:09 UTC
(rev 16772)
+++ trunk/hsqldb1.8.0/debian/hsqldb-utils.manpages 2013-05-28 13:08:40 UTC
(rev 16773)
@@ -1,5 +0,0 @@
-debian/man/hsqldb-databasemanager.1
-debian/man/hsqldb-databasemanagerswing.1
-debian/man/hsqldb-querytool.1
-debian/man/hsqldb-sqltool.1
-debian/man/hsqldb-transfer.1
Deleted: trunk/hsqldb1.8.0/debian/hsqldb-utils.menu
===================================================================
--- trunk/hsqldb1.8.0/debian/hsqldb-utils.menu 2013-05-28 12:46:09 UTC (rev
16772)
+++ trunk/hsqldb1.8.0/debian/hsqldb-utils.menu 2013-05-28 13:08:40 UTC (rev
16773)
@@ -1,31 +0,0 @@
-?package(hsqldb-utils):\
- needs="X11"\
- section="Applications/Data Management"\
- title="HSQLDB Database Manager"\
- command="/usr/bin/hsqldb-databasemanager"\
- icon="/usr/share/pixmaps/hsqldb.xpm"\
- hints="HSQLDB"
-
-?package(hsqldb-utils):\
- needs="X11"\
- section="Applications/Data Management"\
- title="HSQLDB Database Manager (Swing)"\
- command="/usr/bin/hsqldb-databasemanagerswing"\
- icon="/usr/share/pixmaps/hsqldb.xpm"\
- hints="HSQLDB"
-
-?package(hsqldb-utils):\
- needs="X11"\
- section="Applications/Data Management"\
- title="HSQLDB Query Tool"\
- command="/usr/bin/hsqldb-querytool"\
- icon="/usr/share/pixmaps/hsqldb.xpm"\
- hints="HSQLDB"
-
-?package(hsqldb-utils):\
- needs="X11"\
- section="Applications/Data Management"\
- title="HSQLDB Transfer Tool"\
- command="/usr/bin/hsqldb-transfer"\
- icon="/usr/share/pixmaps/hsqldb.xpm"\
- hints="HSQLDB"
Modified: trunk/hsqldb1.8.0/debian/rules
===================================================================
--- trunk/hsqldb1.8.0/debian/rules 2013-05-28 12:46:09 UTC (rev 16772)
+++ trunk/hsqldb1.8.0/debian/rules 2013-05-28 13:08:40 UTC (rev 16773)
@@ -6,15 +6,12 @@
JAVA_HOME = /usr/lib/jvm/default-java
DEB_JARS = servlet-api-3.0
DEB_ANT_BUILDFILE = build/build.xml
-DEB_ANT_BUILD_TARGET = hsqldb hsqldbutil javadoc
+DEB_ANT_BUILD_TARGET = hsqldb javadoc
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
-build/hsqldb-utils::
- $(MAKE) -C debian/bin all
-
common-build-indep:: changelog.combined NEWS
define combine-changelog
@@ -39,11 +36,6 @@
$(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
-
post-patches::
# copy the original source files before compiling to preserve them from
modifications
mkdir --parents target/generated-sources
@@ -53,20 +45,11 @@
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-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::
- 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
-
clean::
rm -f lib/hsqldb*.jar
- $(MAKE) -C debian/bin clean
rm -f changelog.combined NEWS
mh_clean
rm -Rf target
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
