From 9420a2ffc50f5eddd113f2e4b43da35076497ff2 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Mon, 11 Dec 2017 09:25:21 +0100 Subject: [PATCH] pkg/kamailio/deb: integrate xenial libgeocoding change [skip ci] in backports/xenial script * add wrap-and-sort on all scripts --- pkg/kamailio/deb/debian/backports/buster | 2 ++ pkg/kamailio/deb/debian/backports/jessie | 2 ++ pkg/kamailio/deb/debian/backports/precise | 2 ++ pkg/kamailio/deb/debian/backports/sid | 2 ++ pkg/kamailio/deb/debian/backports/stretch | 2 ++ pkg/kamailio/deb/debian/backports/trusty | 2 ++ pkg/kamailio/deb/debian/backports/wheezy | 2 ++ pkg/kamailio/deb/debian/backports/xenial | 6 ++++++ pkg/kamailio/deb/jessie/control | 6 +++--- pkg/kamailio/deb/precise/control | 4 ++-- pkg/kamailio/deb/trusty/control | 6 +++--- pkg/kamailio/deb/wheezy/control | 4 ++-- pkg/kamailio/deb/xenial/control | 4 ++-- 13 files changed, 32 insertions(+), 12 deletions(-) diff --git a/pkg/kamailio/deb/debian/backports/buster b/pkg/kamailio/deb/debian/backports/buster index 9fc54a9e404..33a34bc787d 100755 --- a/pkg/kamailio/deb/debian/backports/buster +++ b/pkg/kamailio/deb/debian/backports/buster @@ -18,6 +18,8 @@ sed -i -e '/libval-dev/d' -e '/^Package: kamailio-dnssec-modules/,/^$/d' \ sed -i -e 's/ dnssec[ ,$]*/ /' ${DIST}/rules sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ dnssec/' ${DIST}/rules +wrap-and-sort -sat -d ${DIST} + # clean backports scripts rm -rf ${DIST}/backports exit 0 diff --git a/pkg/kamailio/deb/debian/backports/jessie b/pkg/kamailio/deb/debian/backports/jessie index 44d4d9aa8b6..a48f7f7b633 100755 --- a/pkg/kamailio/deb/debian/backports/jessie +++ b/pkg/kamailio/deb/debian/backports/jessie @@ -39,6 +39,8 @@ sed -i -e '/libphonenumber-dev/d' -e '/^Package: kamailio-phonenum-modules/,/^$/ sed -i -e 's/ phonenum[ ,$]*/ /' ${DIST}/rules sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ phonenum/' ${DIST}/rules +wrap-and-sort -sat -d ${DIST} + # clean backports scripts rm -rf ${DIST}/backports exit 0 diff --git a/pkg/kamailio/deb/debian/backports/precise b/pkg/kamailio/deb/debian/backports/precise index 844fac8671f..41dd06ea66b 100755 --- a/pkg/kamailio/deb/debian/backports/precise +++ b/pkg/kamailio/deb/debian/backports/precise @@ -76,6 +76,8 @@ sed -i -e '/libphonenumber-dev/d' -e '/^Package: kamailio-phonenum-modules/,/^$/ sed -i -e 's/ phonenum[ ,$]*/ /' ${DIST}/rules sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ phonenum/' ${DIST}/rules +wrap-and-sort -sat -d ${DIST} + # clean backports scripts rm -rf ${DIST}/backports exit 0 diff --git a/pkg/kamailio/deb/debian/backports/sid b/pkg/kamailio/deb/debian/backports/sid index e642c049e06..0197f1d3fda 100755 --- a/pkg/kamailio/deb/debian/backports/sid +++ b/pkg/kamailio/deb/debian/backports/sid @@ -18,6 +18,8 @@ sed -i -e '/libval-dev/d' -e '/^Package: kamailio-dnssec-modules/,/^$/d' \ sed -i -e 's/ dnssec[ ,$]*/ /' ${DIST}/rules sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ dnssec/' ${DIST}/rules +wrap-and-sort -sat -d ${DIST} + # clean backports scripts rm -rf ${DIST}/backports exit 0 diff --git a/pkg/kamailio/deb/debian/backports/stretch b/pkg/kamailio/deb/debian/backports/stretch index 285eb85633f..1dfa6b85bcd 100755 --- a/pkg/kamailio/deb/debian/backports/stretch +++ b/pkg/kamailio/deb/debian/backports/stretch @@ -18,6 +18,8 @@ sed -i -e '/libval-dev/d' -e '/^Package: kamailio-dnssec-modules/,/^$/d' \ sed -i -e 's/ dnssec[ ,$]*/ /' ${DIST}/rules sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ dnssec/' ${DIST}/rules +wrap-and-sort -sat -d ${DIST} + # clean backports scripts rm -rf ${DIST}/backports exit 0 diff --git a/pkg/kamailio/deb/debian/backports/trusty b/pkg/kamailio/deb/debian/backports/trusty index 2cb41882f23..85954f1428c 100755 --- a/pkg/kamailio/deb/debian/backports/trusty +++ b/pkg/kamailio/deb/debian/backports/trusty @@ -50,6 +50,8 @@ sed -i -e '/libphonenumber-dev/d' -e '/^Package: kamailio-phonenum-modules/,/^$/ sed -i -e 's/ phonenum[ ,$]*/ /' ${DIST}/rules sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ phonenum/' ${DIST}/rules +wrap-and-sort -sat -d ${DIST} + # clean backports scripts rm -rf ${DIST}/backports exit 0 diff --git a/pkg/kamailio/deb/debian/backports/wheezy b/pkg/kamailio/deb/debian/backports/wheezy index d7e1d064c0d..4c811f79b0e 100755 --- a/pkg/kamailio/deb/debian/backports/wheezy +++ b/pkg/kamailio/deb/debian/backports/wheezy @@ -76,6 +76,8 @@ sed -i -e '/libphonenumber-dev/d' -e '/^Package: kamailio-phonenum-modules/,/^$/ sed -i -e 's/ phonenum[ ,$]*/ /' ${DIST}/rules sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ phonenum/' ${DIST}/rules +wrap-and-sort -sat -d ${DIST} + # clean backports scripts rm -rf ${DIST}/backports exit 0 diff --git a/pkg/kamailio/deb/debian/backports/xenial b/pkg/kamailio/deb/debian/backports/xenial index 11d12d471ae..ddca45a7677 100755 --- a/pkg/kamailio/deb/debian/backports/xenial +++ b/pkg/kamailio/deb/debian/backports/xenial @@ -20,6 +20,12 @@ echo "kamailio-mysql-modules: depends-on-obsolete-package depends: mysql-client # no libssl-dev sed -i -e '/libssl-dev/d' ${DIST}/control +# geocoding not in libphonenumber +sed -i 's/libphonenumber-dev/libgeocoding-dev \(>= 7\),\n libphonenumber-dev/' \ + ${DIST}/control + +wrap-and-sort -sat -d ${DIST} + # clean backports scripts rm -rf ${DIST}/backports exit 0 diff --git a/pkg/kamailio/deb/jessie/control b/pkg/kamailio/deb/jessie/control index 513c6679105..4b07d4f708b 100644 --- a/pkg/kamailio/deb/jessie/control +++ b/pkg/kamailio/deb/jessie/control @@ -8,7 +8,6 @@ Uploaders: Build-Depends: bison, debhelper (>= 9), - libmysqlclient-dev, dh-systemd (>= 1.5), docbook-xml, dpkg-dev (>= 1.16.1.1), @@ -21,6 +20,7 @@ Build-Depends: libev-dev, libevent-dev, libexpat1-dev, + libfreeradius-client-dev, libgeoip-dev (>= 1.4.5), libhiredis-dev (>= 0.10.0), libjansson-dev, @@ -29,12 +29,12 @@ Build-Depends: liblua5.1-0-dev, libmemcached-dev, libmono-2.0-dev, + libmysqlclient-dev, libncurses5-dev, libpcre3-dev, libperl-dev, libpq-dev, librabbitmq-dev, - libfreeradius-client-dev, libreadline-dev, libsasl2-dev, libsctp-dev, @@ -275,8 +275,8 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - mysql-client | virtual-mysql-client, kamailio (= ${binary:Version}), + mysql-client | virtual-mysql-client, ${misc:Depends}, ${shlibs:Depends}, Description: MySQL database connectivity module for Kamailio diff --git a/pkg/kamailio/deb/precise/control b/pkg/kamailio/deb/precise/control index 2c85da18f76..b2148500c14 100644 --- a/pkg/kamailio/deb/precise/control +++ b/pkg/kamailio/deb/precise/control @@ -8,7 +8,6 @@ Uploaders: Build-Depends: bison, debhelper (>= 9), - libmysqlclient-dev, docbook-xml, dpkg-dev (>= 1.16.1.1), erlang-dev, @@ -28,6 +27,7 @@ Build-Depends: liblua5.1-0-dev, libmemcached-dev, libmono-2.0-dev, + libmysqlclient-dev, libncurses5-dev, libpcre3-dev, libperl-dev, @@ -271,8 +271,8 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - mysql-client | virtual-mysql-client, kamailio (= ${binary:Version}), + mysql-client | virtual-mysql-client, ${misc:Depends}, ${shlibs:Depends}, Description: MySQL database connectivity module for Kamailio diff --git a/pkg/kamailio/deb/trusty/control b/pkg/kamailio/deb/trusty/control index 845d4eecd56..a4944d22c04 100644 --- a/pkg/kamailio/deb/trusty/control +++ b/pkg/kamailio/deb/trusty/control @@ -8,7 +8,6 @@ Uploaders: Build-Depends: bison, debhelper (>= 9), - libmysqlclient-dev, docbook-xml, dpkg-dev (>= 1.16.1.1), erlang-dev, @@ -20,6 +19,7 @@ Build-Depends: libev-dev, libevent-dev, libexpat1-dev, + libfreeradius-client-dev, libgeoip-dev (>= 1.4.5), libhiredis-dev (>= 0.10.0), libjansson-dev, @@ -28,12 +28,12 @@ Build-Depends: liblua5.1-0-dev, libmemcached-dev, libmono-2.0-dev, + libmysqlclient-dev, libncurses5-dev, libpcre3-dev, libperl-dev, libpq-dev, librabbitmq-dev, - libfreeradius-client-dev, libreadline-dev, libsasl2-dev, libsctp-dev, @@ -273,8 +273,8 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - mysql-client | virtual-mysql-client, kamailio (= ${binary:Version}), + mysql-client | virtual-mysql-client, ${misc:Depends}, ${shlibs:Depends}, Description: MySQL database connectivity module for Kamailio diff --git a/pkg/kamailio/deb/wheezy/control b/pkg/kamailio/deb/wheezy/control index 2c85da18f76..b2148500c14 100644 --- a/pkg/kamailio/deb/wheezy/control +++ b/pkg/kamailio/deb/wheezy/control @@ -8,7 +8,6 @@ Uploaders: Build-Depends: bison, debhelper (>= 9), - libmysqlclient-dev, docbook-xml, dpkg-dev (>= 1.16.1.1), erlang-dev, @@ -28,6 +27,7 @@ Build-Depends: liblua5.1-0-dev, libmemcached-dev, libmono-2.0-dev, + libmysqlclient-dev, libncurses5-dev, libpcre3-dev, libperl-dev, @@ -271,8 +271,8 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - mysql-client | virtual-mysql-client, kamailio (= ${binary:Version}), + mysql-client | virtual-mysql-client, ${misc:Depends}, ${shlibs:Depends}, Description: MySQL database connectivity module for Kamailio diff --git a/pkg/kamailio/deb/xenial/control b/pkg/kamailio/deb/xenial/control index 6bd695724fb..e3372a3f705 100644 --- a/pkg/kamailio/deb/xenial/control +++ b/pkg/kamailio/deb/xenial/control @@ -8,7 +8,6 @@ Uploaders: Build-Depends: bison, debhelper (>= 9), - libmysqlclient-dev, dh-systemd (>= 1.5), docbook-xml, dpkg-dev (>= 1.16.1.1), @@ -31,6 +30,7 @@ Build-Depends: libmaxminddb-dev, libmemcached-dev, libmono-2.0-dev, + libmysqlclient-dev, libncurses5-dev, libpcre3-dev, libperl-dev, @@ -297,8 +297,8 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - mysql-client | virtual-mysql-client, kamailio (= ${binary:Version}), + mysql-client | virtual-mysql-client, ${misc:Depends}, ${shlibs:Depends}, Description: MySQL database connectivity module for Kamailio