Emmanuel Bourg pushed to branch master at Debian Java Maintainers / lucene-solr
Commits: dbbe075e by Emmanuel Bourg at 2022-05-15T23:40:13+02:00 Build with javacc5 - - - - - 26ab2836 by Emmanuel Bourg at 2022-05-15T23:40:20+02:00 Standards-Version updated to 4.6.1 - - - - - 5da1244b by Emmanuel Bourg at 2022-05-15T23:46:43+02:00 Depend on libservlet-api-java instead of libservlet3.1-java - - - - - 54a67261 by Emmanuel Bourg at 2022-05-15T23:46:56+02:00 Upload to unstable - - - - - 6 changed files: - debian/ant.properties - debian/changelog - debian/control - debian/maven.rules - debian/patches/javacc-system.patch - debian/rules Changes: ===================================== debian/ant.properties ===================================== @@ -1,5 +1,4 @@ failonjavadocwarning=false -javacc.home=/usr/share/java ivy.available=true svnversion=debian javac.source=1.7 ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +lucene-solr (3.6.2+dfsg-25) unstable; urgency=medium + + * Team upload. + * Build with javacc5 + * Depend on libservlet-api-java instead of libservlet3.1-java + * Standards-Version updated to 4.6.1 + + -- Emmanuel Bourg <[email protected]> Sun, 15 May 2022 23:46:49 +0200 + lucene-solr (3.6.2+dfsg-24) unstable; urgency=medium * Really remove libcommons-httpclient-java from Build-Depends. ===================================== debian/control ===================================== @@ -10,7 +10,7 @@ Build-Depends: bnd (>= 2.1.0), debhelper-compat (= 13), default-jdk, - javacc, + javacc5, jflex, junit4, libavalon-framework-java, @@ -34,7 +34,7 @@ Build-Depends: libjmock-java, liblog4j1.2-java, libregexp-java, - libservlet3.1-java, + libservlet-api-java, libslf4j-java (>= 1.6.1), libtomcat9-java, libwoodstox-java, @@ -43,7 +43,7 @@ Build-Depends: libxml-commons-resolver1.1-java, maven-repo-helper (>= 1.5~), po-debconf -Standards-Version: 4.5.1 +Standards-Version: 4.6.1 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/maven.rules ===================================== @@ -18,6 +18,6 @@ commons-httpclient commons-httpclient * s/3\..*/3.x/ * * org.codehaus.woodstox s/wstx-asl/woodstox-core-lgpl/ * s/.*/debian/ * * -javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * * +javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/debian/ * * junit junit * s/4\..*/4.x/ * * s/org.mortbay.jetty/org.eclipse.jetty/ * * s/.*/debian/ * * ===================================== debian/patches/javacc-system.patch ===================================== @@ -1,32 +1,7 @@ -Description: Point javacc configuration at the jar files - provided as part of the distribution. - . - Also fix javacc clean and generation which is broken upstream. +Description: Fix javacc clean and generation which is broken upstream. Author: James Page <[email protected]> Forwarded: no -Index: lucene-solr/lucene/common-build.xml -=================================================================== ---- lucene-solr.orig/lucene/common-build.xml 2012-05-29 17:55:56.482256690 +0100 -+++ lucene-solr/lucene/common-build.xml 2012-05-29 17:56:18.574318554 +0100 -@@ -138,7 +138,7 @@ - <property name="m2.repository.url" value="file://${maven.dist.dir}"/> - <property name="m2.repository.private.key" value="${user.home}/.ssh/id_dsa"/> - -- <property name="javacc.home" location="${common.dir}"/> -+ <property name="javacc.home" location="/usr/share/java"/> - <property name="jflex.home" location="${common.dir}"/> - - <path id="jflex.classpath"> -@@ -152,7 +152,7 @@ - - <path id="javacc.classpath"> - <fileset dir="${javacc.home}/"> -- <include name="bin/lib/*.jar"/> -+ <include name="javacc.jar"/> - </fileset> - </path> - Index: lucene-solr/lucene/build.xml =================================================================== --- lucene-solr.orig/lucene/build.xml 2012-05-29 17:55:56.502256746 +0100 ===================================== debian/rules ===================================== @@ -17,6 +17,9 @@ override_dh_auto_configure: dh_auto_configure override_dh_auto_build: + mkdir -p lucene/bin/lib/ + cp /usr/share/java/javacc5.jar lucene/bin/lib/javacc.jar + mkdir -p lucene/site/build/site ant -buildfile build.xml -Dversion=$(DEB_UPSTREAM_VERSION) get-maven-poms ant -buildfile lucene/build.xml -propertyfile debian/ant.properties \ View it on GitLab: https://salsa.debian.org/java-team/lucene-solr/-/compare/1c6eff13d5c1b47890747297f0130b70004d5d9b...54a67261c7133876682862c57e1856780e2e0ef1 -- View it on GitLab: https://salsa.debian.org/java-team/lucene-solr/-/compare/1c6eff13d5c1b47890747297f0130b70004d5d9b...54a67261c7133876682862c57e1856780e2e0ef1 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
