Author: janpascal-guest Date: 2009-04-08 09:32:30 +0000 (Wed, 08 Apr 2009) New Revision: 8183
Added: branches/solr/1.2.0+ds1-3+lenny/ Modified: branches/solr/1.2.0+ds1-3+lenny/debian/changelog branches/solr/1.2.0+ds1-3+lenny/debian/rules branches/solr/1.2.0+ds1-3+lenny/debian/solr-tomcat5.5.links branches/solr/1.2.0+ds1-3+lenny/debian/solr-tomcat5.5.postinst branches/solr/1.2.0+ds1-3+lenny/debian/solr-tomcat5.5.postrm Log: Fix simultaneous installation of tomcat5.5 with solr-tomcat5.5 Property changes on: branches/solr/1.2.0+ds1-3+lenny ___________________________________________________________________ Added: svn:mergeinfo + Modified: branches/solr/1.2.0+ds1-3+lenny/debian/changelog =================================================================== --- tags/solr/1.2.0+ds1-3/debian/changelog 2008-09-11 09:10:57 UTC (rev 6998) +++ branches/solr/1.2.0+ds1-3+lenny/debian/changelog 2009-04-08 09:32:30 UTC (rev 8183) @@ -1,3 +1,10 @@ +solr (1.2.0+ds1-3+lenny1) stable; urgency=low + + * Fix simultaneous installation of tomcat5.5 with solr-tomcat5.5. + (backport from fix in testing/unstable, closes: #522992). + + -- Jan-Pascal van Best <[email protected]> Wed, 08 Apr 2009 10:57:00 +0200 + solr (1.2.0+ds1-3) unstable; urgency=low * Updated control file for new Vcs-* and Homepage fields Modified: branches/solr/1.2.0+ds1-3+lenny/debian/rules =================================================================== --- tags/solr/1.2.0+ds1-3/debian/rules 2008-09-11 09:10:57 UTC (rev 6998) +++ branches/solr/1.2.0+ds1-3+lenny/debian/rules 2009-04-08 09:32:30 UTC (rev 8183) @@ -59,9 +59,9 @@ rm -f $(COMMON_INSTDIR)/usr/share/solr/META-INF/LICENSE.txt install/solr-tomcat5.5:: - # Configure tomcat (also see solr-tomcat5.5.links) + # Configure tomcat (also see solr-tomcat5.5.links and solr-tomcat5.5.post{inst,rm}) install --mode 0644 debian/solr-tomcat5.5.xml $(TOMCAT_INSTDIR)/etc/solr/ - install --mode 0644 debian/tomcat.policy $(TOMCAT_INSTDIR)/etc/solr/tomcat.policy + install --mode 0644 debian/tomcat.policy $(TOMCAT_INSTDIR)/etc/solr/ #install/solr-jetty:: # # Configure Jetty Modified: branches/solr/1.2.0+ds1-3+lenny/debian/solr-tomcat5.5.links =================================================================== --- tags/solr/1.2.0+ds1-3/debian/solr-tomcat5.5.links 2008-09-11 09:10:57 UTC (rev 6998) +++ branches/solr/1.2.0+ds1-3+lenny/debian/solr-tomcat5.5.links 2009-04-08 09:32:30 UTC (rev 8183) @@ -1,2 +1 @@ /etc/solr/solr-tomcat5.5.xml /etc/tomcat5.5/Catalina/localhost/solr.xml -/etc/solr/tomcat.policy /etc/tomcat5.5/policy.d/05solr.policy Modified: branches/solr/1.2.0+ds1-3+lenny/debian/solr-tomcat5.5.postinst =================================================================== --- tags/solr/1.2.0+ds1-3/debian/solr-tomcat5.5.postinst 2008-09-11 09:10:57 UTC (rev 6998) +++ branches/solr/1.2.0+ds1-3+lenny/debian/solr-tomcat5.5.postinst 2009-04-08 09:32:30 UTC (rev 8183) @@ -22,6 +22,8 @@ chown -R tomcat55:root /var/lib/solr/data fi + ln -sf /etc/solr/tomcat.policy /etc/tomcat5.5/policy.d/05solr.policy + ;; abort-upgrade|abort-remove|abort-deconfigure) Modified: branches/solr/1.2.0+ds1-3+lenny/debian/solr-tomcat5.5.postrm =================================================================== --- tags/solr/1.2.0+ds1-3/debian/solr-tomcat5.5.postrm 2008-09-11 09:10:57 UTC (rev 6998) +++ branches/solr/1.2.0+ds1-3+lenny/debian/solr-tomcat5.5.postrm 2009-04-08 09:32:30 UTC (rev 8183) @@ -17,6 +17,8 @@ fi fi + rm -f /etc/tomcat5.5/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 tomcat5.5 restart || true _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
