[SCM] Solr - web service for full-text indexing and searching - Debian packaging branch, master, updated. debian/1.4.0+ds1-2-14-gab43224
James Page
james.page at ubuntu.com
Wed May 23 15:42:00 UTC 2012
The following commit has been merged in the master branch:
commit ab432244d940fbc9a001bcf00b019805f3f98aad
Author: James Page <james.page at ubuntu.com>
Date: Wed May 23 16:41:52 2012 +0100
Added patches and drop use of topgit for this package
diff --git a/debian/changelog b/debian/changelog
index 88f310a..c0aceb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,10 @@ solr (1.4.1+dfsg1-3) UNRELEASED; urgency=low
* Sync changes from Ubuntu and fix FTBFS with current versions of lucene
(Closes: #593027).
* Drop dependency on glassfish-mail, no longer required (Closes: #575208).
+ * Dropped Suggests: libmysql-java for solr-common and updated description
+ as this package does not ship dataimporthandler.
- -- James Page <james.page at ubuntu.com> Wed, 23 May 2012 16:10:48 +0100
+ -- James Page <james.page at ubuntu.com> Wed, 23 May 2012 16:34:14 +0100
solr (1.4.1+dfsg1-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 6264698..f647df8 100644
--- a/debian/control
+++ b/debian/control
@@ -8,9 +8,12 @@ Homepage: http://lucene.apache.org/solr/
Vcs-Browser: http://git.debian.org/?p=pkg-java/solr.git
Vcs-Git: git://git.debian.org/git/pkg-java/solr.git
Standards-Version: 3.9.3
-Build-Depends: debhelper (>= 8), po-debconf,
+Build-Depends:
+ ant (>= 1.7.0),
+ ant-optional (>= 1.7.0),
+ debhelper (>= 8),
default-jdk,
- ant (>= 1.7.0), ant-optional (>= 1.7.0),
+ junit4,
libcommons-codec-java (>= 1.4),
libcommons-csv-java (>= 0.1-SNAPSHOT+svn678580),
libcommons-fileupload-java (>= 1.2.1),
@@ -19,18 +22,18 @@ Build-Depends: debhelper (>= 8), po-debconf,
libcommons-logging-java,
libjaxp1.3-java (>= 1.3.04),
libjetty-java (>= 6.1.21),
+ libjmock-java,
liblucene2-java (>= 2.9.1),
libservlet2.5-java (>= 6.0.20),
libslf4j-java (>= 1.5.10),
libxml-commons-external-java (>= 1.3.04),
- junit4,
- libjmock-java
+ po-debconf
Package: solr-common
Architecture: all
-Depends: ${misc:Depends},
+Depends:
+ curl,
debconf (>= 1.5),
- openjdk-6-jre-headless | java5-runtime-headless | java6-runtime-headless,
libcommons-codec-java (>= 1.4),
libcommons-csv-java (>= 0.1-SNAPSHOT+svn678580),
libcommons-fileupload-java (>= 1.2.1),
@@ -44,45 +47,44 @@ Depends: ${misc:Depends},
liblucene2-java (>= 2.9.1),
libservlet2.5-java (>= 6.0.20),
libslf4j-java (>= 1.5.10),
- libxml-commons-external-java (>= 1.3.04)
-Recommends: solr-tomcat (>= ${binary:Version}) | solr-jetty (>= ${binary:Version})
-Suggests: libmysql-java
+ libxml-commons-external-java (>= 1.3.04),
+ openjdk-6-jre-headless | java5-runtime-headless | java6-runtime-headless,
+ ${misc:Depends}
+Recommends:
+ solr-tomcat (>= ${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
- Java search library, with XML/HTTP and JSON APIs, hit highlighting,
- faceted search, caching, replication, and a web administration
+ Solr is an open source enterprise search server based on the Lucene
+ Java search library, with XML/HTTP and JSON APIs, hit highlighting,
+ faceted search, caching, replication, and a web administration
interface. It runs in a Java servlet container such as Tomcat.
.
This package provides the common files for Solr. Install
solr-tomcat or solr-jetty to use Solr under Tomcat or Jetty.
- .
- This package also contains the dataimporthandler contrib while omiting
- dataimporthandler-extras, clustering, extraction and velocity due to missing
- dependencies.
- .
- libmysql-java is necessary to connect the dataimporthandler to MySQL.
Package: solr-tomcat
Architecture: all
-Depends: ${misc:Depends}, solr-common (= ${binary:Version}), tomcat6 (>= 6.0.20)
+Depends: solr-common (= ${binary:Version}), tomcat6 (>= 6.0.20), ${misc:Depends}
Conflicts: solr-jetty, solr-tomcat6
Description: enterprise search server based on Lucene - Tomcat integration
- Solr is an open source enterprise search server based on the Lucene
- Java search library, with XML/HTTP and JSON APIs, hit highlighting,
- faceted search, caching, replication, and a web administration
+ Solr is an open source enterprise search server based on the Lucene
+ Java search library, with XML/HTTP and JSON APIs, hit highlighting,
+ faceted search, caching, replication, and a web administration
interface. It runs in a Java servlet container such as Tomcat.
.
- This package provides the Tomcat integration files for Solr.
+ This package provides the Tomcat integration files for Solr.
Package: solr-jetty
Architecture: all
-Depends: ${misc:Depends}, solr-common (= ${binary:Version}), jetty (>= 6.1.22),
- libjetty-extra-java (>= 6.1.22)
+Depends:
+ jetty (>= 6.1.22),
+ libjetty-extra-java (>= 6.1.22),
+ solr-common (= ${binary:Version}),
+ ${misc:Depends}
Conflicts: solr-tomcat
Description: enterprise search server based on Lucene - Jetty integration
- Solr is an open source enterprise search server based on the Lucene
- Java search library, with XML/HTTP and JSON APIs, hit highlighting,
- faceted search, caching, replication, and a web administration
+ Solr is an open source enterprise search server based on the Lucene
+ Java search library, with XML/HTTP and JSON APIs, hit highlighting,
+ faceted search, caching, replication, and a web administration
interface. It runs in a Java servlet container such as Tomcat.
.
- This package provides the Jetty integration files for Solr.
+ This package provides the Jetty integration files for Solr.
diff --git a/debian/copyright b/debian/copyright
index c8d89ca..af3d51c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,11 +8,11 @@ Copyright: 2007-2010 The Apache Software Foundation
License: Apache-2
Files: debian/*
-Copyright: 2007,2008,2009 Jan-Pascal van Best <janpascal at vanbest.org>
+Copyright: 2007,2008,2009 Jan-Pascal van Best <janpascal at vanbest.org>
2009-2010 Thomas Koch <thomas at koch.ro>
License: Apache-2
License: Apache-2
On Debian systems, the complete text of the Apache
- License, version 2.0, can be found in the
+ License, version 2.0, can be found in the
`/usr/share/common-licenses/Apache-2.0' file.
diff --git a/debian/patches/debian/fix-lucene-lock-directory b/debian/patches/debian/fix-lucene-lock-directory
new file mode 100644
index 0000000..34dea56
--- /dev/null
+++ b/debian/patches/debian/fix-lucene-lock-directory
@@ -0,0 +1,12 @@
+diff --git a/src/java/org/apache/solr/core/SolrCore.java b/src/java/org/apache/solr/core/SolrCore.java
+index a6f0962..07dbf90 100644
+--- a/src/java/org/apache/solr/core/SolrCore.java
++++ b/src/java/org/apache/solr/core/SolrCore.java
+@@ -360,6 +360,7 @@ public final class SolrCore implements SolrInfoMBean {
+
+ void initIndex() {
+ try {
++ System.setProperty( "org.apache.lucene.lockDir", dataDir );
+ File dirFile = new File(getNewIndexDir());
+ boolean indexExists = dirFile.canRead();
+ boolean firstTime;
diff --git a/debian/patches/debian/solr-example-solrconfig b/debian/patches/debian/solr-example-solrconfig
new file mode 100644
index 0000000..6aaedc0
--- /dev/null
+++ b/debian/patches/debian/solr-example-solrconfig
@@ -0,0 +1,38 @@
+diff --git a/example/solr/conf/solrconfig.xml b/example/solr/conf/solrconfig.xml
+index 4a87355..fe0e4b0 100644
+--- a/example/solr/conf/solrconfig.xml
++++ b/example/solr/conf/solrconfig.xml
+@@ -46,19 +46,19 @@
+ <!-- A dir option by itself adds any files found in the directory to the
+ classpath, this is useful for including all jars in a directory.
+ -->
+- <lib dir="../../contrib/extraction/lib" />
++ <!--lib dir="../../contrib/extraction/lib" /-->
+ <!-- When a regex is specified in addition to a directory, only the files in that
+ directory which completely match the regex (anchored on both ends)
+ will be included.
+ -->
+- <lib dir="../../dist/" regex="apache-solr-cell-\d.*\.jar" />
+- <lib dir="../../dist/" regex="apache-solr-clustering-\d.*\.jar" />
++ <!--lib dir="../../dist/" regex="apache-solr-cell-\d.*\.jar" />
++ <lib dir="../../dist/" regex="apache-solr-clustering-\d.*\.jar" /-->
+ <!-- If a dir option (with or without a regex) is used and nothing is found
+ that matches, it will be ignored
+ -->
+- <lib dir="../../contrib/clustering/lib/downloads/" />
++ <!--lib dir="../../contrib/clustering/lib/downloads/" />
+ <lib dir="../../contrib/clustering/lib/" />
+- <lib dir="/total/crap/dir/ignored" />
++ <lib dir="/total/crap/dir/ignored" /-->
+ <!-- an exact path can be used to specify a specific file. This will cause
+ a serious error to be logged if it can't be loaded.
+ <lib path="../a-jar-that-does-not-exist.jar" />
+@@ -68,7 +68,7 @@
+ <!-- Used to specify an alternate directory to hold all index data
+ other than the default ./data under the Solr home.
+ If replication is in use, this should match the replication configuration. -->
+- <dataDir>${solr.data.dir:./solr/data}</dataDir>
++ <dataDir>/var/lib/solr/data</dataDir>
+
+
+ <!-- WARNING: this <indexDefaults> section only provides defaults for index writers
diff --git a/debian/patches/debian/use-debian-java-libraries b/debian/patches/debian/use-debian-java-libraries
new file mode 100644
index 0000000..395b400
--- /dev/null
+++ b/debian/patches/debian/use-debian-java-libraries
@@ -0,0 +1,157 @@
+diff --git a/build.xml b/build.xml
+index 0ea71dc..42b92ab 100644
+--- a/build.xml
++++ b/build.xml
+@@ -22,7 +22,7 @@
+ <import file="common-build.xml"/>
+
+ <!-- 3rd party libraries for compilation -->
+- <property name="lib" location="lib" />
++ <property name="lib" value="/usr/share/java" />
+
+ <!-- solr source files -->
+ <property name="src" location="src" />
+@@ -85,7 +85,7 @@
+ <!-- no description, don't advertise -->
+
+
+- <available file="lib/lucene-core-${lucene_version}.jar"
++ <available file="${lib}/lucene-core-${lucene_version}.jar"
+ property="lucene-version-ok-m2deploy-wont-fail" />
+ <fail unless="lucene-version-ok-m2deploy-wont-fail">
+ lib/lucene-core-${lucene_version}.jar Missing
+@@ -116,7 +116,24 @@
+ <!-- The compilation classpath -->
+ <path id="compile.classpath">
+ <fileset dir="${lib}">
+- <include name="*.jar" />
++ <include name="commons-codec.jar" />
++ <include name="commons-csv.jar" />
++ <include name="commons-fileupload.jar" />
++ <include name="commons-httpclient.jar" />
++ <include name="commons-io.jar" />
++ <include name="jetty.jar" />
++ <include name="jetty-util.jar" />
++ <include name="lucene-analyzers.jar" />
++ <include name="lucene-core.jar" />
++ <include name="lucene-highlighter.jar" />
++ <include name="lucene-queries.jar" />
++ <include name="lucene-snowball.jar" />
++ <include name="lucene-spellchecker.jar" />
++ <include name="servlet-api-2.5.jar" />
++ <include name="slf4j-api.jar" />
++ <include name="xml-apis-ext.jar" />
++ <include name="xml-apis.jar" />
++ <include name="junit4.jar" />
+ </fileset>
+ <pathelement location="${dest}/common"/>
+ </path>
+@@ -138,9 +155,9 @@
+ <path refid="compile.classpath" />
+ <pathelement location="${dest}/solrj"/>
+ <!-- jetty -->
+- <fileset dir="example/lib">
++ <!--fileset dir="example/lib">
+ <include name="**/*.jar" />
+- </fileset>
++ </fileset-->
+ </path>
+
+ <!-- Compile the project. -->
+@@ -339,6 +356,10 @@
+
+ <pathelement location="${dest}/solr"/>
+ <pathelement location="${dest}/solrj"/> <!-- include solrj -->
++ <fileset dir="/usr/share/java">
++ <include name="junit4.jar" />
++ <include name="easymock.jar" />
++ </fileset>
+ </path>
+
+ <path id="test.run.classpath">
+@@ -349,6 +370,13 @@
+ <path refid="compile.classpath.solrj" />
+
+ <pathelement path="${java.class.path}"/>
++ <fileset dir="/usr/share/java">
++ <include name="junit4.jar" />
++ <include name="easymock.jar" />
++ <include name="jcl-over-slf4j.jar" />
++ <include name="slf4j-jdk14.jar" />
++ <include name="lucene-memory.jar" />
++ </fileset>
+ </path>
+
+ <!-- Compile unit tests. -->
+diff --git a/common-build.xml b/common-build.xml
+index adceb9e..105761c 100644
+--- a/common-build.xml
++++ b/common-build.xml
+@@ -219,7 +219,9 @@
+ <subant target="@{target}" failonerror="@{failonerror}">
+ <fileset dir="."
+ includes="contrib/*/build.xml"
++ excludes="contrib/clustering/build.xml,contrib/extraction/build.xml,contrib/velocity/build.xml"
+ />
++ <!-- The above excludes have missing build dependencies in debian -->
+ </subant>
+ </sequential>
+ </macrodef>
+diff --git a/contrib/dataimporthandler/build.xml b/contrib/dataimporthandler/build.xml
+index b2832a7..a644091 100644
+--- a/contrib/dataimporthandler/build.xml
++++ b/contrib/dataimporthandler/build.xml
+@@ -36,16 +36,25 @@
+ <path id="common.classpath">
+ <pathelement location="${solr-path}/build/solr" />
+ <pathelement location="${solr-path}/build/solrj" />
+- <fileset dir="${solr-path}/lib" includes="*.jar"/>
++ <fileset dir="/usr/share/java">
++ <include name="commons-io.jar" />
++ <include name="lucene-core.jar" />
++ <include name="slf4j-api.jar" />
++ <include name="xml-apis.jar" />
++ <include name="xml-apis-ext.jar" />
++ <include name="junit4.jar" />
++ </fileset>
+ </path>
+
+ <path id="extras.classpath">
+ <pathelement location="${solr-path}/build/solr" />
+ <pathelement location="${solr-path}/build/solrj" />
+ <pathelement location="target/classes" />
+- <fileset dir="${solr-path}/lib" includes="*.jar"/>
+- <fileset dir="lib/" includes="*.jar"/>
+- <fileset dir="${tikalibs-path}" includes="*.jar"/>
++ <!--fileset dir="${tikalibs-path}" includes="*.jar"/-->
++ <fileset dir="/usr/share/java">
++ <include name="slf4j-api.jar" />
++ <include name="glassfish-mail.jar" />
++ </fileset>
+ </path>
+
+ <path id="test.classpath">
+@@ -101,11 +110,11 @@
+ </solr-javac>
+ </target>
+
+- <target name="build" depends="compile,compileExtras">
++ <target name="build" depends="compile">
+ <solr-jar destfile="target/${fullnamever}.jar" basedir="target/classes"
+ manifest="${common.dir}/${dest}/META-INF/MANIFEST.MF" />
+- <solr-jar destfile="target/apache-${ant.project.name}-extras-${version}.jar" basedir="target/extras/classes"
+- manifest="${common.dir}/${dest}/META-INF/MANIFEST.MF" />
++ <!--solr-jar destfile="target/apache-${ant.project.name}-extras-${version}.jar" basedir="target/extras/classes"
++ manifest="${common.dir}/${dest}/META-INF/MANIFEST.MF" /-->
+ </target>
+
+ <target name="compileTests" depends="compile">
+@@ -177,7 +186,7 @@
+ <mkdir dir="../../build/web/WEB-INF/lib"/>
+ <copy file="target/${fullnamever}.jar" todir="${solr-path}/build/web/WEB-INF/lib"></copy>
+ <copy file="target/${fullnamever}.jar" todir="${solr-path}/dist"></copy>
+- <copy file="target/apache-${ant.project.name}-extras-${version}.jar" todir="${solr-path}/dist"></copy>
++ <!--copy file="target/apache-${ant.project.name}-extras-${version}.jar" todir="${solr-path}/dist"></copy-->
+ </target>
+
+ <target name="javadoc">
diff --git a/debian/patches/fixes/SOLR-2260_syntax_error_in_shell_script_abo b/debian/patches/fixes/SOLR-2260_syntax_error_in_shell_script_abo
new file mode 100644
index 0000000..888b137
--- /dev/null
+++ b/debian/patches/fixes/SOLR-2260_syntax_error_in_shell_script_abo
@@ -0,0 +1,13 @@
+diff --git a/src/scripts/abo b/src/scripts/abo
+index 88f58eb..7bb6f9c 100755
+--- a/src/scripts/abo
++++ b/src/scripts/abo
+@@ -175,7 +175,7 @@ trap 'echo cleaning up, please wait ...;/bin/rm -rf ${data_dir}/${name} ${data_d
+
+ # make a backup using hard links into temporary location
+ # then move it into place atomically
+-if [[ "${OS}" == "SunOS" || "${OS}" == "Darwin" || "${OS}" == "FreeBSD"]]
++if [[ "${OS}" == "SunOS" || "${OS}" == "Darwin" || "${OS}" == "FreeBSD" ]]
+ then
+ orig_dir=$(pwd)
+ mkdir ${data_dir}/${temp}
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..55b5402
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+debian/fix-lucene-lock-directory
+debian/use-debian-java-libraries
+fixes/SOLR-2260_syntax_error_in_shell_script_abo
+debian/solr-example-solrconfig
diff --git a/debian/solr-common.install b/debian/solr-common.install
index 8b81a6e..d10b61c 100644
--- a/debian/solr-common.install
+++ b/debian/solr-common.install
@@ -1,6 +1,6 @@
-src/webapp/web/WEB-INF/web.xml /etc/solr/
-src/scripts/* /usr/share/solr/bin
-example/solr/conf /etc/solr
+build/web/* /usr/share/solr/
dist/*.jar /usr/share/solr/WEB-INF/lib/
+example/solr/conf /etc/solr
+src/scripts/* /usr/share/solr/bin
src/webapp/web/* /usr/share/solr/
-build/web/* /usr/share/solr/
+src/webapp/web/WEB-INF/web.xml /etc/solr/
--
Solr - web service for full-text indexing and searching - Debian packaging
More information about the pkg-java-commits
mailing list