[derby] 27/53: Rewrote the tools invocation scripts to use java-wrappers

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository derby.

commit 8aba709e2a3ab18eb0b30c88bb648583e84a086a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Jun 9 22:48:11 2013 +0000

    Rewrote the tools invocation scripts to use java-wrappers
---
 debian/changelog                |  1 +
 debian/control                  |  6 +++++-
 debian/derby-tools.poms         |  2 +-
 debian/libderby-java.poms       |  4 ++--
 debian/libderbyclient-java.poms |  2 +-
 debian/rules                    | 19 ++++++++++++-------
 6 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4151637..e4ae5d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ derby (10.10.1.1-1) unstable; urgency=low
     - 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
 
diff --git a/debian/control b/debian/control
index 2ffc4c2..a16b08c 100644
--- a/debian/control
+++ b/debian/control
@@ -46,12 +46,15 @@ Description: Apache Derby Database Engine and Embedded JDBC Driver
 
 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 @@ Description: Apache Derby Tools
     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
diff --git a/debian/derby-tools.poms b/debian/derby-tools.poms
index a7d8c2b..18db4a5 100644
--- a/debian/derby-tools.poms
+++ b/debian/derby-tools.poms
@@ -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
diff --git a/debian/libderby-java.poms b/debian/libderby-java.poms
index 9776360..43efed6 100644
--- a/debian/libderby-java.poms
+++ b/debian/libderby-java.poms
@@ -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
diff --git a/debian/libderbyclient-java.poms b/debian/libderbyclient-java.poms
index a18591e..b432dbd 100644
--- a/debian/libderbyclient-java.poms
+++ b/debian/libderbyclient-java.poms
@@ -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
diff --git a/debian/rules b/debian/rules
index c856199..12b7223 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,9 +29,6 @@ override_dh_auto_build:
 	
 	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_compress:
 
 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)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/derby.git