[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 e3e1c4386efcb6064d06292351d7858a369124ae
Author: James Page <james.page at ubuntu.com>
Date:   Thu Jun 7 12:43:29 2012 +0100

    Complete removal of prettify

diff --git a/debian/copyright b/debian/copyright
index de9bae5..e77afe8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -41,11 +41,6 @@ License:
  This script can be used freely as long as all copyright messages are
  intact.
 
-Files: lucene/tools/prettify/*
-       lucene/contrib/facet/src/java/org/apache/lucene/facet/doc-files/prettify.js
-Copyright: UNKNOWN
-License: UNKNOWN
-
 Files: solr/example/solr/conf/velocity/jquery.autocomplete.js
 Copyright: 2007 Dylan Verheul, 
            2007 Dan G. Switzer, 
@@ -53,11 +48,6 @@ Copyright: 2007 Dylan Verheul,
            2007 Jörn Zaefferer
 License: MIT or GPL-3
 
-Files: solr/webapp/web/admin/jquery-1.4.3.min.js
-Copyright: 2010, John Resig
-           2010, The Dojo Foundation
-License: MIT or GPL-2
-
 Files: solr/client/ruby/flare/public/javascripts/controls.js
        solr/client/ruby/flare/public/javascripts/dragdrop.js
        solr/client/ruby/flare/public/javascripts/effects.js
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 3641a09..527f519 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -16,6 +16,7 @@ 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
+rm -Rf $DIR/lucene/contrib/facet/src/java/org/apache/lucene/facet/doc-files/prettify.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
index c77e578..ef97e6e 100644
--- a/debian/patches/remove-prettify.patch
+++ b/debian/patches/remove-prettify.patch
@@ -5,8 +5,8 @@ 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
+--- lucene-solr.orig/lucene/common-build.xml	2012-06-07 12:41:01.245497407 +0100
++++ lucene-solr/lucene/common-build.xml	2012-06-07 12:41:01.281497511 +0100
 @@ -985,7 +985,6 @@
      <sequential>
        <antcall target="download-java5-javadoc-packagelist"/>
@@ -50,3 +50,21 @@ Index: lucene-solr/lucene/common-build.xml
        <delete>
          <fileset file="@{destdir}/log_javadoc.txt">
            <or>
+Index: lucene-solr/lucene/contrib/facet/src/java/org/apache/lucene/facet/doc-files/userguide.html
+===================================================================
+--- lucene-solr.orig/lucene/contrib/facet/src/java/org/apache/lucene/facet/doc-files/userguide.html	2012-05-23 09:39:25.217826049 +0100
++++ lucene-solr/lucene/contrib/facet/src/java/org/apache/lucene/facet/doc-files/userguide.html	2012-06-07 12:41:23.053560596 +0100
+@@ -20,13 +20,6 @@
+ 
+ <!-- load stylesheet + javascript in distribution mode -->
+ <link rel="stylesheet" type="text/css" href="prettify.css">
+-<script src="prettify.js" type="text/javascript"></script>
+-
+-<script language="javascript">
+-	window.onload=function() {
+-		prettyPrint();
+-	}
+-</script>
+ 
+ <style>
+ body {

-- 
lucene-solr packaging