[SCM] lucene-solr packaging branch, master, updated. upstream/3.6.0-25-ga342d32
James Page
james.page at ubuntu.com
Tue May 29 17:53:24 UTC 2012
The following commit has been merged in the master branch:
commit e2a0016c0e8c186304aee888d894214c50262f6c
Author: James Page <james.page at ubuntu.com>
Date: Tue May 29 17:12:08 2012 +0100
More tidying of package
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..5c1f8ae
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,10 @@
+Notes about lucene-solr source package
+--------------------------------------
+
+The Lucene and Solr projects merged and now release in lock-step from the
+same source code repository.
+
+Instead of using the separate tar.gz files for each project as published by
+upstream, a single source package generated from the VCS tag associated with
+each release is preferred as it simplifies the build process and ensures that
+lucene and solr are always at matched compatible layers with each other.
diff --git a/debian/build-jars b/debian/build-jars
new file mode 100644
index 0000000..136e8c8
--- /dev/null
+++ b/debian/build-jars
@@ -0,0 +1,33 @@
+/usr/share/java/commons-codec.jar:./lucene/contrib/analyzers/phonetic/lib/commons-codec.jar
+/usr/share/java/commons-beanutils.jar:./lucene/contrib/benchmark/lib/commons-beanutils.jar
+/usr/share/java/commons-collections3.jar:./lucene/contrib/benchmark/lib/commons-collections3.jar
+/usr/share/java/commons-compress.jar:./lucene/contrib/benchmark/lib/commons-compress.jar
+/usr/share/java/commons-digester.jar:./lucene/contrib/benchmark/lib/commons-digester.jar
+/usr/share/java/commons-logging.jar:./lucene/contrib/benchmark/lib/commons-logging.jar
+/usr/share/java/xercesImpl.jar:./lucene/contrib/benchmark/lib/xercesImpl.jar
+/usr/share/java/com.ibm.icu-4.4.jar:./lucene/contrib/icu/lib/icu4j.jar
+/usr/share/java/regexp.jar:./lucene/contrib/queries/lib/jakarta-regexp.jar
+/usr/share/java/ant.jar:./lucene/lib/ant.jar
+/usr/share/java/junit4.jar:./lucene/lib/junit4.jar
+/usr/share/java/ant.jar:./lucene/test-framework/lib/ant.jar
+/usr/share/java/ant-junit.jar:./lucene/test-framework/lib/ant-junit.jar
+/usr/share/java/hamcrest-core.jar:./lucene/test-framework/lib/hamcrest-core.jar
+/usr/share/java/junit4.jar:./lucene/test-framework/lib/junit4.jar
+/usr/share/java/commons-codec.jar:./solr/lib/commons-codec.jar
+/usr/share/java/commons-fileupload.jar:./solr/lib/commons-fileupload.jar
+/usr/share/java/commons-httpclient.jar:./solr/lib/commons-httpclient.jar
+/usr/share/java/commons-io.jar:./solr/lib/commons-io.jar
+/usr/share/java/commons-lang.jar:./solr/lib/commons-lang.jar
+/usr/share/java/easymock.jar:./solr/lib/easymock.jar
+/usr/share/java/geronimo-stax-1.2-spec.jar:./solr/lib/geronimo-stax-1.2-spec.jar
+/usr/share/java/guava.jar:./solr/lib/guava.jar
+/usr/share/java/httpclient.jar:./solr/lib/httpclient.jar
+/usr/share/java/httpcore.jar:./solr/lib/httpcore.jar
+/usr/share/java/httpmime.jar:./solr/lib/httpmime.jar
+/usr/share/java/jcl-over-slf4j.jar:./solr/lib/jcl-over-slf4j.jar
+/usr/share/java/junit4.jar:./solr/lib/junit4.jar
+/usr/share/java/log4j-over-slf4j.jar:./solr/lib/log4j-over-slf4j.jar
+/usr/share/java/servlet-api-2.5.jar:./solr/lib/servlet-api-2.5.jar
+/usr/share/java/slf4j-api.jar:./solr/lib/slf4j-api.jar
+/usr/share/java/slf4j-jdk14.jar:./solr/lib/slf4j-jdk14.jar
+/usr/share/java/wstx-lgpl.jar:./solr/lib/wstx-lgpl.jar
diff --git a/solr/example/example-DIH/solr/db/conf/scripts.conf b/debian/conf/scripts.conf
similarity index 95%
copy from solr/example/example-DIH/solr/db/conf/scripts.conf
copy to debian/conf/scripts.conf
index f58b262..a99d113 100644
--- a/solr/example/example-DIH/solr/db/conf/scripts.conf
+++ b/debian/conf/scripts.conf
@@ -15,9 +15,9 @@
user=
solr_hostname=localhost
-solr_port=8983
+solr_port=8080
rsyncd_port=18983
-data_dir=
+data_dir=/var/lib/solr/data
webapp_name=solr
master_host=
master_data_dir=
diff --git a/solr/example/solr/conf/solrconfig.xml b/debian/conf/solrconfig.xml
old mode 100755
new mode 100644
similarity index 98%
copy from solr/example/solr/conf/solrconfig.xml
copy to debian/conf/solrconfig.xml
index 5f50ab5..007ff72
--- a/solr/example/solr/conf/solrconfig.xml
+++ b/debian/conf/solrconfig.xml
@@ -76,26 +76,29 @@
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="../../contrib/extraction/lib" regex=".*\.jar" />
+ <!--
+ <lib dir="../../dist/" regex="apache-solr-cell-\d.*\.jar" />
+ <lib dir="../../contrib/extraction/lib" regex=".*\.jar" />
- <lib dir="../../dist/" regex="apache-solr-clustering-\d.*\.jar" />
- <lib dir="../../contrib/clustering/lib/" regex=".*\.jar" />
+ <lib dir="../../dist/" regex="apache-solr-clustering-\d.*\.jar" />
+ <lib dir="../../contrib/clustering/lib/" regex=".*\.jar" />
- <lib dir="../../dist/" regex="apache-solr-dataimporthandler-\d.*\.jar" />
- <lib dir="../../contrib/dataimporthandler/lib/" regex=".*\.jar" />
+ <lib dir="../../dist/" regex="apache-solr-dataimporthandler-\d.*\.jar" />
+ <lib dir="../../contrib/dataimporthandler/lib/" regex=".*\.jar" />
- <lib dir="../../dist/" regex="apache-solr-langid-\d.*\.jar" />
- <lib dir="../../contrib/langid/lib/" regex=".*\.jar" />
+ <lib dir="../../dist/" regex="apache-solr-langid-\d.*\.jar" />
+ <lib dir="../../contrib/langid/lib/" regex=".*\.jar" />
- <lib dir="../../dist/" regex="apache-solr-velocity-\d.*\.jar" />
- <lib dir="../../contrib/velocity/lib" regex=".*\.jar" />
+ <lib dir="../../dist/" regex="apache-solr-velocity-\d.*\.jar" />
+ <lib dir="../../contrib/velocity/lib" regex=".*\.jar" />
+ -->
<!-- If a 'dir' option (with or without a regex) is used and nothing
is found that matches, it will be ignored
-->
- <lib dir="/total/crap/dir/ignored" />
-
+ <!--
+ <lib dir="/total/crap/dir/ignored" />
+ -->
<!-- an exact 'path' can be used instead of a 'dir' to specify a
specific file. This will cause a serious error to be logged if
it can't be loaded.
@@ -111,7 +114,7 @@
replication is in use, this should match the replication
configuration.
-->
- <dataDir>${solr.data.dir:}</dataDir>
+ <dataDir>/var/lib/solr/data</dataDir>
<!-- The DirectoryFactory to use for indexes.
diff --git a/debian/control b/debian/control
index d62d96a..0e886c6 100644
--- a/debian/control
+++ b/debian/control
@@ -160,7 +160,7 @@ Description: Enterprise search server based on Lucene3 - common files
Package: solr-tomcat
Architecture: all
-Depends: solr-common (= ${binary:Version}), tomcat7, ${misc:Depends}
+Depends: solr-common (= ${binary:Version}), tomcat7 | tomcat6, ${misc:Depends}
Conflicts: solr-jetty, solr-tomcat6
Description: Enterprise search server based on Lucene3 - Tomcat integration
Solr is an open source enterprise search server based on the Lucene
diff --git a/debian/copyright b/debian/copyright
index 5522dd9..7b74b8f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -33,6 +33,7 @@ Files: debian/*
Copyright: 2007-2009 Jan-Pascal van Best <janpascal at vanbest.org>
2011 Mat Scales <mat at wibbly.org.uk>
2009-2010 Thomas Koch <thomas at koch.ro>
+ 2012 Canonical Ltd (http://www.canonical.com)
License: Apache-2
Files: debian/patches/add-osgi-manifest
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
new file mode 100755
index 0000000..3f603cf
--- /dev/null
+++ b/debian/orig-tar.sh
@@ -0,0 +1,20 @@
+#/bin/sh -e
+
+VERSION=$2
+TAR=../lucene-solr_$VERSION.orig.tar.gz
+DIR=lucene-solr-$VERSION
+mkdir -p $DIR
+
+# Unpack ready fo re-packing
+tar -xzf $TAR -C $DIR --strip-components=1
+
+# Clean up tarball
+find $DIR -name \*.jar -delete
+find $DIR -name \*.war -delete
+fgrep -lR "Generated By:JavaCC:" $DIR | xargs -n5 rm
+
+# Repack excluding stuff we don't need
+GZIP=--best tar -czf $TAR $DIR
+
+rm -rf $DIR
+
diff --git a/debian/patches/series b/debian/patches/series
index 2df28c3..788c966 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,4 @@ fix-jar-matches.patch
disable-ivy.patch
icu4.4-compat.patch
regex-test-failure.patch
-set-data-dir.patch
+#set-data-dir.patch
diff --git a/debian/rules b/debian/rules
index d364166..b62db1a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,32 +10,9 @@ DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+)
override_dh_auto_configure:
# Link in jars from /usr/share/java rather
# than patching the build process
- for pkg in ant ant-junit junit4 hamcrest-core; \
+ for pkg in `cat debian/build-jars`; \
do \
- ln -sf /usr/share/java/$$pkg.jar lucene/test-framework/lib/$$pkg.jar; \
- done
- ln -sf /usr/share/java/commons-codec.jar \
- lucene/contrib/analyzers/phonetic/lib/commons-codec.jar
- for pkg in commons-compress commons-logging \
- commons-digester commons-collections3 \
- commons-beanutils xercesImpl; \
- do \
- ln -sf /usr/share/java/$$pkg.jar lucene/contrib/benchmark/lib/$$pkg.jar; \
- done
- ln -sf /usr/share/java/com.ibm.icu-4.4.jar lucene/contrib/icu/lib/icu4j.jar
- ln -sf /usr/share/java/regexp.jar lucene/contrib/queries/lib/jakarta-regexp.jar
- mkdir -p lucene/lib
- for pkg in ant junit4; \
- do \
- ln -sf /usr/share/java/$$pkg.jar lucene/lib/$$pkg.jar; \
- done
- # And the same for solr
- for pkg in commons-codec commons-fileupload commons-httpclient commons-io \
- commons-lang easymock geronimo-stax-1.2-spec guava httpclient httpcore \
- httpmime jcl-over-slf4j junit4 log4j-over-slf4j servlet-api-2.5 \
- slf4j-api slf4j-jdk14 wstx-lgpl; \
- do \
- ln -sf /usr/share/java/$$pkg.jar solr/lib/$$pkg.jar; \
+ ln -sf `echo $$pkg | cut -d : -f 1` `echo $$pkg | cut -d : -f 2`; \
done
dh_auto_configure
@@ -64,11 +41,11 @@ override_dh_auto_clean:
dh_auto_clean
override_dh_fixperms:
- chmod 644 debian/solr-common/usr/share/solr/WEB-INF/weblogic.xml \
+ chmod 644 debian/solr-common/usr/share/solr/web/WEB-INF/weblogic.xml \
debian/solr-common/etc/solr/conf/schema.xml \
debian/solr-common/etc/solr/conf/solrconfig.xml \
- debian/solr-common/usr/share/solr/favicon.ico \
- debian/solr-common/usr/share/solr/admin/favicon.ico
+ debian/solr-common/usr/share/solr/web/favicon.ico \
+ debian/solr-common/usr/share/solr/web/admin/favicon.ico
dh_fixperms
override_dh_auto_install:
diff --git a/debian/solr-common.README.Debian b/debian/solr-common.README.Debian
new file mode 100644
index 0000000..3b43564
--- /dev/null
+++ b/debian/solr-common.README.Debian
@@ -0,0 +1,83 @@
+README for solr
+---------------
+
+Solr is an enterprise search server based on the Lucene Java library. The
+Debian packaging of Solr consists of three binary packages:
+
+- libsolr-java contains the Java Jar files that support all other solr
+ components.
+- solr-common contains the Solr software itself and general configuration.
+- solr-tomcat installs Solr as a servlet in Tomcat. After installation,
+ point your browser to http://localhost:8080/solr/admin
+ to see the Solr web administration interface.
+- solr-jetty installs Solr as a servlet in the Jetty application server.
+ The Solr admin interface is at http://localhost:8080/solr/admin/
+
+Homepage: http://lucene.apache.org/solr/
+
+Configuration
+-------------
+
+The solr-common package comes with an example configuration that is not
+at all suitable for production use! Please learn about solr and write
+your own configuration in /etc/solr.
+
+Certain features of the admin interface are disabled by tomcat security
+policies if this feature is enabled (disabled by default).
+
+Have a look at /etc/solr/tomcat.policy if you want to enable them.
+
+MultiCore
+---------
+
+Solr upstream does not really support the seperation of the application and
+configuration directory, but knows only a Solr "homedir". We could partly
+handle this by placing a symlink conf to /etc/solr/conf in /usr/share/solr.
+
+However the solr.xml file necessary to configure multicore must be placed
+directly into /usr/share/solr.
+
+So to avoid having a configuration file outside /etc it's recommended to place
+a symlink from /usr/share/solr/solr.xml to /etc/solr/solr.xml.
+
+If you want to use the dataDir parameter in the dynamic core admin interface
+make sure, that no datadir is specified in /etc/solr/conf/solrconfig.xml.
+Otherwise the latter one will always be taken.
+
+Replication
+-----------
+
+Solr's replication scripts are installed into /usr/share/solr/scripts
+Please note that there is a java based replication solution since Solr
+1.4 and that we still need to find out, whether upstream will continue
+to support the scripts based solution.
+Also have a look at Debian Bug 538229.
+
+Contrib
+-------
+
+Upstream provides additional functionality in so called contributions.
+We have so far included only the dataimporthandler without
+dataimporthandler-extras. The other contributions have dependencies not
+yet packaged for Debian.
+
+DataImportHandler
+-----------------
+
+If you use the handler with mysql, you need to install libmysql-java and
+add the following to your solrconfig.xml:
+
+ <lib path="/usr/share/java/mysql.jar" />
+
+The handler writes status information to::
+
+ /etc/solr/conf/dataimport.properties
+
+Make sure that the tomcat/jetty user can write to this file. Yes this is ugly,
+but nobody has teached the FHS to java developers yet.
+
+Read more about the DataImportHandler here::
+
+ http://wiki.apache.org/solr/DataImportHandler
+
+
diff --git a/debian/solr-common.install b/debian/solr-common.install
index ffc005d..605e1b5 100644
--- a/debian/solr-common.install
+++ b/debian/solr-common.install
@@ -1,5 +1,7 @@
-solr/build/web/* /usr/share/solr/
+solr/build/web/* /usr/share/solr/web
solr/example/solr/conf /etc/solr
+solr/example/solr/solr.xml /etc/solr
+debian/conf/* /etc/solr/conf
solr/scripts/* /usr/share/solr/bin
-solr/webapp/web/* /usr/share/solr/
+solr/webapp/web/* /usr/share/solr/web
solr/webapp/web/WEB-INF/web.xml /etc/solr/
diff --git a/debian/solr-common.links b/debian/solr-common.links
index e110329..3d61d56 100644
--- a/debian/solr-common.links
+++ b/debian/solr-common.links
@@ -1,36 +1,37 @@
-/etc/solr/web.xml /usr/share/solr/WEB-INF/web.xml
+/etc/solr/web.xml /usr/share/solr/web/WEB-INF/web.xml
/etc/solr/conf /usr/share/solr/conf
+/etc/solr/solr.xml /usr/share/solr/solr.xml
/var/lib/solr/data /usr/share/solr/data
/var/log/solr /usr/share/solr/logs
/usr/share/solr/bin /usr/share/solr/scripts
-/usr/share/java/solr-core.jar /usr/share/solr/WEB-INF/lib/solr-core.jar
-/usr/share/java/solr-solrj.jar /usr/share/solr/WEB-INF/lib/solr-solrj.jar
-/usr/share/java/solr-dataimporthandler.jar /usr/share/solr/WEB-INF/lib/solr-dataimporthandler.jar
-/usr/share/java/commons-codec.jar /usr/share/solr/WEB-INF/lib/commons-codec.jar
-/usr/share/java/commons-fileupload.jar /usr/share/solr/WEB-INF/lib/commons-fileupload.jar
-/usr/share/java/commons-httpclient.jar /usr/share/solr/WEB-INF/lib/commons-httpclient.jar
-/usr/share/java/commons-io.jar /usr/share/solr/WEB-INF/lib/commons-io.jar
-/usr/share/java/commons-lang.jar /usr/share/solr/WEB-INF/lib/commons-lang.jar
-/usr/share/java/commons-logging.jar /usr/share/solr/WEB-INF/lib/commons-logging.jar
-/usr/share/java/geronimo-stax-1.2-spec.jar /usr/share/solr/WEB-INF/lib/geronimo-stax-1.2-spec.jar
-/usr/share/java/guava.jar /usr/share/solr/WEB-INF/lib/guava.jar
-/usr/share/java/httpcore.jar /usr/share/solr/WEB-INF/lib/httpcore.jar
-/usr/share/java/httpclient.jar /usr/share/solr/WEB-INF/lib/httpclient.jar
-/usr/share/java/httpmime.jar /usr/share/solr/WEB-INF/lib/httpmime.jar
-/usr/share/java/jcl-over-slf4j.jar /usr/share/solr/WEB-INF/lib/jcl-over-slf4j.jar
-/usr/share/java/log4j-over-slf4j.jar /usr/share/solr/WEB-INF/lib/log4j-over-slf4j.jar
-/usr/share/java/lucene3-analyzers.jar /usr/share/solr/WEB-INF/lib/lucene3-analyzers.jar
-/usr/share/java/lucene3-core.jar /usr/share/solr/WEB-INF/lib/lucene3-core.jar
-/usr/share/java/lucene3-grouping.jar /usr/share/solr/WEB-INF/lib/lucene3-grouping.jar
-/usr/share/java/lucene3-highlighter.jar /usr/share/solr/WEB-INF/lib/lucene3-highlighter.jar
-/usr/share/java/lucene3-kuromoji.jar /usr/share/solr/WEB-INF/lib/lucene3-kuromoji.jar
-/usr/share/java/lucene3-memory.jar /usr/share/solr/WEB-INF/lib/lucene3-memory.jar
-/usr/share/java/lucene3-misc.jar /usr/share/solr/WEB-INF/lib/lucene3-misc.jar
-/usr/share/java/lucene3-phonetic.jar /usr/share/solr/WEB-INF/lib/lucene3-phonetic.jar
-/usr/share/java/lucene3-queries.jar /usr/share/solr/WEB-INF/lib/lucene3-queries.jar
-/usr/share/java/lucene3-spatial.jar /usr/share/solr/WEB-INF/lib/lucene3-spatial.jar
-/usr/share/java/lucene3-spellchecker.jar /usr/share/solr/WEB-INF/lib/lucene3-spellchecker.jar
-/usr/share/java/slf4j-api.jar /usr/share/solr/WEB-INF/lib/slf4j-api.jar
-/usr/share/java/slf4j-jdk14.jar /usr/share/solr/WEB-INF/lib/slf4j-jdk14.jar
-/usr/share/java/wstx-lgpl.jar /usr/share/solr/WEB-INF/lib/wstx-lgpl.jar
-/usr/share/java/stax2-api.jar /usr/share/solr/WEB-INF/lib/stax2-api.jar
+/usr/share/java/solr-core.jar /usr/share/solr/web/WEB-INF/lib/solr-core.jar
+/usr/share/java/solr-solrj.jar /usr/share/solr/web/WEB-INF/lib/solr-solrj.jar
+/usr/share/java/solr-dataimporthandler.jar /usr/share/solr/web/WEB-INF/lib/solr-dataimporthandler.jar
+/usr/share/java/commons-codec.jar /usr/share/solr/web/WEB-INF/lib/commons-codec.jar
+/usr/share/java/commons-fileupload.jar /usr/share/solr/web/WEB-INF/lib/commons-fileupload.jar
+/usr/share/java/commons-httpclient.jar /usr/share/solr/web/WEB-INF/lib/commons-httpclient.jar
+/usr/share/java/commons-io.jar /usr/share/solr/web/WEB-INF/lib/commons-io.jar
+/usr/share/java/commons-lang.jar /usr/share/solr/web/WEB-INF/lib/commons-lang.jar
+/usr/share/java/commons-logging.jar /usr/share/solr/web/WEB-INF/lib/commons-logging.jar
+/usr/share/java/geronimo-stax-1.2-spec.jar /usr/share/solr/web/WEB-INF/lib/geronimo-stax-1.2-spec.jar
+/usr/share/java/guava.jar /usr/share/solr/web/WEB-INF/lib/guava.jar
+/usr/share/java/httpcore.jar /usr/share/solr/web/WEB-INF/lib/httpcore.jar
+/usr/share/java/httpclient.jar /usr/share/solr/web/WEB-INF/lib/httpclient.jar
+/usr/share/java/httpmime.jar /usr/share/solr/web/WEB-INF/lib/httpmime.jar
+/usr/share/java/jcl-over-slf4j.jar /usr/share/solr/web/WEB-INF/lib/jcl-over-slf4j.jar
+/usr/share/java/log4j-over-slf4j.jar /usr/share/solr/web/WEB-INF/lib/log4j-over-slf4j.jar
+/usr/share/java/lucene3-analyzers.jar /usr/share/solr/web/WEB-INF/lib/lucene3-analyzers.jar
+/usr/share/java/lucene3-core.jar /usr/share/solr/web/WEB-INF/lib/lucene3-core.jar
+/usr/share/java/lucene3-grouping.jar /usr/share/solr/web/WEB-INF/lib/lucene3-grouping.jar
+/usr/share/java/lucene3-highlighter.jar /usr/share/solr/web/WEB-INF/lib/lucene3-highlighter.jar
+/usr/share/java/lucene3-kuromoji.jar /usr/share/solr/web/WEB-INF/lib/lucene3-kuromoji.jar
+/usr/share/java/lucene3-memory.jar /usr/share/solr/web/WEB-INF/lib/lucene3-memory.jar
+/usr/share/java/lucene3-misc.jar /usr/share/solr/web/WEB-INF/lib/lucene3-misc.jar
+/usr/share/java/lucene3-phonetic.jar /usr/share/solr/web/WEB-INF/lib/lucene3-phonetic.jar
+/usr/share/java/lucene3-queries.jar /usr/share/solr/web/WEB-INF/lib/lucene3-queries.jar
+/usr/share/java/lucene3-spatial.jar /usr/share/solr/web/WEB-INF/lib/lucene3-spatial.jar
+/usr/share/java/lucene3-spellchecker.jar /usr/share/solr/web/WEB-INF/lib/lucene3-spellchecker.jar
+/usr/share/java/slf4j-api.jar /usr/share/solr/web/WEB-INF/lib/slf4j-api.jar
+/usr/share/java/slf4j-jdk14.jar /usr/share/solr/web/WEB-INF/lib/slf4j-jdk14.jar
+/usr/share/java/wstx-lgpl.jar /usr/share/solr/web/WEB-INF/lib/wstx-lgpl.jar
+/usr/share/java/stax2-api.jar /usr/share/solr/web/WEB-INF/lib/stax2-api.jar
diff --git a/debian/solr-jetty.install b/debian/solr-jetty.install
index 2d4abd2..6328a46 100644
--- a/debian/solr-jetty.install
+++ b/debian/solr-jetty.install
@@ -1 +1 @@
-debian/jetty-web.xml /usr/share/solr/WEB-INF/
+debian/jetty-web.xml /usr/share/solr/web/WEB-INF/
diff --git a/debian/solr-jetty.links b/debian/solr-jetty.links
index 46fc224..1bcf98e 100644
--- a/debian/solr-jetty.links
+++ b/debian/solr-jetty.links
@@ -1 +1 @@
-/usr/share/solr /var/lib/jetty/webapps/solr
+/usr/share/solr/webapp /var/lib/jetty/webapps/solr
diff --git a/debian/solr-tomcat.xml b/debian/solr-tomcat.xml
index 9437347..9d30034 100644
--- a/debian/solr-tomcat.xml
+++ b/debian/solr-tomcat.xml
@@ -2,7 +2,7 @@
Context configuration file for the Solr Web App
-->
-<Context path="/solr" docBase="/usr/share/solr"
+<Context path="/solr" docBase="/usr/share/solr/web"
debug="0" privileged="true" allowLinking="true" crossContext="true">
<!-- make symlinks work in Tomcat -->
<Resources className="org.apache.naming.resources.FileDirContext" allowLinking="true" />
diff --git a/debian/watch b/debian/watch
index 7d72146..1a2efa8 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
version=3
opts=dversionmangle=s/\+dfsg// \
-http://githubredir.debian.net/github/apache/lucene-solr/lucene_solr_(\d+)_(\d+)_(\d+).tar.gz debian jh_repack
+http://githubredir.debian.net/github/apache/lucene-solr/lucene_solr_(\d+)_(\d+)_(\d+).tar.gz debian orig-tar.sh
--
lucene-solr packaging
More information about the pkg-java-commits
mailing list