debian/changelog

+lucene-solr (3.6.2+dfsg-21) unstable; urgency=high
+
+  * Team upload.
+  * Switch to debhelper-compat = 12.
+  * Disable obsolete call to ContextHandler in solr-jetty9.xml.
+    Install solr-permissions.conf into /etc/systemd/system/jetty9.service.d/ and
+    override read-only permissions of Jetty9 which will allow the service to
+    start out-of-the-box again.
+    Thanks to Stephan Beirer for the report. (Closes: #933854, #933857)
+  * Declare compliance with Debian Policy 4.4.0.
+
+ -- Markus Koschany <apo@debian.org>  Mon, 02 Sep 2019 14:07:25 +0200
+
 lucene-solr (3.6.2+dfsg-20) unstable; urgency=medium
 
   * Team upload.

debian/compat

-11

debian/control

@@ -10,7 +10,7 @@ Build-Depends:
  ant,
  ant-optional,
  bnd (>= 2.1.0),
- debhelper (>= 11),
+ debhelper-compat (= 12),
  default-jdk,
  javacc,
  jflex,
@@ -46,7 +46,7 @@ Build-Depends:
  libxml-commons-resolver1.1-java,
  maven-repo-helper (>= 1.5~),
  po-debconf
-Standards-Version: 4.3.0
+Standards-Version: 4.4.0
 Vcs-Git: https://salsa.debian.org/java-team/lucene-solr.git
 Vcs-Browser: https://salsa.debian.org/java-team/lucene-solr
 Homepage: http://lucene.apache.org

debian/patches/enable-jflex

-Description: Patch in Debian provided jflex for generating java source
- during build.
-Author: James Page <james.page@ubuntu.com>
-Forwarded: not-needed
-
-Index: lucene3/common-build.xml
-===================================================================
---- lucene3.orig/common-build.xml	2011-10-14 16:43:17.104113340 +0100
-+++ lucene3/common-build.xml	2011-10-14 16:44:07.468499724 +0100
-@@ -140,11 +140,8 @@
-   <property name="jflex.home" location="${common.dir}"/>
- 
-   <path id="jflex.classpath">
--    <fileset dir="${jflex.home}/">
--      <!-- for a JFlex trunk checkout: -->
--      <include name="jflex/target/*.jar"/>
--      <!-- for a JFlex distribution (not yet available): -->
--      <include name="lib/*.jar"/>
-+    <fileset dir="/usr/share/java">
-+      <include name="JFlex.jar"/>
-     </fileset>
-   </path>
- 

debian/solr-jetty.install

 debian/solr-jetty.xml /etc/solr/
+debian/solr-permissions.conf /etc/systemd/system/jetty9.service.d/

debian/solr-jetty.xml

@@ -14,9 +14,11 @@
   </Call>
 
   <!-- Enable symlinks -->
+  <!-- This call will not work with Jetty9 in Debian 10. FIXME
   <Call name="addAliasCheck">
     <Arg>
       <New class="org.eclipse.jetty.server.handler.ContextHandler$ApproveSameSuffixAliases"/>
     </Arg>
   </Call>
+  -->
 </Configure>