From: Thomas Goirand <thomas@goirand.fr>
Date: Fri, 16 May 2014 17:51:17 +0000 (+0800)
Subject: Now using "service X restart" to restart services in logrotate script, and stop using... 
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1dffbcb14fef2f137e9dbddadf66a284507befb1;p=openstack-build%2Fheat-build.git

Now using "service X restart" to restart services in logrotate script, and stop using dpkg-dev (Closes: #747886).

Rewritten-From: 68711fc48a665b0840a79cd0d479fe75cdd8d99f
---

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index b540b0ef..59d23def 100644
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,3 +1,10 @@
+heat (2014.1-3) unstable; urgency=medium
+
+  * Now using "service X restart" to restart services in logrotate script, and
+    stop using dpkg-dev (Closes: #747886).
+
+ -- Thomas Goirand <zigo@debian.org>  Sat, 17 May 2014 01:50:30 +0800
+
 heat (2014.1-2) unstable; urgency=medium
 
   * Updated Italian debconf translation thanks to Beatrice Torracca
diff --git a/xenial/debian/heat-api-cfn.logrotate b/xenial/debian/heat-api-cfn.logrotate
index 9e797577..67b8303a 100644
--- a/xenial/debian/heat-api-cfn.logrotate
+++ b/xenial/debian/heat-api-cfn.logrotate
@@ -3,10 +3,6 @@
     missingok
     compress
     postrotate
-        if dpkg-vendor --derives-from ubuntu ; then
-            service heat-api-cfn restart >/dev/null 2>&1 || true
-        else
-            invoke-rc.d heat-api-cfn restart >/dev/null 2>&1 || true
-        fi
+        service heat-api-cfn restart >/dev/null 2>&1 || true
     endscript
 }
diff --git a/xenial/debian/heat-api-cloudwatch.logrotate b/xenial/debian/heat-api-cloudwatch.logrotate
index 98f85891..942b2fae 100644
--- a/xenial/debian/heat-api-cloudwatch.logrotate
+++ b/xenial/debian/heat-api-cloudwatch.logrotate
@@ -3,10 +3,6 @@
     missingok
     compress
     postrotate
-        if dpkg-vendor --derives-from ubuntu ; then
-            service heat-api-cloudwatch restart >/dev/null 2>&1 || true
-        else
-            invoke-rc.d heat-api-cloudwatch restart >/dev/null 2>&1 || true
-        fi
+        service heat-api-cloudwatch restart >/dev/null 2>&1 || true
     endscript
 }
diff --git a/xenial/debian/heat-api.logrotate b/xenial/debian/heat-api.logrotate
index 60a661e3..be1d307f 100644
--- a/xenial/debian/heat-api.logrotate
+++ b/xenial/debian/heat-api.logrotate
@@ -3,10 +3,6 @@
     missingok
     compress
     postrotate
-        if dpkg-vendor --derives-from ubuntu ; then
-            service heat-api restart >/dev/null 2>&1 || true
-        else
-            invoke-rc.d heat-api restart >/dev/null 2>&1 || true
-        fi
+        service heat-api restart >/dev/null 2>&1 || true
     endscript
 }
diff --git a/xenial/debian/heat-engine.logrotate b/xenial/debian/heat-engine.logrotate
index ee0c32c0..93d54128 100644
--- a/xenial/debian/heat-engine.logrotate
+++ b/xenial/debian/heat-engine.logrotate
@@ -3,10 +3,6 @@
     missingok
     compress
     postrotate
-        if dpkg-vendor --derives-from ubuntu ; then
-            service heat-engine restart >/dev/null 2>&1 || true
-        else
-            invoke-rc.d heat-engine restart >/dev/null 2>&1 || true
-        fi
+        service heat-engine restart >/dev/null 2>&1 || true
     endscript
 }