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

[James Page]

The following commit has been merged in the master branch:
commit 87977f8f087a006c2af433488ac91a0fffe23543
Author: James Page <james.page at ubuntu.com>
Date:   Thu Jun 7 12:33:08 2012 +0100

    General tidy of javascript handling for DFSG compliance

diff --git a/debian/control b/debian/control
index bbe7a26..d7e5550 100644
--- a/debian/control
+++ b/debian/control
@@ -122,6 +122,7 @@ Suggests:
  libeasymock-java,
  libjetty-extras-java,
  libjetty-java,
+ libjs-jquery,
  libsolr-java-doc
 Description: Enterprise search server based on Lucene - Java libraries
  Solr is an open source enterprise search server based on the Lucene
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 3e5d169..3641a09 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -15,6 +15,7 @@ find $DIR -name \*.war -delete
 rm -Rf $DIR/lucene/site/build
 rm -Rf $DIR/lucene/site/src/documentation/skins/common/scripts/*.js
 rm -Rf $DIR/lucene/tools/prettify/*
+rm -Rf $DIR/solr/webapp/web/admin/jquery*.js
 fgrep -lR "Generated By:JavaCC:" $DIR | xargs -n5 rm
 
 # Repack excluding stuff we don't need
diff --git a/debian/patches/remove-prettify.patch b/debian/patches/remove-prettify.patch
new file mode 100644
index 0000000..c77e578
--- /dev/null
+++ b/debian/patches/remove-prettify.patch
@@ -0,0 +1,52 @@
+Description: Remove use of prettify in javadoc as it provided
+ in non-preferrred compressed source and adds minimal value.
+Author: James Page <james.page at ubuntu.com>
+Forwarded: not-needed
+
+Index: lucene-solr/lucene/common-build.xml
+===================================================================
+--- lucene-solr.orig/lucene/common-build.xml	2012-06-07 12:25:01.778670365 +0100
++++ lucene-solr/lucene/common-build.xml	2012-06-07 12:25:59.190842526 +0100
+@@ -985,7 +985,6 @@
+     <sequential>
+       <antcall target="download-java5-javadoc-packagelist"/>
+       <delete file="@{destdir}/stylesheet.css" failonerror="false"/>
+-      <copy todir="@{destdir}" file="${prettify.dir}/prettify.js" overwrite="false" />
+       <record name="@{destdir}/log_javadoc.txt" action="start" append="no"/>
+       <javadoc
+           overview="@{overview}"
+@@ -1011,34 +1010,12 @@
+         description="NOTE: This API is for internal purposes only and might change in incompatible ways in the next release."/>
+       	<link offline="true" packagelistLoc="${javadoc.dir}"/>
+         <link offline="true" href="${javadoc.link}" packagelistLoc="${javadoc.packagelist.dir}/java5"/>
+-        <bottom><![CDATA[
+-          <script src='{@docRoot}/prettify.js' type='text/javascript'></script>
+-          <script type='text/javascript'>
+-            (function(){
+-              var oldonload = window.onload;
+-              if (typeof oldonload != 'function') {
+-                window.onload = prettyPrint;
+-              } else {
+-                window.onload = function() {
+-                  oldonload();
+-                  prettyPrint();
+-                }
+-              }
+-            })();
+-          </script>
+-        ]]></bottom>
+-      	
+       	<sources />
+       	      	
+         <classpath refid="javadoc.classpath"/>
+       </javadoc>
+       <record name="@{destdir}/log_javadoc.txt" action="stop"/>
+       
+-      <!-- append prettify.css -->
+-      <concat destfile="@{destdir}/stylesheet.css" append="true">
+-        <filelist dir="${prettify.dir}" files="prettify.css"/>
+-      </concat>
+-
+       <delete>
+         <fileset file="@{destdir}/log_javadoc.txt">
+           <or>
diff --git a/debian/patches/series b/debian/patches/series
index 788c966..be79de5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ disable-ivy.patch
 icu4.4-compat.patch
 regex-test-failure.patch
 #set-data-dir.patch
+remove-prettify.patch
diff --git a/debian/rules b/debian/rules
index d556fe7..cd077a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,7 @@ override_dh_auto_configure:
 	dh_auto_configure
 
 override_dh_auto_build:
+	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 \
 		-Dversion=$(DEB_UPSTREAM_VERSION) javacc jar-core docs javadocs build-contrib
@@ -40,6 +41,7 @@ override_dh_auto_clean:
 	find . -name "*.jar" -type l -delete || true
 	find . -name "pom.xml" -type f -delete || true
 	rm -f debian/liblucene3-java.poms
+	rm -rf lucene/site/build/site
 	dh_auto_clean
 
 override_dh_fixperms:
diff --git a/debian/solr-common.links b/debian/solr-common.links
index 3d61d56..9ca3282 100644
--- a/debian/solr-common.links
+++ b/debian/solr-common.links
@@ -4,6 +4,7 @@
 /var/lib/solr/data                          /usr/share/solr/data
 /var/log/solr                               /usr/share/solr/logs
 /usr/share/solr/bin                         /usr/share/solr/scripts
+/usr/share/javascript/jquery/jquery.min.js  /usr/share/solr/web/admin/jquery-1.4.3.min.js
 /usr/share/java/solr-core.jar               /usr/share/solr/web/WEB-INF/lib/solr-core.jar
 /usr/share/java/solr-solrj.jar              /usr/share/solr/web/WEB-INF/lib/solr-solrj.jar
 /usr/share/java/solr-dataimporthandler.jar  /usr/share/solr/web/WEB-INF/lib/solr-dataimporthandler.jar

-- 
lucene-solr packaging