[Git][java-team/lucene-solr][master] 5 commits: Switch to debhelper-compat = 12.

[Markus Koschany]

Markus Koschany pushed to branch master at Debian Java Maintainers / lucene-solr


Commits:
cf3792c4 by Markus Koschany at 2019-08-26T19:44:45Z
Switch to debhelper-compat = 12.

- - - - -
f58985f5 by Markus Koschany at 2019-09-02T11:58:54Z
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.

Closes: #933854 #933857
Thanks: Stephan Beirer for the report.

- - - - -
81709f85 by Markus Koschany at 2019-09-02T12:07:12Z
Declare compliance with Debian Policy 4.4.0.

- - - - -
56c6b69e by Markus Koschany at 2019-09-02T12:08:40Z
Update changelog

- - - - -
18095861 by Markus Koschany at 2019-09-02T12:24:27Z
Remove obsolete enable-jflex patch

- - - - -


6 changed files:

- debian/changelog
- − debian/compat
- debian/control
- − debian/patches/enable-jflex
- debian/solr-jetty.install
- debian/solr-jetty.xml


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+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 at debian.org>  Mon, 02 Sep 2019 14:07:25 +0200
+
 lucene-solr (3.6.2+dfsg-20) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-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 deleted
=====================================
@@ -1,23 +0,0 @@
-Description: Patch in Debian provided jflex for generating java source
- during build.
-Author: James Page <james.page at 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
=====================================
@@ -1 +1,2 @@
 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>



View it on GitLab: https://salsa.debian.org/java-team/lucene-solr/compare/68df08e2492b3641b4e4c17be6f7031674ad17ad...180958616a94034e05f99f22be54ac7f006fe0c0

-- 
View it on GitLab: https://salsa.debian.org/java-team/lucene-solr/compare/68df08e2492b3641b4e4c17be6f7031674ad17ad...180958616a94034e05f99f22be54ac7f006fe0c0
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20190902/897e4002/attachment.html>