Hi,

 I made a simple patch for this issue, just ignore lucene-core version
 check in build.xml, it works.


 And just a question, debian/ant.properties says
> build.compiler=javac1.5

 Does it need to specify 1.5? Anyway, please check it, thanks.

-- 
Regards,

 Hideki Yamane     henrich @ debian.or.jp/iijmio-mail.jp
 http://wiki.debian.org/HidekiYamane
diff -Nru solr-1.4.0+ds1/debian/changelog solr-1.4.0+ds1/debian/changelog
--- solr-1.4.0+ds1/debian/changelog	2010-02-11 23:27:56.000000000 +0900
+++ solr-1.4.0+ds1/debian/changelog	2010-04-20 16:19:17.000000000 +0900
@@ -1,3 +1,11 @@
+solr (1.4.0+ds1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches
+    - add remove_lucene-version-failcheck to avoid FTBFS bug (Closes: #577357) 
+
+ -- Hideki Yamane (Debian-JP) <[email protected]>  Tue, 20 Apr 2010 16:19:03 +0900
+
 solr (1.4.0+ds1-1) unstable; urgency=low
 
   * New upstream release (1.4.0). Closes: #559143.
diff -Nru solr-1.4.0+ds1/debian/patches/debian-changes-1.4.0+ds1-1.1 solr-1.4.0+ds1/debian/patches/debian-changes-1.4.0+ds1-1.1
--- solr-1.4.0+ds1/debian/patches/debian-changes-1.4.0+ds1-1.1	1970-01-01 09:00:00.000000000 +0900
+++ solr-1.4.0+ds1/debian/patches/debian-changes-1.4.0+ds1-1.1	2010-04-20 16:19:25.000000000 +0900
@@ -0,0 +1,31 @@
+Description: Upstream changes introduced in version 1.4.0+ds1-1.1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ solr (1.4.0+ds1-1.1) unstable; urgency=low
+ .
+   * Non-maintainer upload.
+   * debian/patches
+     - add remove_lucene-version-failcheck to avoid FTBFS bug (Closes: #577357)
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Hideki Yamane (Debian-JP) <[email protected]>
+Bug-Debian: http://bugs.debian.org/577357
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- /dev/null
++++ solr-1.4.0+ds1/remove_lucene-version-failcheck
+@@ -0,0 +1 @@
++This just ignore lucune-core version check.
diff -Nru solr-1.4.0+ds1/debian/patches/remove_lucene-version-failcheck solr-1.4.0+ds1/debian/patches/remove_lucene-version-failcheck
--- solr-1.4.0+ds1/debian/patches/remove_lucene-version-failcheck	1970-01-01 09:00:00.000000000 +0900
+++ solr-1.4.0+ds1/debian/patches/remove_lucene-version-failcheck	2010-04-20 16:08:50.000000000 +0900
@@ -0,0 +1,24 @@
+Index: solr-1.4.0+ds1/build.xml
+===================================================================
+--- solr-1.4.0+ds1.orig/build.xml	2010-04-20 16:08:33.605194674 +0900
++++ solr-1.4.0+ds1/build.xml	2010-04-20 16:08:47.461195680 +0900
+@@ -85,19 +85,6 @@
+     <!-- no description, don't advertise -->
+ 
+ 
+-    <available file="${lib}/lucene-core-${lucene_version}.jar"
+-               property="lucene-version-ok-m2deploy-wont-fail" />
+-    <fail unless="lucene-version-ok-m2deploy-wont-fail">
+-      lib/lucene-core-${lucene_version}.jar Missing
+-
+-      lib/lucene-core-${lucene_version}.jar does not exist.
+-      This will cause problems with m2-deploy later, so fail fast now.
+-      
+-      Probably cause: lucene jars were upgraded w/o modifying the
+-      'lucene_version' property in common-build.xml
+-    </fail>
+-
+-    
+     <mkdir dir="${dest}" />
+   	
+   	<!-- A folder containing the expanded war file -->
diff -Nru solr-1.4.0+ds1/debian/patches/series solr-1.4.0+ds1/debian/patches/series
--- solr-1.4.0+ds1/debian/patches/series	2010-02-11 18:03:37.000000000 +0900
+++ solr-1.4.0+ds1/debian/patches/series	2010-04-20 16:18:16.000000000 +0900
@@ -2,3 +2,5 @@
 debian/fix-lucene-lock-directory.diff -p1
 debian/solr-example-solrconfig.diff -p1
 debian/use-debian-java-libraries.diff -p1
+remove_lucene-version-failcheck
+debian-changes-1.4.0+ds1-1.1
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers>. Please 
use
[email protected] for discussions and questions.

Reply via email to