From d2eb4e759110c390affe5895bd2c7d5aacf7cd0f Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 6 Aug 2014 17:56:39 +0200 Subject: [PATCH] MT#7335 Accept Debian/jessie's heartbeat package as alternative to heartbeat-2 The heartbeat-2 package we use is based on version 2.1.3-7, dating back to 2008 in Debian. In Debian wheezy the heartbeat package has version 1:3.0.5-3, and in jessie it's currently sitting at 1:3.0.5+hg12629-1. We should investigate whether the heartbeat package from Debian/jessie might work for us, so accept it as an alternative to our heartbeat-2 package dependency-wise. We then can try building a ngcp system based on Debian/jessie and if the heartbeat 3.* package doesn't work for us we can still use our own package (and optionally also revert this commit). --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 3f67f7a..f3fb401 100644 --- a/debian/control +++ b/debian/control @@ -183,7 +183,7 @@ Depends: bsd-mailx | mailx, exim4, glusterfs-client, glusterfs-server, - heartbeat-2 (>= 2.1.3-7~sipwise2), + heartbeat-2 (>= 2.1.3-7~sipwise2) | heartbeat (>= 1:3.0.5+hg12629-1~), linux-headers-3.13-0.bpo.1-amd64, linux-image-3.13-0.bpo.1-amd64, monit,