From 44a059dbeb891f9c19506a6aa6ace0fa4d094bd6 Mon Sep 17 00:00:00 2001
From: Guillem Jover <gjover@sipwise.com>
Date: Wed, 23 Dec 2015 20:27:26 +0100
Subject: [PATCH] MT#17117 Switch from transitional/dummy iproute to iproute2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The former is an obsolete transitional/dummy package, let's switch to
the latter package before the former disappears.

Run «wrap-and-sort -a -t -s» on debian/control.

Change-Id: Ie6b6a94f378d5df2015869569de256c4fce03a0d
---
 debian/control | 113 ++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 98 insertions(+), 15 deletions(-)

diff --git a/debian/control b/debian/control
index 0401f98..c7c8e61 100644
--- a/debian/control
+++ b/debian/control
@@ -2,16 +2,66 @@ Source: heartbeat-2
 Section: admin
 Priority: optional
 Maintainer: Sipwise Development Team <support@sipwise.com>
-Build-Depends: debhelper (>= 5.0.37.2), libsnmp-dev, libglib2.0-dev, perl, net-tools, iputils-ping, python (>=2.6.6-3~), psmisc, libnet1-dev, iproute, libtool, libcurl4-openssl-dev | libcurl3-openssl-dev, libxml2-dev, bison, flex, uuid-dev, lynx, libbz2-dev, zlib1g-dev, uuid-dev, libsensors4-dev, libltdl3-dev, swig, openssh-client, libgnutls28-dev | libgnutls-dev, dh-python, python-dev, libpam0g-dev, libncurses5-dev, psmisc, libopenhpi-dev, quilt
+Build-Depends:
+ bison,
+ debhelper (>= 5.0.37.2),
+ dh-python,
+ flex,
+ iproute2,
+ iputils-ping,
+ libbz2-dev,
+ libcurl4-openssl-dev | libcurl3-openssl-dev,
+ libglib2.0-dev,
+ libgnutls28-dev | libgnutls-dev,
+ libltdl3-dev,
+ libncurses5-dev,
+ libnet1-dev,
+ libopenhpi-dev,
+ libpam0g-dev,
+ libsensors4-dev,
+ libsnmp-dev,
+ libtool,
+ libxml2-dev,
+ lynx,
+ net-tools,
+ openssh-client,
+ perl,
+ psmisc,
+ python (>=2.6.6-3~),
+ python-dev,
+ quilt,
+ swig,
+ uuid-dev,
+ zlib1g-dev,
 Standards-Version: 3.9.6
 
 Package: ldirectord-2
 Section: admin
 Priority: extra
 Architecture: all
-Depends: ${perl:Depends}, ipvsadm, libauthen-radius-perl, libcrypt-ssleay-perl, libdbi-perl, libdigest-hmac-perl, libdigest-md5-perl, libmail-pop3client-perl, libmailtools-perl, libnet-dns-perl, libnet-imap-simple-perl, libnet-imap-simple-ssl-perl, libnet-ldap-perl, libnet-perl, libwww-perl
-Recommends: rsyslog | system-log-daemon, logrotate
-Conflicts: libpils0 (<< 2.0.8-3), libstonith0 (<< 2.0.8-3), stonith (<< 2.0.8-3)
+Depends:
+ ipvsadm,
+ libauthen-radius-perl,
+ libcrypt-ssleay-perl,
+ libdbi-perl,
+ libdigest-hmac-perl,
+ libdigest-md5-perl,
+ libmail-pop3client-perl,
+ libmailtools-perl,
+ libnet-dns-perl,
+ libnet-imap-simple-perl,
+ libnet-imap-simple-ssl-perl,
+ libnet-ldap-perl,
+ libnet-perl,
+ libwww-perl,
+ ${perl:Depends},
+Recommends:
+ logrotate,
+ rsyslog | system-log-daemon,
+Conflicts:
+ libpils0 (<< 2.0.8-3),
+ libstonith0 (<< 2.0.8-3),
+ stonith (<< 2.0.8-3),
 Description: Monitors virtual services provided by LVS
  ldirectord is a stand-alone daemon to monitor services of real
  for virtual services provided by The Linux Virtual Server (LVS).
@@ -21,11 +71,32 @@ Package: heartbeat-2
 Section: admin
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, iproute, adduser, iputils-ping, psmisc, gawk, mawk, libxml2-utils, libpam-runtime (>= 0.76-14)
-Recommends: rsyslog | system-log-daemon, logrotate, iptables
-Provides: libstonith0, libpils0
-Conflicts: libstonith0, libpils0, heartbeat, cluster-agents
-Replaces: libstonith0, libpils0
+Depends:
+ adduser,
+ gawk,
+ iproute2,
+ iputils-ping,
+ libpam-runtime (>= 0.76-14),
+ libxml2-utils,
+ mawk,
+ psmisc,
+ ${python:Depends},
+ ${shlibs:Depends},
+Recommends:
+ iptables,
+ logrotate,
+ rsyslog | system-log-daemon,
+Provides:
+ libpils0,
+ libstonith0,
+Conflicts:
+ cluster-agents,
+ heartbeat,
+ libpils0,
+ libstonith0,
+Replaces:
+ libpils0,
+ libstonith0,
 Description: Subsystem for High-Availability Linux
  heartbeat is a basic heartbeat subsystem for Linux-HA which implements
  serial, UDP, and PPP/UDP heartbeats together with IP address takeover
@@ -39,10 +110,17 @@ Package: heartbeat-2-dev
 Section: devel
 Priority: optional
 Architecture: any
-Depends: heartbeat-2 (= ${binary:Version})
-Provides: libstonith-dev, libpils-dev
-Conflicts: libstonith-dev, libpils-dev
-Replaces: libstonith-dev, libpils-dev
+Depends:
+ heartbeat-2 (= ${binary:Version}),
+Provides:
+ libpils-dev,
+ libstonith-dev,
+Conflicts:
+ libpils-dev,
+ libstonith-dev,
+Replaces:
+ libpils-dev,
+ libstonith-dev,
 Description: Subsystem for High-Availability Linux - development files
  heartbeat is a basic heartbeat subsystem for Linux-HA which implements
  serial, UDP, and PPP/UDP heartbeats together with IP address takeover
@@ -58,7 +136,12 @@ Package: heartbeat-2-gui
 Section: admin
 Priority: optional
 Architecture: any
-Depends: ${python:Depends}, python-gtk2, python-glade2, uuid-runtime
-Suggests: heartbeat-2 (= ${binary:Version})
+Depends:
+ python-glade2,
+ python-gtk2,
+ uuid-runtime,
+ ${python:Depends},
+Suggests:
+ heartbeat-2 (= ${binary:Version}),
 Description: Provides a gui interface to manage heartbeat clusters
  GUI client for heartbeat clusters