[pkg-java] r8567 - branches/solr/1.2.0+ds2/debian

Jan-Pascal van Best janpascal-guest at alioth.debian.org
Tue Jun 23 11:08:00 UTC 2009 

Author: janpascal-guest
Date: 2009-06-23 11:07:59 +0000 (Tue, 23 Jun 2009)
New Revision: 8567

Added:
   branches/solr/1.2.0+ds2/debian/solr-tomcat6.dirs
   branches/solr/1.2.0+ds2/debian/solr-tomcat6.links
   branches/solr/1.2.0+ds2/debian/solr-tomcat6.postinst
   branches/solr/1.2.0+ds2/debian/solr-tomcat6.postrm
   branches/solr/1.2.0+ds2/debian/solr-tomcat6.xml
Removed:
   branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.dirs
   branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.links
   branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.postinst
   branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.postrm
   branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.xml
Modified:
   branches/solr/1.2.0+ds2/debian/README.Debian
   branches/solr/1.2.0+ds2/debian/changelog
   branches/solr/1.2.0+ds2/debian/compat
   branches/solr/1.2.0+ds2/debian/control
   branches/solr/1.2.0+ds2/debian/rules
   branches/solr/1.2.0+ds2/debian/tomcat.policy
Log:
Updated dependency from tomcat5.5 to tomcat6; cleanup solr-tomcat6.postinst to make it work with tomcat6

Modified: branches/solr/1.2.0+ds2/debian/README.Debian
===================================================================
--- branches/solr/1.2.0+ds2/debian/README.Debian	2009-06-23 10:20:24 UTC (rev 8566)
+++ branches/solr/1.2.0+ds2/debian/README.Debian	2009-06-23 11:07:59 UTC (rev 8567)
@@ -4,8 +4,8 @@
 Solr is an enterprise search server based on the Lucene Java library. The
 Debian packaging of Solr consists of two binary packages:
 - solr-common contains the Solr software itself and general configuration.
-- solr-tomcat5.5 installs Solr as a servlet in Tomcat 5.5. After installation,
-  point your browser to http://localhost:8180/solr/admin
+- solr-tomcat6 installs Solr as a servlet in Tomcat 6. After installation,
+  point your browser to http://localhost:8080/solr/admin
   to see the Solr web administration interface.
 
 Homepage: http://lucene.apache.org/solr/

Modified: branches/solr/1.2.0+ds2/debian/changelog
===================================================================
--- branches/solr/1.2.0+ds2/debian/changelog	2009-06-23 10:20:24 UTC (rev 8566)
+++ branches/solr/1.2.0+ds2/debian/changelog	2009-06-23 11:07:59 UTC (rev 8567)
@@ -1,3 +1,22 @@
+solr (1.2.0+ds2-6) unstable; urgency=low
+
+  * Update dependency from tomcat5.5 to tomcat6 Closes: #526259.
+  * Bump Standards-Version to 3.8.1 (no changes needed).
+  * Remove dpkg-statoverride stuff from solr-tomcat6.postinst. It's not needed
+    and does not work.
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Tue, 23 Jun 2009 12:58:33 +0200
+
+solr (1.2.0+ds2-5) unstable; urgency=low
+
+  * Use tomcat.policy symlink in original direction and have symlink 
+    set by maintainer scripts to prevent problems with solr upgrades. 
+    Closes: #516288.
+  * Have solr-tomcat5.5 depend on solr-common with the exact same version
+    to prevent later problems.
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Fri, 27 Feb 2009 22:47:55 +0100
+
 solr (1.2.0+ds2-4) unstable; urgency=low
 
   * Updated watch file

Modified: branches/solr/1.2.0+ds2/debian/compat
===================================================================
--- branches/solr/1.2.0+ds2/debian/compat	2009-06-23 10:20:24 UTC (rev 8566)
+++ branches/solr/1.2.0+ds2/debian/compat	2009-06-23 11:07:59 UTC (rev 8567)
@@ -1 +1 @@
-4
+5

Modified: branches/solr/1.2.0+ds2/debian/control
===================================================================
--- branches/solr/1.2.0+ds2/debian/control	2009-06-23 10:20:24 UTC (rev 8566)
+++ branches/solr/1.2.0+ds2/debian/control	2009-06-23 11:07:59 UTC (rev 8567)
@@ -18,7 +18,7 @@
  libservlet2.4-java (>= 5.0.30),
  liblucene2-java (>= 2.4.0),
  libxpp3-java (>= 1.1.3.4.0)
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 
 Package: solr-common
 Architecture: all
@@ -32,7 +32,7 @@
  libservlet2.4-java (>= 5.0.30),
  liblucene2-java (>= 2.4),
  libxpp3-java (>= 1.1.3.4.0)
-Recommends: solr-tomcat5.5 (>= ${binary:Version}) | solr-jetty (>= ${binary:Version})
+Recommends: solr-tomcat6 (>= ${binary:Version}) | solr-jetty (>= ${binary:Version})
 Description: enterprise search server based on Lucene - common files
  Solr is an open source enterprise search server based on the Lucene 
  Java search library, with XML/HTTP and JSON APIs, hit highlighting, 
@@ -40,13 +40,13 @@
  interface. It runs in a Java servlet container such as Tomcat.
  .
  This package provides the common files for Solr. Install
- solr-tomcat5.5 or solr-jetty to use Solr under Tomcat or Jetty.
+ solr-tomcat6 or solr-jetty to use Solr under Tomcat or Jetty.
 
-Package: solr-tomcat5.5
+Package: solr-tomcat6
 Architecture: all
 Depends: ${misc:Depends}, 
- solr-common (>= ${binary:Version}), tomcat5.5 (>= 5.5.20)
-Conflicts: solr-jetty
+ solr-common (= ${binary:Version}), tomcat6 (>= 6.0.18)
+Conflicts: solr-jetty, solr-tomcat5.5
 Description: enterprise search server based on Lucene - Tomcat integration
  Solr is an open source enterprise search server based on the Lucene 
  Java search library, with XML/HTTP and JSON APIs, hit highlighting, 

Modified: branches/solr/1.2.0+ds2/debian/rules
===================================================================
--- branches/solr/1.2.0+ds2/debian/rules	2009-06-23 10:20:24 UTC (rev 8566)
+++ branches/solr/1.2.0+ds2/debian/rules	2009-06-23 11:07:59 UTC (rev 8567)
@@ -16,7 +16,7 @@
 CHANGESFILE = ../solr_$(DEB_VERSION)_$(DEB_BUILD_ARCH).changes
 
 COMMON_INSTDIR=$(CURDIR)/debian/solr-common
-TOMCAT_INSTDIR=$(CURDIR)/debian/solr-tomcat5.5
+TOMCAT_INSTDIR=$(CURDIR)/debian/solr-tomcat6
 JETTY_INSTDIR=$(CURDIR)/debian/solr-jetty
 SHAREDIR=$(COMMON_INSTDIR)/usr/share/solr
 
@@ -67,10 +67,10 @@
 	rmdir --ignore-fail-on-non-empty $(COMMON_INSTDIR)/usr/share/doc/solr-common/docs/skin/scripts
 	rmdir --ignore-fail-on-non-empty $(COMMON_INSTDIR)/usr/share/doc/solr-common/docs/skin/translations
 
-install/solr-tomcat5.5::
-	# Configure tomcat (also see solr-tomcat5.5.links)
-	install --mode 0644 debian/solr-tomcat5.5.xml $(TOMCAT_INSTDIR)/etc/solr/
-	install --mode 0644 debian/tomcat.policy $(TOMCAT_INSTDIR)/etc/tomcat5.5/policy.d/05solr.policy
+install/solr-tomcat6::
+	# Configure tomcat (also see solr-tomcat6.links)
+	install --mode 0644 debian/solr-tomcat6.xml $(TOMCAT_INSTDIR)/etc/solr/
+	install --mode 0644 debian/tomcat.policy $(TOMCAT_INSTDIR)/etc/solr/
 
 #install/solr-jetty::
 #	# Configure Jetty
@@ -99,7 +99,7 @@
 	linda -i $(CHANGESFILE)
 	zgrep "^---" ../solr_$(DEB_VERSION).diff.gz | grep -v debian ; [ $$? != 0 ]
 	( dpkg --contents ../solr-common_$(DEB_VERSION)_all.deb ; \
-	  dpkg --contents ../solr-tomcat5.5_$(DEB_VERSION)_all.deb ; \
+	  dpkg --contents ../solr-tomcat6_$(DEB_VERSION)_all.deb ; \
 	) | less
 	  #dpkg --contents ../solr-jetty_$(DEB_VERSION)_all.deb ; \
 

Deleted: branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.dirs
===================================================================
--- branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.dirs	2009-06-23 10:20:24 UTC (rev 8566)
+++ branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.dirs	2009-06-23 11:07:59 UTC (rev 8567)
@@ -1,4 +0,0 @@
-/etc/solr
-/etc/tomcat5.5/policy.d 
-/var/lib/solr
-/var/lib/solr/data

Deleted: branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.links
===================================================================
--- branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.links	2009-06-23 10:20:24 UTC (rev 8566)
+++ branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.links	2009-06-23 11:07:59 UTC (rev 8567)
@@ -1,2 +0,0 @@
-/etc/solr/solr-tomcat5.5.xml /etc/tomcat5.5/Catalina/localhost/solr.xml
-/etc/tomcat5.5/policy.d/05solr.policy /etc/solr/tomcat.policy

Deleted: branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.postinst
===================================================================
--- branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.postinst	2009-06-23 10:20:24 UTC (rev 8566)
+++ branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.postinst	2009-06-23 11:07:59 UTC (rev 8567)
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-set -e
-# Not needed
-# . /usr/share/debconf/confmodule
-
-# If proper permissions for the stuff under /var/lib/solr haven't
-# been set, set them now
-
-case "$1" in
-    configure)
-
-	if ! dpkg-statoverride --quiet --list /var/lib/solr > /dev/null; then
-	    dpkg-statoverride --quiet --update --add tomcat55 root 0750 /var/lib/solr 
-	fi
-
-	if ! dpkg-statoverride --quiet --list /var/lib/solr/data > /dev/null ; then
-	    dpkg-statoverride --quiet --update --add tomcat55 root 0750 /var/lib/solr/data 
-	fi
-
-	if [ -d /var/lib/solr/data/index ]; then
-	    chown -R tomcat55:root /var/lib/solr/data
-	fi
-
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-
-esac
-
-invoke-rc.d --quiet tomcat5.5 restart || {
-    RESULT=$?
-    # Ignore if tomcat5.5 init script does not exist (yet)
-    if [ $RESULT != 100 ]; then
-	exit $RESULT
-    fi
-}
-
-#DEBHELPER#

Deleted: branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.postrm
===================================================================
--- branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.postrm	2009-06-23 10:20:24 UTC (rev 8566)
+++ branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.postrm	2009-06-23 11:07:59 UTC (rev 8567)
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-    remove)
-
-	# If permissions for the stuff under /var/lib/solr haven't
-	# been removed, remove them now
-	if [ -x /usr/sbin/dpkg-statoverride ]; then
-	    if dpkg-statoverride --quiet --list /var/lib/solr > /dev/null ; then
-		dpkg-statoverride --quiet --remove /var/lib/solr
-	    fi
-
-	    if dpkg-statoverride --quiet --list /var/lib/solr/data > /dev/null ; then
-		dpkg-statoverride --quiet --remove /var/lib/solr/data
-	    fi
-	fi
-
-	# Is there a way not to restart tomcat if it is due to be removed, too?
-	if [ -x /usr/sbin/invoke-rc.d ]; then
-	    invoke-rc.d tomcat5.5 restart || true
-	fi
-
-    ;;
-
-    upgrade|purge|failed-upgrade|abort-install|abort-upgrade|disappear)
-
-	# do nothing
-
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-
-esac
-
-#DEBHELPER#

Deleted: branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.xml
===================================================================
--- branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.xml	2009-06-23 10:20:24 UTC (rev 8566)
+++ branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.xml	2009-06-23 11:07:59 UTC (rev 8567)
@@ -1,11 +0,0 @@
-<!--
-    Context configuration file for the Solr Web App
--->
-
-<Context path="/solr" docBase="/usr/share/solr"
-   debug="0" privileged="true" allowLinking="true" crossContext="true">
-  <!-- make symlinks work in Tomcat 5 -->
-  <Resources className="org.apache.naming.resources.FileDirContext" allowLinking="true" />
-
-  <Environment name="solr/home" type="java.lang.String" value="/usr/share/solr" override="true" />
-</Context>

Copied: branches/solr/1.2.0+ds2/debian/solr-tomcat6.dirs (from rev 7996, branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.dirs)
===================================================================
--- branches/solr/1.2.0+ds2/debian/solr-tomcat6.dirs	                        (rev 0)
+++ branches/solr/1.2.0+ds2/debian/solr-tomcat6.dirs	2009-06-23 11:07:59 UTC (rev 8567)
@@ -0,0 +1,4 @@
+/etc/solr
+/etc/tomcat6/policy.d 
+/var/lib/solr
+/var/lib/solr/data


Property changes on: branches/solr/1.2.0+ds2/debian/solr-tomcat6.dirs
___________________________________________________________________
Added: svn:mergeinfo
   + 

Copied: branches/solr/1.2.0+ds2/debian/solr-tomcat6.links (from rev 7996, branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.links)
===================================================================
--- branches/solr/1.2.0+ds2/debian/solr-tomcat6.links	                        (rev 0)
+++ branches/solr/1.2.0+ds2/debian/solr-tomcat6.links	2009-06-23 11:07:59 UTC (rev 8567)
@@ -0,0 +1 @@
+/etc/solr/solr-tomcat6.xml /etc/tomcat6/Catalina/localhost/solr.xml


Property changes on: branches/solr/1.2.0+ds2/debian/solr-tomcat6.links
___________________________________________________________________
Added: svn:mergeinfo
   + 

Copied: branches/solr/1.2.0+ds2/debian/solr-tomcat6.postinst (from rev 7133, branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.postinst)
===================================================================
--- branches/solr/1.2.0+ds2/debian/solr-tomcat6.postinst	                        (rev 0)
+++ branches/solr/1.2.0+ds2/debian/solr-tomcat6.postinst	2009-06-23 11:07:59 UTC (rev 8567)
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+set -e
+# Not needed
+# . /usr/share/debconf/confmodule
+
+# If proper permissions for the stuff under /var/lib/solr haven't
+# been set, set them now
+
+case "$1" in
+    configure)
+
+        chown -R tomcat6:tomcat6 /var/lib/solr/data
+        chmod -R 775 /var/lib/solr/data
+
+        ln -sf /etc/solr/tomcat.policy /etc/tomcat6/policy.d/05solr.policy
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+
+esac
+
+invoke-rc.d --quiet tomcat6 restart || {
+    RESULT=$?
+    # Ignore if tomcat6 init script does not exist (yet)
+    if [ $RESULT != 100 ]; then
+	exit $RESULT
+    fi
+}
+
+#DEBHELPER#


Property changes on: branches/solr/1.2.0+ds2/debian/solr-tomcat6.postinst
___________________________________________________________________
Added: svn:mergeinfo
   + 

Copied: branches/solr/1.2.0+ds2/debian/solr-tomcat6.postrm (from rev 7133, branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.postrm)
===================================================================
--- branches/solr/1.2.0+ds2/debian/solr-tomcat6.postrm	                        (rev 0)
+++ branches/solr/1.2.0+ds2/debian/solr-tomcat6.postrm	2009-06-23 11:07:59 UTC (rev 8567)
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    remove)
+
+	# If permissions for the stuff under /var/lib/solr haven't
+	# been removed, remove them now
+	if [ -x /usr/sbin/dpkg-statoverride ]; then
+	    if dpkg-statoverride --quiet --list /var/lib/solr > /dev/null ; then
+		dpkg-statoverride --quiet --remove /var/lib/solr
+	    fi
+
+	    if dpkg-statoverride --quiet --list /var/lib/solr/data > /dev/null ; then
+		dpkg-statoverride --quiet --remove /var/lib/solr/data
+	    fi
+	fi
+
+        rm -f /etc/tomcat6/policy.d/05solr.policy
+
+	# Is there a way not to restart tomcat if it is due to be removed, too?
+	if [ -x /usr/sbin/invoke-rc.d ]; then
+	    invoke-rc.d tomcat6 restart || true
+	fi
+
+    ;;
+
+    upgrade|purge|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+	# do nothing
+
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+
+esac
+
+#DEBHELPER#


Property changes on: branches/solr/1.2.0+ds2/debian/solr-tomcat6.postrm
___________________________________________________________________
Added: svn:mergeinfo
   + 

Copied: branches/solr/1.2.0+ds2/debian/solr-tomcat6.xml (from rev 7133, branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.xml)
===================================================================
--- branches/solr/1.2.0+ds2/debian/solr-tomcat6.xml	                        (rev 0)
+++ branches/solr/1.2.0+ds2/debian/solr-tomcat6.xml	2009-06-23 11:07:59 UTC (rev 8567)
@@ -0,0 +1,11 @@
+<!--
+    Context configuration file for the Solr Web App
+-->
+
+<Context path="/solr" docBase="/usr/share/solr"
+   debug="0" privileged="true" allowLinking="true" crossContext="true">
+  <!-- make symlinks work in Tomcat 5 -->
+  <Resources className="org.apache.naming.resources.FileDirContext" allowLinking="true" />
+
+  <Environment name="solr/home" type="java.lang.String" value="/usr/share/solr" override="true" />
+</Context>


Property changes on: branches/solr/1.2.0+ds2/debian/solr-tomcat6.xml
___________________________________________________________________
Added: svn:mergeinfo
   + 

Modified: branches/solr/1.2.0+ds2/debian/tomcat.policy
===================================================================
--- branches/solr/1.2.0+ds2/debian/tomcat.policy	2009-06-23 10:20:24 UTC (rev 8566)
+++ branches/solr/1.2.0+ds2/debian/tomcat.policy	2009-06-23 11:07:59 UTC (rev 8567)
@@ -7,9 +7,9 @@
   permission java.util.PropertyPermission "org.apache.lucene.lockDir", "read,write";
   permission java.util.PropertyPermission "org.apache.lucene.store.FSDirectoryLockFactoryClass", "read";
   permission java.io.FilePermission "/usr/share/java/-", "read";
-  permission java.io.FilePermission "/var/log/tomcat5.5/-", "read,write";
-  permission java.io.FilePermission "/var/lib/tomcat5.5/webapps/solr/-", "read";
-  permission java.io.FilePermission "/var/lib/tomcat5.5/temp/-", "read,write";
+  permission java.io.FilePermission "/var/log/tomcat6/-", "read,write";
+  permission java.io.FilePermission "/var/lib/tomcat6/webapps/solr/-", "read";
+  permission java.io.FilePermission "/var/lib/tomcat6/temp/-", "read,write";
   permission java.io.FilePermission "/etc/solr/-", "read";
   permission java.io.FilePermission "/usr/share/solr/-", "read";
   permission java.io.FilePermission "/usr/share/solr", "read";

More information about the pkg-java-commits mailing list