[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 0d8ce3e4a5ee9c1a40d5ed02cacc68849cfe2302
Author: Tollef Fog Heen <tfheen at err.no>
Date:   Fri Feb 1 09:30:31 2013 +0100

    Stop installing chef-solr-installer again, not sure why that fix got dropped.

diff --git a/debian/changelog b/debian/changelog
index f0582b6..0c05b53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 chef-solr (10.12.0+dfsg-2) UNRELEASED; urgency=low
 
   * Fix path to WEB-INF directory.  Closes: #684374
+  * Stop installing chef-solr-installer again, not sure why that fix got
+    dropped.  Closes: #699519
 
  -- Tollef Fog Heen <tfheen at debian.org>  Fri, 01 Feb 2013 09:17:32 +0100
 
diff --git a/debian/rules b/debian/rules
index ac0040a..398e5c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,5 +20,4 @@ override_dh_auto_install:
 	cp -rf $(CURDIR)/debian/etc/chef/solr-jetty debian/chef-solr/etc/chef
 	dh_ruby --install
 	mv $(CURDIR)/debian/chef-solr/usr/bin/chef-solr $(CURDIR)/debian/chef-solr/usr/sbin
-
-
+	rm $(CURDIR)/debian/chef-solr/usr/bin/chef-solr-installer

-- 
chef-solr.git