[pkg-java] r16865 - trunk/derby/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-06-09 22:48:11 +0000 (Sun, 09 Jun 2013)
New Revision: 16865

Modified:
   trunk/derby/debian/changelog
   trunk/derby/debian/control
   trunk/derby/debian/derby-tools.poms
   trunk/derby/debian/libderby-java.poms
   trunk/derby/debian/libderbyclient-java.poms
   trunk/derby/debian/rules
Log:
Rewrote the tools invocation scripts to use java-wrappers



Modified: trunk/derby/debian/changelog
===================================================================
--- trunk/derby/debian/changelog	2013-06-08 23:42:00 UTC (rev 16864)
+++ trunk/derby/debian/changelog	2013-06-09 22:48:11 UTC (rev 16865)
@@ -22,6 +22,7 @@
     - remove the duplicate-files warning on the Javadoc files
   * The script files for the tools are now in /usr/share/derby
     instead of /usr/lib/derby
+  * Rewrote the tools invocation scripts to use java-wrappers
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sat, 08 Jun 2013 09:55:25 +0200
 

Modified: trunk/derby/debian/control
===================================================================
--- trunk/derby/debian/control	2013-06-08 23:42:00 UTC (rev 16864)
+++ trunk/derby/debian/control	2013-06-09 22:48:11 UTC (rev 16865)
@@ -46,12 +46,15 @@
 
 Package: derby-tools
 Architecture: all
-Depends: ${misc:Depends}, libderby-java, libderbyclient-java
+Depends: ${misc:Depends}, libderby-java, libderbyclient-java, java-wrappers
 Description: Apache Derby Tools
  The Derby tools and utilities are a set of routines supplied with Derby
  that are typically used to create, inspect, and update a Derby database.
  .
  These tools and utilities include:
+  * NetworkServerControl, provides the ability to start a Network Server or
+    connect to a running Network Server to shutdown, configure or retrieve
+    diagnostic information. 
   * ij, the Derby's interactive JDBC scripting tool. It is a simple utility
     for running scripts against a Derby database. You can also use it
     interactively to run ad hoc queries. ij provides several commands for ease
@@ -68,6 +71,7 @@
     a database's schema.
   * SignatureChecker, a tool that identifies any SQL functions and procedures
     in a database that do not follow the SQL Standard argument matching rules.
+  * PlanExporter, a tool to export query plan data for further analysis.
 
 Package: derby-doc
 Architecture: all

Modified: trunk/derby/debian/derby-tools.poms
===================================================================
--- trunk/derby/debian/derby-tools.poms	2013-06-08 23:42:00 UTC (rev 16864)
+++ trunk/derby/debian/derby-tools.poms	2013-06-09 22:48:11 UTC (rev 16865)
@@ -1 +1 @@
-maven2/tools/pom.xml --no-parent --java-lib --artifact=jars/insane/derbytools.jar
+maven2/tools/pom.xml --no-parent --java-lib --artifact=jars/insane/derbytools.jar --dest-jar=usr/share/java/derbytools.jar

Modified: trunk/derby/debian/libderby-java.poms
===================================================================
--- trunk/derby/debian/libderby-java.poms	2013-06-08 23:42:00 UTC (rev 16864)
+++ trunk/derby/debian/libderby-java.poms	2013-06-09 22:48:11 UTC (rev 16865)
@@ -1,5 +1,5 @@
-maven2/engine/pom.xml --no-parent --java-lib --artifact=jars/insane/derby.jar
-maven2/net/pom.xml    --no-parent --java-lib --artifact=jars/insane/derbynet.jar
+maven2/engine/pom.xml --no-parent --java-lib --artifact=jars/insane/derby.jar    --dest-jar=usr/share/java/derby.jar
+maven2/net/pom.xml    --no-parent --java-lib --artifact=jars/insane/derbynet.jar --dest-jar=usr/share/java/derbynet.jar
 maven2/derbyLocale_cs/pom.xml    --no-parent --java-lib --artifact=jars/insane/derbyLocale_cs.jar
 maven2/derbyLocale_de_DE/pom.xml --no-parent --java-lib --artifact=jars/insane/derbyLocale_de_DE.jar
 maven2/derbyLocale_es/pom.xml    --no-parent --java-lib --artifact=jars/insane/derbyLocale_es.jar

Modified: trunk/derby/debian/libderbyclient-java.poms
===================================================================
--- trunk/derby/debian/libderbyclient-java.poms	2013-06-08 23:42:00 UTC (rev 16864)
+++ trunk/derby/debian/libderbyclient-java.poms	2013-06-09 22:48:11 UTC (rev 16865)
@@ -1 +1 @@
-maven2/client/pom.xml --no-parent --java-lib --artifact=jars/insane/derbyclient.jar
+maven2/client/pom.xml --no-parent --java-lib --artifact=jars/insane/derbyclient.jar --dest-jar=usr/share/java/derbyclient.jar

Modified: trunk/derby/debian/rules
===================================================================
--- trunk/derby/debian/rules	2013-06-08 23:42:00 UTC (rev 16864)
+++ trunk/derby/debian/rules	2013-06-09 22:48:11 UTC (rev 16865)
@@ -29,9 +29,6 @@
 	
 	ant buildsource buildjars binscripts javadoc
 
-override_dh_install:
-	chmod a+x debian/derby-tools/usr/share/derby/bin/*
-
 override_dh_installdocs:
 	rm -Rf javadoc/testing
 	dh_installdocs
@@ -48,13 +45,21 @@
 
 override_dh_auto_install:
 	mh_install -plibderbyclient-java -e$(version)
-
-	dh_install -pderby-tools bin/set*CP /usr/share/derby/bin
-	dh_install -pderby-tools generated/bin/* /usr/share/derby/bin
-	mh_install -pderby-tools -e$(version)
 	
 	mh_install -plibderby-java -e$(version)
 	dh_installchangelogs -plibderby-java RELEASE-NOTES.html
+	
+	mh_install -pderby-tools -e$(version)
+	mkdir -p debian/derby-tools/usr/share/derby
+	install -m 755 debian/wrappers/ij                   debian/derby-tools/usr/share/derby
+	install -m 755 debian/wrappers/dblook               debian/derby-tools/usr/share/derby
+	install -m 755 debian/wrappers/sysinfo              debian/derby-tools/usr/share/derby
+	install -m 755 debian/wrappers/NetworkServerControl debian/derby-tools/usr/share/derby
+	install -m 755 debian/wrappers/PlanExporter         debian/derby-tools/usr/share/derby
+	install -m 755 debian/wrappers/SignatureChecker     debian/derby-tools/usr/share/derby
+	dh_link -pderby-tools usr/share/derby/ij                   usr/bin/ij
+	dh_link -pderby-tools usr/share/derby/dblook               usr/bin/dblook
+	dh_link -pderby-tools usr/share/derby/NetworkServerControl usr/bin/derbyctl	
 
 get-orig-source:
 	uscan --force-download --download-version $(version)