From 5c8419eb3a1e26de77b714f53c5a2cf0e24cc76a Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Mon, 30 Jan 2017 16:16:12 +0100 Subject: [PATCH] pkg/kamailio/deb: use default-libmysqlclient-dev/default-mysql-client (cherry picked from commit d81a8fcbc6183b5474d2d9315ad72fa342c30cf1) --- pkg/kamailio/deb/debian/backports/jessie | 4 ++++ pkg/kamailio/deb/debian/backports/precise | 4 ++++ pkg/kamailio/deb/debian/backports/squeeze | 5 +++++ pkg/kamailio/deb/debian/backports/trusty | 4 ++++ pkg/kamailio/deb/debian/backports/wheezy | 4 ++++ pkg/kamailio/deb/debian/backports/xenial | 4 ++++ pkg/kamailio/deb/debian/control | 4 ++-- pkg/kamailio/deb/sid/control | 4 ++-- pkg/kamailio/deb/stretch/control | 4 ++-- 9 files changed, 31 insertions(+), 6 deletions(-) diff --git a/pkg/kamailio/deb/debian/backports/jessie b/pkg/kamailio/deb/debian/backports/jessie index cba77a58245..c049223ebe5 100755 --- a/pkg/kamailio/deb/debian/backports/jessie +++ b/pkg/kamailio/deb/debian/backports/jessie @@ -18,6 +18,10 @@ sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ mi_xmlrpc/' ${DIST}/rules sed -i 's/libradcli-dev/libfreeradius-client-dev/' ${DIST}/control sed -i -e 's/RADCLI/FREERADIUS/' ${DIST}/rules +# old mysql +sed -i -e 's/default-mysql-client/mysql-client/' \ + -e 's/default-libmysqlclient-dev/libmysqlclient-dev/' ${DIST}/control + # 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 8743d589dad..b26a3cc5b5a 100755 --- a/pkg/kamailio/deb/debian/backports/precise +++ b/pkg/kamailio/deb/debian/backports/precise @@ -43,6 +43,10 @@ sed -i -e '/^Package: kamailio-cnxcc-modules/,/^$/d' ${DIST}/control sed -i -e 's/ cnxcc[ ,$]*/ /' ${DIST}/rules sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ cnxcc/' ${DIST}/rules +# old mysql +sed -i -e 's/default-mysql-client/mysql-client/' \ + -e 's/default-libmysqlclient-dev/libmysqlclient-dev/' ${DIST}/control + # clean backports scripts rm -rf ${DIST}/backports exit 0 diff --git a/pkg/kamailio/deb/debian/backports/squeeze b/pkg/kamailio/deb/debian/backports/squeeze index 13542817d12..128ca00b90e 100755 --- a/pkg/kamailio/deb/debian/backports/squeeze +++ b/pkg/kamailio/deb/debian/backports/squeeze @@ -95,6 +95,11 @@ sed -i -e 's/ jansson[ ,$]*/ /' ${DIST}/rules sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ jansson/' ${DIST}/rules sed -i -e 's/ jansson[ ,$]*//' ${DIST}/control sed -i -e 's/janssonrpc-c//' ${DIST}/control + +# old mysql +sed -i -e 's/default-mysql-client/mysql-client/' \ + -e 's/default-libmysqlclient-dev/libmysqlclient-dev/' ${DIST}/control + # 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 6c05bc19ecf..1da2e097840 100755 --- a/pkg/kamailio/deb/debian/backports/trusty +++ b/pkg/kamailio/deb/debian/backports/trusty @@ -23,6 +23,10 @@ sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ mi_xmlrpc/' ${DIST}/rules sed -i 's/libradcli-dev/libfreeradius-client-dev/' ${DIST}/control sed -i -e 's/RADCLI/FREERADIUS/' ${DIST}/rules +# old mysql +sed -i -e 's/default-mysql-client/mysql-client/' \ + -e 's/default-libmysqlclient-dev/libmysqlclient-dev/' ${DIST}/control + # 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 c09abd5caf0..6846cd4ac8e 100755 --- a/pkg/kamailio/deb/debian/backports/wheezy +++ b/pkg/kamailio/deb/debian/backports/wheezy @@ -49,6 +49,10 @@ sed -i -e '/^Package: kamailio-cnxcc-modules/,/^$/d' ${DIST}/control sed -i -e 's/ cnxcc[ ,$]*/ /' ${DIST}/rules sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ cnxcc/' ${DIST}/rules +# old mysql +sed -i -e 's/default-mysql-client/mysql-client/' \ + -e 's/default-libmysqlclient-dev/libmysqlclient-dev/' ${DIST}/control + # 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 df824b089ab..fc085eed09d 100755 --- a/pkg/kamailio/deb/debian/backports/xenial +++ b/pkg/kamailio/deb/debian/backports/xenial @@ -11,6 +11,10 @@ cp -r debian ${DIST} # mi_xmlrpc module sed -i 's/libxmlrpc-c3-dev/libxmlrpc-core-c3-dev/' ${DIST}/control +# old mysql +sed -i -e 's/default-mysql-client/mysql-client/' \ + -e 's/default-libmysqlclient-dev/libmysqlclient-dev/' ${DIST}/control + # clean backports scripts rm -rf ${DIST}/backports exit 0 diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index 7cf30100651..ac0061c6c12 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -26,7 +26,7 @@ Build-Depends: bison, liblua5.1-0-dev, libmemcached-dev, libmono-2.0-dev, - libmysqlclient-dev, + default-libmysqlclient-dev, libncurses5-dev, libpcre3-dev, libperl-dev, @@ -240,7 +240,7 @@ Architecture: linux-any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: kamailio (= ${binary:Version}), - mysql-client | virtual-mysql-client, + default-mysql-client | virtual-mysql-client, ${misc:Depends}, ${shlibs:Depends} Description: MySQL database connectivity module for Kamailio diff --git a/pkg/kamailio/deb/sid/control b/pkg/kamailio/deb/sid/control index 810b8a2f64b..b039ec0aeca 100644 --- a/pkg/kamailio/deb/sid/control +++ b/pkg/kamailio/deb/sid/control @@ -26,7 +26,7 @@ Build-Depends: bison, liblua5.1-0-dev, libmemcached-dev, libmono-2.0-dev, - libmysqlclient-dev, + default-libmysqlclient-dev, libncurses5-dev, libpcre3-dev, libperl-dev, @@ -239,7 +239,7 @@ Architecture: linux-any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: kamailio (= ${binary:Version}), - mysql-client | virtual-mysql-client, + default-mysql-client | virtual-mysql-client, ${misc:Depends}, ${shlibs:Depends} Description: MySQL database connectivity module for Kamailio diff --git a/pkg/kamailio/deb/stretch/control b/pkg/kamailio/deb/stretch/control index 810b8a2f64b..b039ec0aeca 100644 --- a/pkg/kamailio/deb/stretch/control +++ b/pkg/kamailio/deb/stretch/control @@ -26,7 +26,7 @@ Build-Depends: bison, liblua5.1-0-dev, libmemcached-dev, libmono-2.0-dev, - libmysqlclient-dev, + default-libmysqlclient-dev, libncurses5-dev, libpcre3-dev, libperl-dev, @@ -239,7 +239,7 @@ Architecture: linux-any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: kamailio (= ${binary:Version}), - mysql-client | virtual-mysql-client, + default-mysql-client | virtual-mysql-client, ${misc:Depends}, ${shlibs:Depends} Description: MySQL database connectivity module for Kamailio