[pkg-java] r16739 - trunk/hsqldb/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-05-27 09:30:16 +0000 (Mon, 27 May 2013)
New Revision: 16739

Modified:
   trunk/hsqldb/debian/control
   trunk/hsqldb/debian/rules
Log:
Removed the libhsqldb-java-gcj package



Modified: trunk/hsqldb/debian/control
===================================================================
--- trunk/hsqldb/debian/control	2013-05-27 09:14:11 UTC (rev 16738)
+++ trunk/hsqldb/debian/control	2013-05-27 09:30:16 UTC (rev 16739)
@@ -8,8 +8,8 @@
 Package: libhsqldb-java
 Section: java
 Architecture: all
-Depends: gij | java-gcj-compat | java2-runtime, libservlet2.5-java, ${misc:Depends}
-Suggests: java-virtual-machine, libhsqldb-java-doc, libhsqldb-java-gcj
+Depends: java2-runtime, libservlet2.5-java, ${misc:Depends}
+Suggests: java-virtual-machine, libhsqldb-java-doc
 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
@@ -22,22 +22,6 @@
  .
  Web site: http://hsqldb.org/
 
-Package: libhsqldb-java-gcj
-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
@@ -59,7 +43,7 @@
 Package: hsqldb-server
 Section: database
 Architecture: all
-Depends: libhsqldb-java (= ${binary:Version}), adduser, lsb-base (>= 3.0-3), gcj-jre, ${misc:Depends}
+Depends: 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
@@ -78,7 +62,7 @@
 Package: hsqldb-utils
 Section: database
 Architecture: all
-Depends: libhsqldb-java (= ${binary:Version}), gij | java-gcj-compat | java2-runtime, ${misc:Depends}
+Depends: libhsqldb-java (= ${binary:Version}), 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

Modified: trunk/hsqldb/debian/rules
===================================================================
--- trunk/hsqldb/debian/rules	2013-05-27 09:14:11 UTC (rev 16738)
+++ trunk/hsqldb/debian/rules	2013-05-27 09:30:16 UTC (rev 16739)
@@ -60,7 +60,7 @@
 
 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 \
+	sed -i s,JAVA_EXECUTABLE=.*,JAVA_EXECUTABLE=/usr/bin/java,g \
 		debian/hsqldb-server/etc/hsqldb.conf
 	cp bin/hsqldb debian/hsqldb-server.init
 
@@ -69,6 +69,3 @@
 	$(MAKE) -C debian/bin clean
 	rm -f changelog.combined NEWS
 	rm -f debian/hsqldb-server.init
-
-install/libhsqldb-java-gcj:: install-indep
-	dh_nativejava -plibhsqldb-java-gcj