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

[janpascal-guest at alioth.debian.org]

Author: janpascal-guest
Date: 2009-02-19 20:09:59 +0000 (Thu, 19 Feb 2009)
New Revision: 7996

Modified:
   branches/solr/1.2.0+ds2/debian/changelog
   branches/solr/1.2.0+ds2/debian/rules
   branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.dirs
   branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.links
Log:
Moved /etc/solr/tomcat.policy to /etc/tomcat5.5/policy.d/ and reversed symlink.
Fix solr-tomcat5.5.dirs: change /etc/tomcat5/policy.d to /etc/tomcat5.5/policy.d



Modified: branches/solr/1.2.0+ds2/debian/changelog
===================================================================
--- branches/solr/1.2.0+ds2/debian/changelog	2009-02-18 23:26:41 UTC (rev 7995)
+++ branches/solr/1.2.0+ds2/debian/changelog	2009-02-19 20:09:59 UTC (rev 7996)
@@ -4,8 +4,11 @@
   * Add ${misc:Depends} to debian/control to take into account indirect
     dependencies from debhelper
   * Added depenency on libxpp3-java (typo in control file, closes: #483261).
+  * Moved /etc/solr/tomcat.policy to /etc/tomcat5.5/policy.d/ and reversed
+    symlink. Closes: #515945.
+  * Remove /etc/tomcat5/policy.d from solr-tomcat5.5.
 
- -- Jan-Pascal van Best <janpascal at vanbest.org>  Wed, 18 Feb 2009 16:37:28 +0100
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Thu, 19 Feb 2009 20:48:07 +0100
 
 solr (1.2.0+ds2-3) unstable; urgency=low
 

Modified: branches/solr/1.2.0+ds2/debian/rules
===================================================================
--- branches/solr/1.2.0+ds2/debian/rules	2009-02-18 23:26:41 UTC (rev 7995)
+++ branches/solr/1.2.0+ds2/debian/rules	2009-02-19 20:09:59 UTC (rev 7996)
@@ -70,7 +70,7 @@
 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/solr/tomcat.policy
+	install --mode 0644 debian/tomcat.policy $(TOMCAT_INSTDIR)/etc/tomcat5.5/policy.d/05solr.policy
 
 #install/solr-jetty::
 #	# Configure Jetty

Modified: branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.dirs
===================================================================
--- branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.dirs	2009-02-18 23:26:41 UTC (rev 7995)
+++ branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.dirs	2009-02-19 20:09:59 UTC (rev 7996)
@@ -1,4 +1,4 @@
 /etc/solr
-/etc/tomcat5/policy.d 
+/etc/tomcat5.5/policy.d 
 /var/lib/solr
 /var/lib/solr/data

Modified: branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.links
===================================================================
--- branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.links	2009-02-18 23:26:41 UTC (rev 7995)
+++ branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.links	2009-02-19 20:09:59 UTC (rev 7996)
@@ -1,2 +1,2 @@
 /etc/solr/solr-tomcat5.5.xml /etc/tomcat5.5/Catalina/localhost/solr.xml
-/etc/solr/tomcat.policy /etc/tomcat5.5/policy.d/05solr.policy
+/etc/tomcat5.5/policy.d/05solr.policy /etc/solr/tomcat.policy