[derby] 15/53: Added a derby-tools package with the command line tools

Thu Nov 24 13:58:00 UTC 2016

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

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

commit a63ab9a4a1d4d8a3fc08e6c4d8e158a62073339c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jun 7 14:42:04 2013 +0000

    Added a derby-tools package with the command line tools
---
 debian/changelog             |  2 ++
 debian/control               | 38 ++++++++++++++++++++++++++++++++------
 debian/derby-tools.poms      |  1 +
 debian/libderby-java.install |  2 --
 debian/libderby-java.poms    |  1 -
 debian/rules                 | 17 +++++++----------
 6 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 65d225b..693e95b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,9 @@ derby (10.10.1.1-1) UNRELEASED; urgency=low
     - Removed the redundant Priority fields
   * Renamed the derby-core package to libderby-java
   * Renamed the derby-client package to libderbyclient-java
+  * Added a derby-tools package with the command line tools
   * Installed Maven poms to /usr/share/maven-repo
+  * Added the missing patch descriptions
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 07 Jun 2013 00:51:41 +0200
 
diff --git a/debian/control b/debian/control
index 9c0a104..0224be0 100644
--- a/debian/control
+++ b/debian/control
@@ -13,12 +13,12 @@ Package: libderbyclient-java
 Architecture: all
 Depends: ${misc:Depends}
 Description: Apache Derby Client JDBC Driver
- The Derby network client provides network connectivity to the Derby Network Server.
- It is distributed as an additional jar file, derbyclient.jar, with an entirely
- independent code base from the embedded driver.
+ The Derby network client provides network connectivity to the Derby Network
+ Server. It is distributed as an additional jar file, derbyclient.jar, with an
+ entirely independent code base from the embedded driver.
  .
- The Derby network client is a type 4, JDBC compliant Driver, which attempts to match
- the Derby Embedded JDBC driver as much as possible.
+ The Derby network client is a type 4, JDBC compliant Driver, which attempts
+ to match the Derby Embedded JDBC driver as much as possible.
  .
  The Derby Network Server is provided by the derby-core package.
 
@@ -47,7 +47,8 @@ Architecture: all
 Depends: ${misc:Depends}
 Suggests: libderbyclient-java, derby-javadoc, derby-demo
 Description: Apache Derby Database Engine and Embedded JDBC Driver
- Apache Derby is an open source relational database implemented entirely in Java.
+ Apache Derby is an open source relational database implemented entirely
+ in Java.
   * Derby has a small footprint -- about 2.6 megabytes for the base engine and
     embedded JDBC driver.
   * Derby is based on the Java, JDBC, and SQL standards.
@@ -60,6 +61,31 @@ Description: Apache Derby Database Engine and Embedded JDBC Driver
  This package includes the database server, the embedded JDBC driver, utilities
  and localisations.
 
+Package: derby-tools
+Architecture: all
+Depends: ${misc:Depends}, libderby-java, libderbyclient-java
+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:
+  * 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
+    in accessing a variety of JDBC features.
+    ij can be used in an embedded or a client/server environment.
+  * sysinfo, provides information about your version of Derby and your
+    environment.
+  * dblook, the Derby's Data Definition Language (DDL) Generation Utility,
+    more informally called a schema dump tool. It is a simple utility that
+    dumps the DDL of a user-specified database to either a console or a file.
+    The generated DDL can then be used for such things as recreating all or
+    parts of a database, viewing a subset of a database's objects (for example,
+    those which pertain to specific tables and schemas), or documenting
+    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.
+
 Package: derby-demo
 Architecture: all
 Section: devel
diff --git a/debian/derby-tools.poms b/debian/derby-tools.poms
new file mode 100644
index 0000000..71de829
--- /dev/null
+++ b/debian/derby-tools.poms
@@ -0,0 +1 @@
+maven2/tools/pom.xml --no-parent
diff --git a/debian/libderby-java.install b/debian/libderby-java.install
deleted file mode 100644
index f7404b1..0000000
--- a/debian/libderby-java.install
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/set*CP /usr/lib/derby/bin
-generated/bin/* /usr/lib/derby/bin
diff --git a/debian/libderby-java.poms b/debian/libderby-java.poms
index 7eae9b0..fce8372 100644
--- a/debian/libderby-java.poms
+++ b/debian/libderby-java.poms
@@ -1,6 +1,5 @@
 maven2/engine/pom.xml --no-parent
 maven2/net/pom.xml --no-parent
-maven2/tools/pom.xml --no-parent
 maven2/derbyLocale_cs/pom.xml --no-parent
 maven2/derbyLocale_de_DE/pom.xml --no-parent
 maven2/derbyLocale_es/pom.xml --no-parent
diff --git a/debian/rules b/debian/rules
index 0bf6850..3ed21c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,31 +27,28 @@ override_dh_auto_build:
 	cat /usr/share/java/javacc.jar > tools/java/javacc.jar
 	cat /usr/share/java/junit.jar > tools/java/junit.jar
 	
-	ant buildsource buildjars binscripts
-	#And docs
-	ant javadoc
+	ant buildsource buildjars binscripts javadoc
 
 override_dh_install:
-	dh_install -X.bat
-	chmod a+x debian/libderby-java/usr/lib/derby/bin/*
+	chmod a+x debian/derby-tools/usr/lib/derby/bin/*
 
 override_dh_test:
 	env CLASSPATH=`echo jars/insane/*.jar | tr ' ' ':'` \
 	    java org.apache.derby.tools.sysinfo
 	ant all
 
-#Moved symlink stuff here so it works after version change
-override_dh_link:
-	dh_link --verbose
-
 override_dh_auto_install:
 	mh_installpoms -plibderbyclient-java -e$(version)
 	mh_installjar -plibderbyclient-java --java-lib -nderbyclient maven2/client/pom.xml jars/insane/derbyclient.jar
 	
+	mh_installpoms -pderby-tools -e$(version)
+	mh_installjar -pderby-tools -e$(version) --java-lib maven2/tools/pom.xml  jars/insane/derbytools.jar
+	dh_install -pderby-tools bin/set*CP /usr/lib/derby/bin
+	dh_install -pderby-tools generated/bin/* /usr/lib/derby/bin
+	
 	mh_installpoms -plibderby-java -e$(version)
 	mh_installjar -plibderby-java -e$(version) --java-lib maven2/engine/pom.xml jars/insane/derby.jar
 	mh_installjar -plibderby-java -e$(version) --java-lib maven2/net/pom.xml    jars/insane/derbynet.jar
-	mh_installjar -plibderby-java -e$(version) --java-lib maven2/tools/pom.xml  jars/insane/derbytools.jar
 	mh_installjar -plibderby-java -e$(version) --java-lib maven2/derbyLocale_cs/pom.xml    jars/insane/derbyLocale_cs.jar
 	mh_installjar -plibderby-java -e$(version) --java-lib maven2/derbyLocale_de_DE/pom.xml jars/insane/derbyLocale_de_DE.jar
 	mh_installjar -plibderby-java -e$(version) --java-lib maven2/derbyLocale_es/pom.xml    jars/insane/derbyLocale_es.jar

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

