[med-svn] r13107 - trunk/packages/apache-derby/trunk/debian

[Timothy Booth]

Author: tbooth-guest
Date: 2013-02-24 16:44:23 +0000 (Sun, 24 Feb 2013)
New Revision: 13107

Modified:
   trunk/packages/apache-derby/trunk/debian/control
   trunk/packages/apache-derby/trunk/debian/rules
Log:
Final tweaks today.  Validation tests not yet running.


Modified: trunk/packages/apache-derby/trunk/debian/control
===================================================================
--- trunk/packages/apache-derby/trunk/debian/control	2013-02-24 16:42:20 UTC (rev 13106)
+++ trunk/packages/apache-derby/trunk/debian/control	2013-02-24 16:44:23 UTC (rev 13107)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Tim Booth <tbooth at ceh.ac.uk>
-Build-Depends: debhelper (>= 9), default-jdk, javacc, junit, liboro-java
+Build-Depends: debhelper (>= 9), default-jdk, javacc, junit, liboro-java, ant1.7
 Standards-Version: 3.9.3
 Homepage: http://db.apache.org/derby/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/apache-derby/trunk/
@@ -46,7 +46,7 @@
 Package: apache-derby-core
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, apache-derby-common
-Suggests: apache-derby-core, apache-derby-client, apache-derby-doc, apache-derby-javadoc, apache-derby-demo
+Suggests: apache-derby-client, apache-derby-doc, apache-derby-javadoc, apache-derby-demo
 Description: Embeddable relational database for Java, core
  An open source relational database implemented entirely in Java.
  * Derby has a small footprint -- about 2.6 megabytes for the base engine and

Modified: trunk/packages/apache-derby/trunk/debian/rules
===================================================================
--- trunk/packages/apache-derby/trunk/debian/rules	2013-02-24 16:42:20 UTC (rev 13106)
+++ trunk/packages/apache-derby/trunk/debian/rules	2013-02-24 16:44:23 UTC (rev 13107)
@@ -21,6 +21,7 @@
 	find -name debian -prune -or -name '.svn' -execdir rm -rf '{}' ';' -prune
 	find -name debian -prune -or -name '.git*' -execdir rm -rf '{}' ';' -prune
 	find -name debian -prune -or -name '*.jar' -execdir rm '{}' ';'
+	find -name debian -prune -or -name 'derby.log' -execdir rm '{}' ';'
 	
 override_dh_auto_build:
 	#Put .jar files in place
@@ -39,6 +40,10 @@
 
 override_dh_install:
 	dh_install -X.bat
+
+override_dh_test:
+	env CLASSPATH=`echo jars/insane/*.jar | tr ' ' ':'` \
+	    java org.apache.derby.tools.sysinfo
 	
 get-orig-source:
 	. debian/get-orig-source