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

James Page james.page at ubuntu.com
Thu Jun 7 12:22:22 UTC 2012 

The following commit has been merged in the master branch:
commit 4a5c8b040bd3d94c35d81b452571cf724c69acee
Author: James Page <james.page at ubuntu.com>
Date:   Thu Jun 7 11:42:40 2012 +0100

    Re-aligned to tomcat6 for transition and updated copyright with js file details

diff --git a/debian/control b/debian/control
index 0e886c6..bbe7a26 100644
--- a/debian/control
+++ b/debian/control
@@ -160,7 +160,7 @@ Description: Enterprise search server based on Lucene3 - common files
 
 Package: solr-tomcat
 Architecture: all
-Depends: solr-common (= ${binary:Version}), tomcat7 | tomcat6, ${misc:Depends}
+Depends: solr-common (= ${binary:Version}), tomcat6, ${misc:Depends}
 Conflicts: solr-jetty, solr-tomcat6
 Description: Enterprise search server based on Lucene3 - Tomcat integration
  Solr is an open source enterprise search server based on the Lucene
diff --git a/debian/copyright b/debian/copyright
index a2f671c..de9bae5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,6 +4,9 @@ Source: http://lucene.apache.org/
 Comments:
  The upstream codebase for lucene and solr contains a large number
  of test cases in a number of formats including pdf, docx, zip.
+ .
+ These are essential for unit testing during the package build
+ process.
 
 Files: *
 Copyright: 2007-2011 The Apache Software Foundation
@@ -32,6 +35,42 @@ Copyright: 2001 Dr Martin Porter
            2002 Richard Boulton
 License: Snowball and Apache-2
 
+Files: lucene/contrib/xml-query-parser/docs/cctree.js
+Copyright: 2002-2003 Geir Landrö
+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, 
+           2007 Anjesh Tuladhar, 
+           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
+Copyright: 2005, 2006 Thomas Fuchs,
+           2005, 2006 Ivan Krstic,
+           2005, 2006 Jon Tirsen,
+           2005, 2006 Sammi Williams 
+License: MIT
+
+Files: solr/client/ruby/flare/public/javascripts/prototype.js
+Copyright: 2005-2007 Sam Stephenson
+License: MIT
+
 Files: debian/*
 Copyright: 2007-2009 Jan-Pascal van Best <janpascal at vanbest.org>
            2011 Mat Scales <mat at wibbly.org.uk>
@@ -44,10 +83,36 @@ Copyright: 2011 Luca Stancapiano <jedim at vige.it>
            2011 Mat Scales <mat at wibbly.org.uk>
 License: Apache-2
 
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+License: GPL-2
+ On Debian systems, the complete text of the GPL License, version 2, can be
+ found in the `/usr/share/common-licenses/GPL-2' file.
+
+License: GPL-3
+ On Debian systems, the complete text of the GPL License, version 3, can be
+ found in the `/usr/share/common-licenses/GPL-3' file.
+
 License: Apache-2
- On Debian systems, the complete text of the Apache
- License, version 2.0, can be found in the
- `/usr/share/common-licenses/Apache-2.0' file.
+ On Debian systems, the complete text of the Apache License, version 2.0, can
+ be found in the `/usr/share/common-licenses/Apache-2.0' file.
 
 License: PSF-2.4
  PSF LICENSE AGREEMENT FOR PYTHON 2.4
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index a821bb6..d2a8ba0 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -12,6 +12,8 @@ tar -xzf $TAR -C $DIR --strip-components=1
 # Clean up tarball
 find $DIR -name \*.jar -delete
 find $DIR -name \*.war -delete
+rm -Rf $DIR/lucene/site/build
+rm -Rf $DIR/lucene/site/src/documentation/skins/common/script/*.js
 fgrep -lR "Generated By:JavaCC:" $DIR | xargs -n5 rm
 
 # Repack excluding stuff we don't need
diff --git a/debian/solr-tomcat.links b/debian/solr-tomcat.links
index b32ab49..98b3a49 100644
--- a/debian/solr-tomcat.links
+++ b/debian/solr-tomcat.links
@@ -1 +1 @@
-/etc/solr/solr-tomcat.xml /etc/tomcat7/Catalina/localhost/solr.xml
+/etc/solr/solr-tomcat.xml /etc/tomcat6/Catalina/localhost/solr.xml
diff --git a/debian/solr-tomcat.postinst b/debian/solr-tomcat.postinst
index f08c7e0..f81d51c 100644
--- a/debian/solr-tomcat.postinst
+++ b/debian/solr-tomcat.postinst
@@ -11,10 +11,10 @@ case "$1" in
         chown root:root /var/lib/solr
         chmod 755 /var/lib/solr
 
-        chown -R tomcat7:tomcat7 /var/lib/solr/data
+        chown -R tomcat6:tomcat6 /var/lib/solr/data
         chmod -R 770 /var/lib/solr/data
 
-        ln -sf /etc/solr/tomcat.policy /etc/tomcat7/policy.d/05solr.policy
+        ln -sf /etc/solr/tomcat.policy /etc/tomcat6/policy.d/05solr.policy
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
@@ -28,9 +28,9 @@ case "$1" in
 
 esac
 
-invoke-rc.d --quiet tomcat7 restart || {
+invoke-rc.d --quiet tomcat6 restart || {
     RESULT=$?
-    # Ignore if tomcat7 init script does not exist (yet)
+    # Ignore if tomcat6 init script does not exist (yet)
     if [ $RESULT != 100 ]; then
 	    exit $RESULT
     fi
diff --git a/debian/solr-tomcat.postrm b/debian/solr-tomcat.postrm
index cb4fe35..c31450b 100644
--- a/debian/solr-tomcat.postrm
+++ b/debian/solr-tomcat.postrm
@@ -4,9 +4,9 @@ set -e
 
 case "$1" in
     remove)
-        rm -f /etc/tomcat7/policy.d/05solr.policy
+        rm -f /etc/tomcat6/policy.d/05solr.policy
     	if [ -x /usr/sbin/invoke-rc.d ]; then
-    	    invoke-rc.d tomcat7 restart || true
+    	    invoke-rc.d tomcat6 restart || true
     	fi
     ;;
     upgrade|purge|failed-upgrade|abort-install|abort-upgrade|disappear)

-- 
lucene-solr packaging

More information about the pkg-java-commits mailing list