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

[janpascal-guest at alioth.debian.org]

Author: janpascal-guest
Date: 2007-09-10 12:47:31 +0000 (Mon, 10 Sep 2007)
New Revision: 4144

Modified:
   trunk/solr/debian/changelog
   trunk/solr/debian/control
   trunk/solr/debian/rules
   trunk/solr/debian/solr-common.dirs
Log:
Use gcj to compile solr; Move replication scripts to /usr/share/solr/scripts; make dependency versions explicit

Modified: trunk/solr/debian/changelog
===================================================================
--- trunk/solr/debian/changelog	2007-09-10 12:24:28 UTC (rev 4143)
+++ trunk/solr/debian/changelog	2007-09-10 12:47:31 UTC (rev 4144)
@@ -1,3 +1,11 @@
+solr (1.2.0+ds1-2) unstable; urgency=low
+
+  * Build using gcj since Solr now builds using it
+  * Rename /usr/share/solr/bin directory to /usr/share/solr/scripts, since
+    this directory contains only scripts
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Mon, 10 Sep 2007 14:25:28 +0200
+
 solr (1.2.0+ds1-1) unstable; urgency=low
 
   * Initial upload (Closes: #426763)

Modified: trunk/solr/debian/control
===================================================================
--- trunk/solr/debian/control	2007-09-10 12:24:28 UTC (rev 4143)
+++ trunk/solr/debian/control	2007-09-10 12:47:31 UTC (rev 4144)
@@ -6,27 +6,28 @@
 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-jre, sun-java5-jdk, ant, ant-optional, junit,
- libcommons-codec-java,
- libcommons-csv-java,
+ java-gcj-compat-dev (>= 1.0.76),
+ ant (>= 1.7.0), ant-optional (>= 1.7.0), junit (>= 3.8.1.1),
+ libcommons-codec-java (>= 1.3),
+ libcommons-csv-java (>= 0.1-SNAPSHOT+svn558885),
  libcommons-fileupload-java (>= 1.2),
- libcommons-io-java,
- libservlet2.4-java,
+ libcommons-io-java (>= 1.3.1),
+ libservlet2.4-java (>= 5.0.30),
  liblucene2-java (>= 2.2),
- libxpp3-java
+ libxpp3-java (>= 1.1.3.4.0)
 Standards-Version: 3.7.2
 
 Package: solr-common
 Architecture: all
 Depends: debconf (>= 1.5),
- sun-java5-jre | sun-java6-jre,
- libcommons-codec-java,
- libcommons-csv-java,
+ java-gcj-compat (>= 1.0.76) | java2-runtime,
+ libcommons-codec-java (>= 1.3),
+ libcommons-csv-java (>= 0.1-SNAPSHOT+svn558885),
  libcommons-fileupload-java (>= 1.2),
- libcommons-io-java,
- libservlet2.4-java,
+ libcommons-io-java (>= 1.3.1),
+ libservlet2.4-java (>= 5.0.30),
  liblucene2-java (>= 2.2),
- libxpp3-java
+ libxpp3-java (>= 1.1.3.4.0)
 Recommends: solr-tomcat5.5 (>= ${binary:Version}) | solr-jetty (>= ${binary:Version})
 Description: enterprise search server based on Lucene (common files)
  Solr is an open source enterprise search server based on the Lucene 
@@ -41,7 +42,7 @@
 
 Package: solr-tomcat5.5
 Architecture: all
-Depends: solr-common (>= ${binary:Version}), tomcat5.5
+Depends: solr-common (>= ${binary:Version}), tomcat5.5 (>= 5.5.20)
 Conflicts: solr-jetty
 Description: enterprise search server based on Lucene (Tomcat integration)
  Solr is an open source enterprise search server based on the Lucene 

Modified: trunk/solr/debian/rules
===================================================================
--- trunk/solr/debian/rules	2007-09-10 12:24:28 UTC (rev 4143)
+++ trunk/solr/debian/rules	2007-09-10 12:47:31 UTC (rev 4144)
@@ -20,8 +20,8 @@
 JETTY_INSTDIR=$(CURDIR)/debian/solr-jetty
 SHAREDIR=$(COMMON_INSTDIR)/usr/share/solr
 
-# Explicitly build with sun-java5-jdk; gcj-java does not handle Solr (yet)
-JAVA_HOME = /usr/lib/jvm/java-1.5.0-sun
+# Explicitly build with gcj
+JAVA_HOME = /usr/lib/jvm/java-gcj
 JAR = $(JAVA_HOME)/bin/jar
 
 # Set ant parameters
@@ -46,7 +46,7 @@
 	mv $(SHAREDIR)/WEB-INF/web.xml $(COMMON_INSTDIR)/etc/solr/
 	
 	# Install replication scripts
-	install src/scripts/* $(SHAREDIR)/bin
+	install src/scripts/* $(SHAREDIR)/scripts
 	
 	# Install Solr configuration files
 	# FIXME: this is example configuration, including example schema

Modified: trunk/solr/debian/solr-common.dirs
===================================================================
--- trunk/solr/debian/solr-common.dirs	2007-09-10 12:24:28 UTC (rev 4143)
+++ trunk/solr/debian/solr-common.dirs	2007-09-10 12:47:31 UTC (rev 4144)
@@ -1,8 +1,6 @@
 /etc/solr 
 /etc/solr/conf
 /usr/share/solr
-/usr/share/solr/bin
+/usr/share/solr/scripts
 /var/lib/solr
 /var/lib/solr/data
-/usr/share/doc/solr-common/examples 
-