Now using "service X restart" to restart services in logrotate script, and stop using...

Rewritten-From: 68711fc48a665b0840a79cd0d479fe75cdd8d99f

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index b540b0efa02a71d80503843351cb8438e74c67ab..59d23def7c607375cc0a0d90632f80f97620f7e4 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/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/trusty/debian/heat-api-cfn.logrotate b/trusty/debian/heat-api-cfn.logrotate
index 9e797577a99a1a825015269334bfc1a873e3bc82..67b8303a7a7ad13b51be0afb6135d796844764f1 100644 (file)
--- a/trusty/debian/heat-api-cfn.logrotate
+++ b/trusty/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/trusty/debian/heat-api-cloudwatch.logrotate b/trusty/debian/heat-api-cloudwatch.logrotate
index 98f85891b859ec0a7cf7a297afd39ddd4f2b879d..942b2fae95439f724710111664e34b720eba7463 100644 (file)
--- a/trusty/debian/heat-api-cloudwatch.logrotate
+++ b/trusty/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/trusty/debian/heat-api.logrotate b/trusty/debian/heat-api.logrotate
index 60a661e397206b1cdbaf85ef9cf792b77f0502f6..be1d307fb7938b2147159912b5849babe8e98117 100644 (file)
--- a/trusty/debian/heat-api.logrotate
+++ b/trusty/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/trusty/debian/heat-engine.logrotate b/trusty/debian/heat-engine.logrotate
index ee0c32c0973d6a7da5955e728da381f9f877cfa9..93d54128b9bf5044db636d40b11c09983c624968 100644 (file)
--- a/trusty/debian/heat-engine.logrotate
+++ b/trusty/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
 }