Bug#767830: unblock: lucene-solr/3.6.2+dfsg-5
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package lucene-solr. The integration of the solr-jetty
package with jetty8 was not working properly, and the postrm script had
a bug caused by the removal of the link to dpkg-statoverride in /usr/sbin.
Thank you,
Emmanuel Bourg
unblock lucene-solr/3.6.2+dfsg-5
diff -Nru lucene-solr-3.6.2+dfsg/debian/changelog lucene-solr-3.6.2+dfsg/debian/changelog
--- lucene-solr-3.6.2+dfsg/debian/changelog 2014-10-06 15:48:05.000000000 +0200
+++ lucene-solr-3.6.2+dfsg/debian/changelog 2014-10-31 19:28:27.000000000 +0100
@@ -1,3 +1,12 @@
+lucene-solr (3.6.2+dfsg-5) unstable; urgency=medium
+
+ * Team upload.
+ * Fixed the deployment with Jetty 8 (Closes: #752547, #767525)
+ * Enable the symbolic links with Jetty (Closes: #701876)
+ * Fixed the path to dpkg-statoverride in solr-jetty.postrm (Closes: #767519)
+
+ -- Emmanuel Bourg <ebourg@apache.org> Fri, 31 Oct 2014 19:28:25 +0100
+
lucene-solr (3.6.2+dfsg-4) unstable; urgency=medium
* Team upload.
diff -Nru lucene-solr-3.6.2+dfsg/debian/jetty-web.xml lucene-solr-3.6.2+dfsg/debian/jetty-web.xml
--- lucene-solr-3.6.2+dfsg/debian/jetty-web.xml 2014-09-22 11:19:21.000000000 +0200
+++ lucene-solr-3.6.2+dfsg/debian/jetty-web.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN"
-"http://jetty.mortbay.org/configure.dtd";>
-
-<!-- Set the solr.solr.home system property -->
-<Configure class="org.eclipse.jetty.webapp.WebAppContext">
- <Call name="setProperty" class="java.lang.System">
- <Arg type="String">solr.solr.home</Arg>
- <Arg type="String">/usr/share/solr</Arg>
- </Call>
-</Configure>
diff -Nru lucene-solr-3.6.2+dfsg/debian/solr-jetty.install lucene-solr-3.6.2+dfsg/debian/solr-jetty.install
--- lucene-solr-3.6.2+dfsg/debian/solr-jetty.install 2014-02-24 00:13:46.000000000 +0100
+++ lucene-solr-3.6.2+dfsg/debian/solr-jetty.install 2014-10-31 12:10:47.000000000 +0100
@@ -1 +1 @@
-debian/jetty-web.xml /usr/share/solr/web/WEB-INF/
+debian/solr-jetty.xml /etc/solr/
diff -Nru lucene-solr-3.6.2+dfsg/debian/solr-jetty.links lucene-solr-3.6.2+dfsg/debian/solr-jetty.links
--- lucene-solr-3.6.2+dfsg/debian/solr-jetty.links 2014-02-24 00:13:46.000000000 +0100
+++ lucene-solr-3.6.2+dfsg/debian/solr-jetty.links 2014-10-31 12:10:06.000000000 +0100
@@ -1 +1 @@
-/usr/share/solr/web /var/lib/jetty/webapps/solr
+/etc/solr/solr-jetty.xml /etc/jetty8/contexts/solr.xml
diff -Nru lucene-solr-3.6.2+dfsg/debian/solr-jetty.postrm lucene-solr-3.6.2+dfsg/debian/solr-jetty.postrm
--- lucene-solr-3.6.2+dfsg/debian/solr-jetty.postrm 2014-09-22 11:19:21.000000000 +0200
+++ lucene-solr-3.6.2+dfsg/debian/solr-jetty.postrm 2014-10-31 19:20:23.000000000 +0100
@@ -6,7 +6,7 @@
remove)
# If permissions for the stuff under /var/lib/solr haven't
# been removed, remove them now
- if [ -x /usr/sbin/dpkg-statoverride ]; then
+ if [ -x /usr/bin/dpkg-statoverride ]; then
if dpkg-statoverride --quiet --list /var/lib/solr > /dev/null ; then
dpkg-statoverride --quiet --remove /var/lib/solr
fi
diff -Nru lucene-solr-3.6.2+dfsg/debian/solr-jetty.xml lucene-solr-3.6.2+dfsg/debian/solr-jetty.xml
--- lucene-solr-3.6.2+dfsg/debian/solr-jetty.xml 1970-01-01 01:00:00.000000000 +0100
+++ lucene-solr-3.6.2+dfsg/debian/solr-jetty.xml 2014-10-31 12:16:15.000000000 +0100
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd";>
+
+<!-- Context configuration file for the Solr web application in Jetty -->
+
+<Configure class="org.eclipse.jetty.webapp.WebAppContext">
+ <Set name="contextPath">/solr</Set>
+ <Set name="war">/usr/share/solr/web</Set>
+
+ <!-- Set the solr.solr.home system property -->
+ <Call name="setProperty" class="java.lang.System">
+ <Arg type="String">solr.solr.home</Arg>
+ <Arg type="String">/usr/share/solr</Arg>
+ </Call>
+
+ <!-- Enable symlinks -->
+ <Call name="addAliasCheck">
+ <Arg>
+ <New class="org.eclipse.jetty.server.handler.ContextHandler$ApproveSameSuffixAliases"/>
+ </Arg>
+ </Call>
+</Configure>
Reply to: