[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:25 UTC 2012


The following commit has been merged in the master branch:
commit 6076252298f990bb43a33dbe0052b556007b55a7
Author: James Page <james.page at ubuntu.com>
Date:   Tue May 29 18:30:12 2012 +0100

    Fixup last few javacc issues

diff --git a/debian/changelog b/debian/changelog
index f979104..98ef7c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-lucene-solr (3.6.0-1) unstable; urgency=low
+lucene-solr (3.6.0+dfsg-1) unstable; urgency=low
 
   * New upstream release.
   * Renamed source package to support a single source package for
@@ -6,7 +6,7 @@ lucene-solr (3.6.0-1) unstable; urgency=low
   * Merged debian/* from solr source package.
   * Enabled test suites.
 
- -- James Page <james.page at ubuntu.com>  Mon, 28 May 2012 14:08:52 +0100
+ -- James Page <james.page at ubuntu.com>  Tue, 29 May 2012 17:32:24 +0100
 
 lucene3 (3.5.0-1) unstable; urgency=low
 
diff --git a/debian/patches/javacc-system.patch b/debian/patches/javacc-system.patch
index bcbba08..1e5ae93 100644
--- a/debian/patches/javacc-system.patch
+++ b/debian/patches/javacc-system.patch
@@ -1,12 +1,14 @@
 Description: Point javacc configuration at the jar files
  provided as part of the distribution.
+ .
+ Also fix javacc clean and generation which is broken upstream.
 Author: James Page <james.page at ubuntu.com>
-Forwarded: not-needed
+Forwarded: no
 
 Index: lucene-solr/lucene/common-build.xml
 ===================================================================
---- lucene-solr.orig/lucene/common-build.xml	2012-05-23 10:00:18.885978436 +0100
-+++ lucene-solr/lucene/common-build.xml	2012-05-23 10:01:28.666204839 +0100
+--- 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"/>
@@ -25,3 +27,55 @@ Index: lucene-solr/lucene/common-build.xml
      </fileset>
    </path>
  
+Index: lucene-solr/lucene/build.xml
+===================================================================
+--- lucene-solr.orig/lucene/build.xml	2012-05-29 17:55:56.502256746 +0100
++++ lucene-solr/lucene/build.xml	2012-05-29 17:57:46.914565976 +0100
+@@ -514,7 +514,7 @@
+   <!-- ================================================================== -->
+   <target name="clean-javacc">
+     <delete>
+-      <fileset dir="src/java/org/apache/lucene/queryParser" includes="*.java">
++      <fileset dir="core/src/java/org/apache/lucene/queryParser" includes="*.java">
+         <containsregexp expression="Generated.*By.*JavaCC"/>
+       </fileset>
+       <fileset dir="contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser" includes="*.java">
+@@ -526,19 +526,19 @@
+     </delete>
+   </target>
+ 
+-  <target name="javacc" depends="javacc-check,clean-javacc,javacc-QueryParser,javacc-contrib-queryparser,javacc-contrib-demo"/>
++  <target name="javacc" depends="javacc-check,clean-javacc,javacc-QueryParser,javacc-contrib-queryparser,javacc-contrib-benchmark"/>
+ 
+   <target name="javacc-QueryParser" depends="javacc-check" if="javacc.present">
+     <sequential>
+-      <invoke-javacc target="src/java/org/apache/lucene/queryParser/QueryParser.jj"
+-                     outputDir="src/java/org/apache/lucene/queryParser"/>
++      <invoke-javacc target="core/src/java/org/apache/lucene/queryParser/QueryParser.jj"
++                     outputDir="core/src/java/org/apache/lucene/queryParser"/>
+ 
+       <!-- Change the inccorrect public ctors for QueryParser to be protected instead -->
+-      <replaceregexp file="src/java/org/apache/lucene/queryParser/QueryParser.java"
++      <replaceregexp file="core/src/java/org/apache/lucene/queryParser/QueryParser.java"
+ 		     byline="true"
+ 		     match="public QueryParser\(CharStream "
+ 		     replace="protected QueryParser(CharStream "/>
+-      <replaceregexp file="src/java/org/apache/lucene/queryParser/QueryParser.java"
++      <replaceregexp file="core/src/java/org/apache/lucene/queryParser/QueryParser.java"
+ 		     byline="true"
+ 		     match="public QueryParser\(QueryParserTokenManager "
+ 		     replace="protected QueryParser(QueryParserTokenManager "/>
+@@ -553,6 +553,13 @@
+     />
+   </target>
+ 
++  <target name="javacc-contrib-benchmark" depends="javacc-check" if="javacc.present">
++    <ant target="javacc"
++      dir="contrib/benchmark"
++      antfile="build.xml"
++    />
++  </target>
++
+   <target name="javacc-contrib-demo" depends="javacc-check" if="javacc.present">
+     <ant target="javacc"
+       dir="contrib/demo"
diff --git a/debian/rules b/debian/rules
index b62db1a..d556fe7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 
 export JAVA_HOME=/usr/lib/jvm/default-java
 
-DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+)\-.*,\1,p')
+DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p')
 
 %:
 	dh $@ --with maven_repo_helper
@@ -19,7 +19,7 @@ override_dh_auto_configure:
 override_dh_auto_build:
 	ant -buildfile build.xml -Dversion=$(DEB_UPSTREAM_VERSION) get-maven-poms
 	ant -buildfile lucene/build.xml -propertyfile debian/ant.properties \
-		-Dversion=$(DEB_UPSTREAM_VERSION) jar-core docs javadocs build-contrib
+		-Dversion=$(DEB_UPSTREAM_VERSION) javacc jar-core docs javadocs build-contrib
 	ant -buildfile solr/contrib/dataimporthandler/build.xml \
 		-propertyfile debian/ant.properties -Dversion=$(DEB_UPSTREAM_VERSION) dist
 	ant -buildfile solr/build.xml -propertyfile debian/ant.properties \
@@ -35,6 +35,8 @@ endif
 
 override_dh_auto_clean:
 	ant clean-jars
+	# breaks if patches not applied
+	ant -buildfile lucene/build.xml clean-javacc || true
 	find . -name "*.jar" -type l -delete || true
 	find . -name "pom.xml" -type f -delete || true
 	rm -f debian/liblucene3-java.poms

-- 
lucene-solr packaging



More information about the pkg-java-commits mailing list