[pkg-java] r4265 - trunk/solr/debian

[janpascal-guest at alioth.debian.org]

Author: janpascal-guest
Date: 2007-09-25 13:31:22 +0000 (Tue, 25 Sep 2007)
New Revision: 4265

Modified:
   trunk/solr/debian/changelog
   trunk/solr/debian/control
   trunk/solr/debian/rules
   trunk/solr/debian/solr-tomcat5.5.links
Log:
Move back to Sun's Java; fix 3 bugs, see debian/changelog

Modified: trunk/solr/debian/changelog
===================================================================
--- trunk/solr/debian/changelog	2007-09-25 12:16:39 UTC (rev 4264)
+++ trunk/solr/debian/changelog	2007-09-25 13:31:22 UTC (rev 4265)
@@ -1,10 +1,13 @@
 solr (1.2.0+ds1-2) unstable; urgency=low
 
-  * Build using gcj since Solr now builds using it
+  * Run unit tests during build (closes: #441890).
+  * Install link to config file in /etc/tomcat5.5/Catalina/localhost 
+    (closes: #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).
 
- -- Jan-Pascal van Best <janpascal at vanbest.org>  Mon, 10 Sep 2007 14:25:28 +0200
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Tue, 25 Sep 2007 15:23:28 +0200
 
 solr (1.2.0+ds1-1) unstable; urgency=low
 

Modified: trunk/solr/debian/control
===================================================================
--- trunk/solr/debian/control	2007-09-25 12:16:39 UTC (rev 4264)
+++ trunk/solr/debian/control	2007-09-25 13:31:22 UTC (rev 4265)
@@ -1,13 +1,15 @@
 Source: solr
-Section: contrib/text
+Section: contrib/web
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Jan-Pascal van Best <janpascal at vanbest.org>
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/solr/
 XS-Vcs-svn: svn://svn.debian.org/svn/pkg-java/trunk/solr/
 Build-Depends: cdbs, debhelper (>= 4.1.0), dpatch (>= 2.0), po-debconf,
+ sun-java5-jdk (>= 1.5.0),
  java-gcj-compat-dev (>= 1.0.76),
- ant (>= 1.7.0), ant-optional (>= 1.7.0), junit (>= 3.8.1.1),
+ ant (>= 1.7.0), ant-optional (>= 1.7.0), 
+ junit (>= 3.8.1.1), libeasymock-java (>= 2.3),
  libcommons-codec-java (>= 1.3),
  libcommons-csv-java (>= 0.1-SNAPSHOT+svn558885),
  libcommons-fileupload-java (>= 1.2),
@@ -20,7 +22,7 @@
 Package: solr-common
 Architecture: all
 Depends: debconf (>= 1.5),
- java-gcj-compat (>= 1.0.76) | java2-runtime,
+ sun-java5-jre (>= 1.5.0) | sun-java6-jre (>= 6),
  libcommons-codec-java (>= 1.3),
  libcommons-csv-java (>= 0.1-SNAPSHOT+svn558885),
  libcommons-fileupload-java (>= 1.2),

Modified: trunk/solr/debian/rules
===================================================================
--- trunk/solr/debian/rules	2007-09-25 12:16:39 UTC (rev 4264)
+++ trunk/solr/debian/rules	2007-09-25 13:31:22 UTC (rev 4265)
@@ -20,8 +20,10 @@
 JETTY_INSTDIR=$(CURDIR)/debian/solr-jetty
 SHAREDIR=$(COMMON_INSTDIR)/usr/share/solr
 
-# Explicitly build with gcj
-JAVA_HOME = /usr/lib/jvm/java-gcj
+# We should like to build with gcj, but solr fails the unit
+# tests with gcj. Use Sun's java 1.5.0 instead.
+#JAVA_HOME = /usr/lib/jvm/java-gcj
+JAVA_HOME = /usr/lib/jvm/java-1.5.0-sun
 JAR = $(JAVA_HOME)/bin/jar
 
 # Set ant parameters

Modified: trunk/solr/debian/solr-tomcat5.5.links
===================================================================
--- trunk/solr/debian/solr-tomcat5.5.links	2007-09-25 12:16:39 UTC (rev 4264)
+++ trunk/solr/debian/solr-tomcat5.5.links	2007-09-25 13:31:22 UTC (rev 4265)
@@ -1,2 +1,2 @@
-/etc/solr/solr-tomcat5.5.xml /usr/share/tomcat5.5/conf/Catalina/localhost/solr.xml
+/etc/solr/solr-tomcat5.5.xml /etc/tomcat5.5/Catalina/localhost/solr.xml
 /etc/solr/tomcat.policy /etc/tomcat5.5/policy.d/05solr.policy