Dear release team, I'd like to propose an update to the solr package in Lenny to fix bug#522992. It's an installability bug, which causes # apt-get install solr-tomcat5.5 to fail for a new installation of solr-tomcat5.5 if tomcat5.5 isn't installed before. Please find attached a diff against the version currently in Lenny (1.2.0+ds1-3). Kind regards, Jan-Pascal -- Jan-Pascal van Best janpascal@vanbest.org, janpascal@vanbest.eu http://www.vanbest.org/janpascal/ GPG key fingerprint 4617 E5FB C56D ACB6 7C8C DE64 3A4C B270 1A89 CC23
Index: debian/solr-tomcat5.5.links
===================================================================
--- debian/solr-tomcat5.5.links (.../tags/solr/1.2.0+ds1-3) (revision 6280)
+++ debian/solr-tomcat5.5.links (.../branches/solr/1.2.0+ds1-3+lenny) (working copy)
@@ -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
Index: debian/solr-tomcat5.5.postrm
===================================================================
--- debian/solr-tomcat5.5.postrm (.../tags/solr/1.2.0+ds1-3) (revision 6280)
+++ debian/solr-tomcat5.5.postrm (.../branches/solr/1.2.0+ds1-3+lenny) (working copy)
@@ -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
Index: debian/changelog
===================================================================
--- debian/changelog (.../tags/solr/1.2.0+ds1-3) (revision 6280)
+++ debian/changelog (.../branches/solr/1.2.0+ds1-3+lenny) (working copy)
@@ -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 <janpascal@vanbest.org> 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
Index: debian/rules
===================================================================
--- debian/rules (.../tags/solr/1.2.0+ds1-3) (revision 6280)
+++ debian/rules (.../branches/solr/1.2.0+ds1-3+lenny) (working copy)
@@ -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
Index: debian/solr-tomcat5.5.postinst
===================================================================
--- debian/solr-tomcat5.5.postinst (.../tags/solr/1.2.0+ds1-3) (revision 6280)
+++ debian/solr-tomcat5.5.postinst (.../branches/solr/1.2.0+ds1-3+lenny) (working copy)
@@ -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)
Property changes on: .
___________________________________________________________________
Added: svn:mergeinfo
Attachment:
signature.asc
Description: OpenPGP digital signature