[SCM] lucene-solr packaging branch, master, updated. upstream/3.6.0+dfsg-39-g2405512

[James Page]

The following commit has been merged in the master branch:
commit 24055121d5c1134c1803a13be6a8270616791583
Author: James Page <james.page at ubuntu.com>
Date:   Thu Jun 21 09:57:53 2012 +0100

    Added missing dependencies,  linked jars into build and removed all ivy:retrieve calls from build process

diff --git a/debian/build-jars b/debian/build-jars
index 136e8c8..ff632e5 100644
--- a/debian/build-jars
+++ b/debian/build-jars
@@ -31,3 +31,13 @@
 /usr/share/java/slf4j-api.jar:./solr/lib/slf4j-api.jar
 /usr/share/java/slf4j-jdk14.jar:./solr/lib/slf4j-jdk14.jar
 /usr/share/java/wstx-lgpl.jar:./solr/lib/wstx-lgpl.jar
+/usr/share/java/jetty.jar:./solr/example/lib/jetty.jar
+/usr/share/java/jetty-util.jar:./solr/example/lib/jetty-util.jar
+/usr/share/java/jetty-start.jar:./solr/example/lib/start.jar
+/usr/share/java/servlet-api-2.5.jar:./solr/example/lib/servlet-api-2.5.jar
+/usr/share/java/jsp-api-2.1.jar:./solr/example/lib/jsp-api-2.1.jar
+/usr/share/java/el-api-2.1.jar:./solr/example/lib/el-api-2.1.jar
+/usr/share/java/jasper.jar:./solr/example/lib/jasper.jar
+/usr/share/java/jasper-el.jar:./solr/example/lib/jasper-el.jar
+/usr/share/java/tomcat-juli.jar:./solr/example/lib/tomcat-juli.jar
+/usr/share/java/ecj.jar:./solr/example/lib/ecj.jar
diff --git a/debian/control b/debian/control
index 5167eb7..95a59a6 100644
--- a/debian/control
+++ b/debian/control
@@ -37,6 +37,7 @@ Build-Depends:
  libregexp-java,
  libservlet2.5-java (>= 6.0.20),
  libslf4j-java (>= 1.6.1),
+ libtomcat6-java,
  libwoodstox-java,
  libxerces2-java,
  libxml-commons-external-java,
@@ -138,8 +139,8 @@ Depends:
  curl,
  debconf (>= 1.5),
  default-jre-headless | java5-runtime-headless | java6-runtime-headless,
- libsolr-java (= ${binary:Version}),
  libjs-jquery,
+ libsolr-java (= ${binary:Version}),
  procps,
  ${misc:Depends}
 Recommends: solr-tomcat (= ${binary:Version}) | solr-jetty (= ${binary:Version})
diff --git a/debian/patches/disable-ivy.patch b/debian/patches/disable-ivy.patch
index 0339e34..0968d08 100644
--- a/debian/patches/disable-ivy.patch
+++ b/debian/patches/disable-ivy.patch
@@ -4,8 +4,8 @@ Forwarded: not-needed
 
 Index: lucene-solr/lucene/common-build.xml
 ===================================================================
---- lucene-solr.orig/lucene/common-build.xml	2012-05-23 10:50:17.331614071 +0100
-+++ lucene-solr/lucene/common-build.xml	2012-05-23 10:50:55.203734042 +0100
+--- lucene-solr.orig/lucene/common-build.xml	2012-06-21 08:35:36.677845634 +0100
++++ lucene-solr/lucene/common-build.xml	2012-06-21 08:35:40.485857065 +0100
 @@ -257,7 +257,7 @@
    <target name="resolve" depends="ivy-availability-check,ivy-fail">
      <!-- todo, make this a property or something. 
@@ -15,3 +15,25 @@ Index: lucene-solr/lucene/common-build.xml
    </target>
    <target name="ivy-availability-check" unless="ivy.available">
     <echo>
+Index: lucene-solr/solr/example/build.xml
+===================================================================
+--- lucene-solr.orig/solr/example/build.xml	2012-05-23 09:39:26.181829120 +0100
++++ lucene-solr/solr/example/build.xml	2012-06-21 08:37:09.654124924 +0100
+@@ -34,16 +34,7 @@
+   <target name="compile-test"/>
+ 
+   <target name="resolve" depends="ivy-availability-check">
+-    <sequential>
+-    <!-- jetty libs in lib/ -->
+-    <ivy:retrieve conf="jetty" type="jar" log="download-only"/>
+-    <!-- jetty libs in lib/jsp-2.1 -->
+-    <ivy:retrieve conf="jsp" type="jar" log="download-only" 
+-                  pattern="${example}/lib/jsp-2.1/[artifact]-[revision].[ext]"/>
+-    <!-- start.jar -->
+-    <ivy:retrieve conf="start" type="jar" log="download-only" 
+-                  pattern="${example}/start.jar"/>
+-    </sequential>
++    <echo message="Ivy usage disabled in Debian build"/>
+   </target>
+ 
+ </project>

-- 
lucene-solr packaging