[sr-dev] git:3.1: pkg debian

Module: sip-router Branch: 3.1 Commit: e4c14ed4ba933dd8c675a157adf21cd7e84b565c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e4c14ed… Author: Jon Bonilla &lt;manwe(a)aholab.ehu.es&gt; Committer: Jon Bonilla &lt;manwe(a)aholab.ehu.es&gt; Date: Sun Oct 10 01:38:09 2010 +0200 pkg debian * Use libreadline-dev generic instead of libreadline5-dev as dependency (cherry picked from commit b532368d655fb7b08c44120c85eb09ff545bab44) Conflicts: pkg/kamailio/debian-squeeze/control pkg/kamailio/debian/control --- pkg/kamailio/debian-squeeze/control | 4 ++++ pkg/kamailio/debian/control | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/pkg/kamailio/debian-squeeze/control b/pkg/kamailio/debian-squeeze/control index ab4ad1e..00aaf9a 100644 --- a/pkg/kamailio/debian-squeeze/control +++ b/pkg/kamailio/debian-squeeze/control @@ -2,7 +2,11 @@ Source: kamailio Section: net Priority: optional Maintainer: Jon Bonilla &lt;manwe(a)aholab.ehu.es&gt; +<<<<<<< HEAD Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libgeoip-dev, libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev +======= +Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libmemcache-dev, libreadline-dev +>>>>>>> b532368... pkg debian Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/ diff --git a/pkg/kamailio/debian/control b/pkg/kamailio/debian/control index 73a1e26..c7b6fa2 100644 --- a/pkg/kamailio/debian/control +++ b/pkg/kamailio/debian/control @@ -2,7 +2,11 @@ Source: kamailio Section: net Priority: optional Maintainer: Jon Bonilla &lt;manwe(a)aholab.ehu.es&gt; +<<<<<<< HEAD Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libpurple-dev, libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev +======= +Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libpurple-dev, libmemcache-dev, libreadline-dev +>>>>>>> b532368... pkg debian Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/