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

[Jan-Pascal van Best]

Author: janpascal-guest
Date: 2009-06-23 13:30:10 +0000 (Tue, 23 Jun 2009)
New Revision: 8568

Modified:
   branches/solr/1.2.0+ds2/debian/control
   branches/solr/1.2.0+ds2/debian/solr-tomcat6.postinst
Log:
Make solr-tomcat6 replace solr-tomcat5.5

Modified: branches/solr/1.2.0+ds2/debian/control
===================================================================
--- branches/solr/1.2.0+ds2/debian/control	2009-06-23 11:07:59 UTC (rev 8567)
+++ branches/solr/1.2.0+ds2/debian/control	2009-06-23 13:30:10 UTC (rev 8568)
@@ -47,6 +47,7 @@
 Depends: ${misc:Depends}, 
  solr-common (= ${binary:Version}), tomcat6 (>= 6.0.18)
 Conflicts: solr-jetty, solr-tomcat5.5
+Replaces: 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/solr-tomcat6.postinst
===================================================================
--- branches/solr/1.2.0+ds2/debian/solr-tomcat6.postinst	2009-06-23 11:07:59 UTC (rev 8567)
+++ branches/solr/1.2.0+ds2/debian/solr-tomcat6.postinst	2009-06-23 13:30:10 UTC (rev 8568)
@@ -10,8 +10,12 @@
 case "$1" in
     configure)
 
+        # fixup for upgrade from solr-tomcat55, wich makes this tomcat55:root 750
+        chown root:root /var/lib/solr
+        chmod 755 /var/lib/solr
+
         chown -R tomcat6:tomcat6 /var/lib/solr/data
-        chmod -R 775 /var/lib/solr/data
+        chmod -R 770 /var/lib/solr/data
 
         ln -sf /etc/solr/tomcat.policy /etc/tomcat6/policy.d/05solr.policy