[DRE-commits] [SCM] chef-solr.git branch, master, updated. debian/10.12.0+dfsg-1-5-g856328f

[Tollef Fog Heen]

The following commit has been merged in the master branch:
commit b9f4bc0d88143b2090e9239f02b3e3abd4ad36ed
Author: Tollef Fog Heen <tfheen at err.no>
Date:   Fri Feb 1 09:20:08 2013 +0100

    Fix path to WEB-INF directory.  Closes: #684374

diff --git a/debian/changelog b/debian/changelog
index 2725091..f0582b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+chef-solr (10.12.0+dfsg-2) UNRELEASED; urgency=low
+
+  * Fix path to WEB-INF directory.  Closes: #684374
+
+ -- Tollef Fog Heen <tfheen at debian.org>  Fri, 01 Feb 2013 09:17:32 +0100
+
 chef-solr (10.12.0+dfsg-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/chef-solr.links b/debian/chef-solr.links
index e381dae..c83a7e0 100644
--- a/debian/chef-solr.links
+++ b/debian/chef-solr.links
@@ -4,8 +4,8 @@
 /var/log/jetty/                 /var/lib/chef/solr/solr-jetty/logs
 /usr/share/jetty/start.jar      /var/lib/chef/solr/solr-jetty/start.jar
 /usr/share/jetty/webapps/root/  /var/lib/chef/solr/solr-jetty/webapps/root
-/usr/share/solr/admin           /var/lib/chef/solr/solr-jetty/webapps/solr/admin
+/usr/share/solr/web/admin       /var/lib/chef/solr/solr-jetty/webapps/solr/admin
 /etc/solr/conf                  /var/lib/chef/solr/solr-jetty/webapps/solr/conf
 /usr/share/solr/scripts         /var/lib/chef/solr/solr-jetty/webapps/solr/scripts
-/usr/share/solr/WEB-INF/lib/    /var/lib/chef/solr/solr-jetty/webapps/solr/WEB-INF/lib
+/usr/share/solr/web/WEB-INF/lib/ /var/lib/chef/solr/solr-jetty/webapps/solr/WEB-INF/lib
 /etc/solr/web.xml               /var/lib/chef/solr/solr-jetty/webapps/solr/WEB-INF/web.xml

-- 
chef-solr.git