Bug#388515: diff for 1.4.3.debian-1.1 NMU

[Steinar H. Gunderson]

Package: lucene
Version: 1.4.3.debian-1
Severity: normal
Tags: patch

Hi,

Attached is the diff for my lucene 1.4.3.debian-1.1 NMU.
-------------- next part --------------
diff -Nru /tmp/lN6ALoCcVq/lucene-1.4.3.debian/debian/changelog /tmp/muVSx1HHrv/lucene-1.4.3.debian/debian/changelog
--- /tmp/lN6ALoCcVq/lucene-1.4.3.debian/debian/changelog	2006-09-20 23:59:16.000000000 +0200
+++ /tmp/muVSx1HHrv/lucene-1.4.3.debian/debian/changelog	2006-09-20 23:59:16.000000000 +0200
@@ -1,3 +1,12 @@
+lucene (1.4.3.debian-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Make sure JAVACMD is passed down from debian/rules to the build
+    environment; fixes FTBFS when the /usr/bin/java alternative does not
+    point to java-gcj, patch from Mike O'Connor. (Closes: #380136)
+
+ -- Steinar H. Gunderson <sesse at debian.org>  Wed, 20 Sep 2006 23:51:58 +0200
+
 lucene (1.4.3.debian-1) unstable; urgency=low
 
   * Reupload with new orig.tar.gz (Closes: #338205).
diff -Nru /tmp/lN6ALoCcVq/lucene-1.4.3.debian/debian/rules /tmp/muVSx1HHrv/lucene-1.4.3.debian/debian/rules
--- /tmp/lN6ALoCcVq/lucene-1.4.3.debian/debian/rules	2006-09-20 23:59:16.000000000 +0200
+++ /tmp/muVSx1HHrv/lucene-1.4.3.debian/debian/rules	2006-09-20 23:59:16.000000000 +0200
@@ -19,7 +19,7 @@
 JAVA_HOME=/usr/lib/jvm/java-gcj
 
 # Set the invocation of the java command;
-JAVACMD=$(JAVA_HOME)/bin/java
+export JAVACMD=$(JAVA_HOME)/bin/java
 
 # Class path: Ant requires a JAXP-compatible XML parser
 # You need to set CLASSPATH here (even if your build.xml assembles its own