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

Fri Jun 7 14:42:05 UTC 2013

Author: ebourg-guest
Date: 2013-06-07 14:42:04 +0000 (Fri, 07 Jun 2013)
New Revision: 16853

Added:
   trunk/derby/debian/derby-tools.poms
Removed:
   trunk/derby/debian/libderby-java.install
Modified:
   trunk/derby/debian/changelog
   trunk/derby/debian/control
   trunk/derby/debian/libderby-java.poms
   trunk/derby/debian/rules
Log:
Added a derby-tools package with the command line tools



Modified: trunk/derby/debian/changelog
===================================================================

--- trunk/derby/debian/changelog	2013-06-07 14:27:48 UTC (rev 16852)
+++ trunk/derby/debian/changelog	2013-06-07 14:42:04 UTC (rev 16853)
@@ -10,7 +10,9 @@
     - 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
 

Modified: trunk/derby/debian/control
===================================================================
--- trunk/derby/debian/control	2013-06-07 14:27:48 UTC (rev 16852)
+++ trunk/derby/debian/control	2013-06-07 14:42:04 UTC (rev 16853)
@@ -13,12 +13,12 @@
 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 @@
 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 @@
  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

Added: trunk/derby/debian/derby-tools.poms
===================================================================
--- trunk/derby/debian/derby-tools.poms	                        (rev 0)
+++ trunk/derby/debian/derby-tools.poms	2013-06-07 14:42:04 UTC (rev 16853)
@@ -0,0 +1 @@
+maven2/tools/pom.xml --no-parent

Deleted: trunk/derby/debian/libderby-java.install
===================================================================
--- trunk/derby/debian/libderby-java.install	2013-06-07 14:27:48 UTC (rev 16852)
+++ trunk/derby/debian/libderby-java.install	2013-06-07 14:42:04 UTC (rev 16853)
@@ -1,2 +0,0 @@
-bin/set*CP /usr/lib/derby/bin
-generated/bin/* /usr/lib/derby/bin

Modified: trunk/derby/debian/libderby-java.poms
===================================================================
--- trunk/derby/debian/libderby-java.poms	2013-06-07 14:27:48 UTC (rev 16852)
+++ trunk/derby/debian/libderby-java.poms	2013-06-07 14:42:04 UTC (rev 16853)
@@ -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

Modified: trunk/derby/debian/rules
===================================================================
--- trunk/derby/debian/rules	2013-06-07 14:27:48 UTC (rev 16852)
+++ trunk/derby/debian/rules	2013-06-07 14:42:04 UTC (rev 16853)
@@ -27,31 +27,28 @@
 	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


