[pkg-java] r4339 - in trunk/solr/debian: . patches

[janpascal-guest at alioth.debian.org]

Author: janpascal-guest
Date: 2007-10-10 20:28:40 +0000 (Wed, 10 Oct 2007)
New Revision: 4339

Modified:
   trunk/solr/debian/changelog
   trunk/solr/debian/patches/05_use-debian-java-libraries.dpatch
   trunk/solr/debian/rules
Log:
Enable unit tests; note in changelog that tomcat integration bug is not yet fixed

Modified: trunk/solr/debian/changelog
===================================================================
--- trunk/solr/debian/changelog	2007-10-10 18:40:41 UTC (rev 4338)
+++ trunk/solr/debian/changelog	2007-10-10 20:28:40 UTC (rev 4339)
@@ -1,9 +1,9 @@
-solr (1.2.0+ds1-2) unstable; urgency=low
+solr (1.2.0+ds1-2~pre1) unstable; urgency=low
 
   [ Jan-Pascal van Best ]
   * Run unit tests during build (closes: #441890).
   * Install link to config file in /etc/tomcat5.5/Catalina/localhost
-    (closes: #443382).
+    (does not close yet: #443382).
   * Rename /usr/share/solr/bin directory to /usr/share/solr/scripts, since
     this directory contains only scripts
   * Add Portuguese translation of debconf messages (closes: #442306, #445351).
@@ -12,7 +12,7 @@
   * Add Finnish translation of debconf messages (closes: #445701).
   * Add Russian translation of debconf messages (closes: #446140).
 
- -- Michael Koch <konqueror at gmx.de>  Wed, 10 Oct 2007 20:39:21 +0200
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Wed, 10 Oct 2007 22:24:25 +0200
 
 solr (1.2.0+ds1-1) unstable; urgency=low
 

Modified: trunk/solr/debian/patches/05_use-debian-java-libraries.dpatch
===================================================================
--- trunk/solr/debian/patches/05_use-debian-java-libraries.dpatch	2007-10-10 18:40:41 UTC (rev 4338)
+++ trunk/solr/debian/patches/05_use-debian-java-libraries.dpatch	2007-10-10 20:28:40 UTC (rev 4339)
@@ -19,7 +19,7 @@
  
    <!-- solr source files -->
    <property name="src" value="src" />
-@@ -162,7 +162,17 @@
+@@ -162,7 +162,18 @@
    <!-- The compilation classpath -->
    <path id="compile.classpath">
      <fileset dir="${lib}">
@@ -35,6 +35,7 @@
 +      <include name="commons-fileupload.jar" />
 +      <include name="commons-io.jar" />
 +      <include name="xpp3.jar" />
++      <include name="easymock.jar" />
      </fileset>
    </path>
  

Modified: trunk/solr/debian/rules
===================================================================
--- trunk/solr/debian/rules	2007-10-10 18:40:41 UTC (rev 4338)
+++ trunk/solr/debian/rules	2007-10-10 20:28:40 UTC (rev 4339)
@@ -28,8 +28,7 @@
 
 # Set ant parameters
 DEB_ANT_BUILD_TARGET = compile javadoc dist-war
-# ant test needs easymock which is not in Debian
-#DEB_ANT_CHECK_TARGET = test
+DEB_ANT_CHECK_TARGET = test
 DEB_JARS = ant-junit junit
 
 DEB_INSTALL_CHANGELOGS_solr-common := CHANGES.txt