From 83a57f656d7ed208e78a5645aff205cf0bb0b66d Mon Sep 17 00:00:00 2001
From: Victor Seva <vseva@sipwise.com>
Date: Tue, 1 Apr 2014 14:52:29 +0200
Subject: [PATCH] MT#6501 Add ngcp-templates-pro-hylafaxplus-iax to default pro
 install.

wrap-and-sorted
---
 debian/control | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/debian/control b/debian/control
index cd295ae..7a727ca 100644
--- a/debian/control
+++ b/debian/control
@@ -69,15 +69,15 @@ Depends: dstat,
          ifenslave,
          ifrename,
          iftop,
+         iotop,
          ipcalc,
          irqbalance,
          less,
          libtemplate-perl,
          lsof,
          mytop,
-         iotop,
-         ngcp-ossbss-clients-perl,
          ngcp-klish-config,
+         ngcp-ossbss-clients-perl,
          ngrep-sip,
          perl-doc,
          rsync,
@@ -105,15 +105,15 @@ Depends: dstat,
          ifenslave,
          ifrename,
          iftop,
+         iotop,
          ipcalc,
          irqbalance,
          less,
          libtemplate-perl,
          lsof,
          mytop,
-         iotop,
-         ngcp-ossbss-clients-perl,
          ngcp-klish-config,
+         ngcp-ossbss-clients-perl,
          ngrep-sip,
          perl-doc,
          rsync,
@@ -143,6 +143,8 @@ Depends: bsd-mailx | mailx,
          linux-headers-3.2.0-0.bpo.4-amd64 | linux-headers-3.2.0-4-amd64,
          linux-image-3.2.0-0.bpo.4-amd64 | linux-image-3.2.0-4-amd64,
          monit,
+         mysql-client,
+         mysql-server,
          ngcp-asterisk,
          ngcp-backup-tools,
          ngcp-cdr-exporter,
@@ -179,8 +181,6 @@ Depends: bsd-mailx | mailx,
          ngcp-www-csc,
          nginx-light,
          ntp,
-         mysql-client,
-         mysql-server,
          prosody-0.9,
          python,
          redis-server,
@@ -204,6 +204,8 @@ Depends: bsd-mailx | mailx,
          glusterfs-server,
          linux-headers-3.2.0-0.bpo.4-amd64 | linux-headers-3.2.0-4-amd64,
          linux-image-3.2.0-0.bpo.4-amd64 | linux-image-3.2.0-4-amd64,
+         mysql-client,
+         mysql-server,
          ngcp-asterisk,
          ngcp-backup-tools,
          ngcp-cdr-exporter,
@@ -241,8 +243,6 @@ Depends: bsd-mailx | mailx,
          nginx-light,
          ntp,
          pacemaker,
-         mysql-client,
-         mysql-server,
          prosody-0.9,
          python,
          redis-server,
@@ -260,6 +260,8 @@ Package: ngcp-services-ce
 Architecture: all
 Depends: bsd-mailx | mailx,
          bzip2,
+         mysql-client,
+         mysql-server,
          ngcp-asterisk,
          ngcp-cdr-exporter,
          ngcp-check-tools,
@@ -291,8 +293,6 @@ Depends: bsd-mailx | mailx,
          ngcp-www-csc,
          nginx-light,
          ntp,
-         mysql-client,
-         mysql-server,
          prosody-0.9,
          python,
          rsyslog,
@@ -312,6 +312,7 @@ Depends: ngcp-templates-pro-asterisk,
          ngcp-templates-pro-check-tools,
          ngcp-templates-pro-cleanup-tools,
          ngcp-templates-pro-heartbeat2,
+         ngcp-templates-pro-hylafaxplus-iax,
          ngcp-templates-pro-kamailio,
          ngcp-templates-pro-lsb,
          ngcp-templates-pro-mediaproxy-ng,
@@ -319,9 +320,11 @@ Depends: ngcp-templates-pro-asterisk,
          ngcp-templates-pro-monit,
          ngcp-templates-pro-monitoring-tools,
          ngcp-templates-pro-mysql,
+         ngcp-templates-pro-ngcp-panel,
          ngcp-templates-pro-nginx,
          ngcp-templates-pro-odbc,
          ngcp-templates-pro-ossbss,
+         ngcp-templates-pro-prosody,
          ngcp-templates-pro-pushd,
          ngcp-templates-pro-rate-o-mat,
          ngcp-templates-pro-redis,
@@ -331,8 +334,6 @@ Depends: ngcp-templates-pro-asterisk,
          ngcp-templates-pro-vmnotify,
          ngcp-templates-pro-voisniff-ng,
          ngcp-templates-pro-www-csc,
-         ngcp-templates-pro-ngcp-panel,
-         ngcp-templates-pro-prosody,
          ${misc:Depends},
          ${shlibs:Depends}
 Conflicts: ngcp-templates-ce
@@ -352,17 +353,17 @@ Depends: ngcp-templates-ce-asterisk,
          ngcp-templates-ce-mediaproxy-ng,
          ngcp-templates-ce-mediator,
          ngcp-templates-ce-mysql,
+         ngcp-templates-ce-ngcp-panel,
          ngcp-templates-ce-nginx,
          ngcp-templates-ce-odbc,
          ngcp-templates-ce-ossbss,
+         ngcp-templates-ce-prosody,
          ngcp-templates-ce-rate-o-mat,
          ngcp-templates-ce-reminder,
          ngcp-templates-ce-sems,
          ngcp-templates-ce-system,
          ngcp-templates-ce-vmnotify,
          ngcp-templates-ce-www-csc,
-         ngcp-templates-ce-ngcp-panel,
-         ngcp-templates-ce-prosody,
          ${misc:Depends},
          ${shlibs:Depends}
 Conflicts: ngcp-templates-pro