diff --git a/pkg/kamailio/deb/debian/backports/precise b/pkg/kamailio/deb/debian/backports/precise index 3fbca2811ff..c221e428791 100755 --- a/pkg/kamailio/deb/debian/backports/precise +++ b/pkg/kamailio/deb/debian/backports/precise @@ -32,12 +32,6 @@ sed -i -e '/RADCLI/d' ${DIST}/rules # use old json sed -i 's/libjson-c-dev/libjson0-dev/' ${DIST}/control -# no kazoo module -sed -i -e '/librabbitmq-dev/d' -e '/^Package: kamailio-kazoo-modules/,/^$/d' \ - ${DIST}/control -sed -i -e 's/ kazoo[ ,$]*/ /' ${DIST}/rules -sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ kazoo/' ${DIST}/rules - # no cnxcc module sed -i -e '/^Package: kamailio-cnxcc-modules/,/^$/d' ${DIST}/control sed -i -e 's/ cnxcc[ ,$]*/ /' ${DIST}/rules diff --git a/pkg/kamailio/deb/debian/backports/squeeze b/pkg/kamailio/deb/debian/backports/squeeze index fca215c9d18..2c4fb2d49bf 100755 --- a/pkg/kamailio/deb/debian/backports/squeeze +++ b/pkg/kamailio/deb/debian/backports/squeeze @@ -72,12 +72,6 @@ sed -i -e '/RADCLI/d' ${DIST}/rules # use old json sed -i 's/libjson-c-dev/libjson0-dev/' ${DIST}/control -# no kazoo module -sed -i -e '/librabbitmq-dev/d' -e '/^Package: kamailio-kazoo-modules/,/^$/d' \ - ${DIST}/control -sed -i -e 's/ kazoo[ ,$]*/ /' ${DIST}/rules -sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ kazoo/' ${DIST}/rules - # no cnxcc module sed -i -e '/^Package: kamailio-cnxcc-modules/,/^$/d' ${DIST}/control sed -i -e 's/ cnxcc[ ,$]*/ /' ${DIST}/rules diff --git a/pkg/kamailio/deb/debian/backports/wheezy b/pkg/kamailio/deb/debian/backports/wheezy index 1b4fa2e021d..183ded4b0b9 100755 --- a/pkg/kamailio/deb/debian/backports/wheezy +++ b/pkg/kamailio/deb/debian/backports/wheezy @@ -32,12 +32,6 @@ sed -i -e '/RADCLI/d' ${DIST}/rules # use old json sed -i 's/libjson-c-dev/libjson0-dev/' ${DIST}/control -# no kazoo module -sed -i -e '/librabbitmq-dev/d' -e '/^Package: kamailio-kazoo-modules/,/^$/d' \ - ${DIST}/control -sed -i -e 's/ kazoo[ ,$]*/ /' ${DIST}/rules -sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ kazoo/' ${DIST}/rules - # no cnxcc module sed -i -e '/^Package: kamailio-cnxcc-modules/,/^$/d' ${DIST}/control sed -i -e 's/ cnxcc[ ,$]*/ /' ${DIST}/rules diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index 7fc00b1b673..ea8d4736e57 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -584,20 +584,6 @@ Description: authentication using ephemeral credentials module for Kamailio . This package provides the ephemeral module for Kamailio. -Package: kamailio-kazoo-modules -Architecture: linux-any -Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: kamailio (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends} -Description: kazoo modules for Kamailio - Kamailio is a very fast and flexible SIP (RFC3261) - proxy server. Written entirely in C, Kamailio can handle thousands calls - per second even on low-budget hardware. - . - This package provides the kazoo module for Kamailio. - Package: kamailio-rabbitmq-modules Architecture: linux-any Multi-Arch: same @@ -605,12 +591,15 @@ Pre-Depends: ${misc:Pre-Depends} Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} +Provides: kamailio-kazoo-modules +Conflicts: kamailio-kazoo-modules +Replaces: kamailio-kazoo-modules Description: RabbitMQ modules for Kamailio Kamailio is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, Kamailio can handle thousands calls per second even on low-budget hardware. . - This package provides the RabbitMQ module for Kamailio. + This package provides the RabbitMQ and kazoo modules for Kamailio. Package: kamailio-cnxcc-modules Architecture: linux-any diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules index a3e12f97847..ffca99012d7 100755 --- a/pkg/kamailio/deb/debian/rules +++ b/pkg/kamailio/deb/debian/rules @@ -37,7 +37,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils lua memcached \ snmpstats carrierroute xmpp cpl redis python geoip\ sqlite json mono ims sctp java \ - tls outbound websocket autheph dnssec kazoo cnxcc \ + tls outbound websocket autheph dnssec cnxcc \ erlang systemd rabbitmq # module groups to be packaged onto kamailio-extra-modules diff --git a/pkg/kamailio/deb/jessie/control b/pkg/kamailio/deb/jessie/control index a0c9a531c51..cd37a3ce680 100644 --- a/pkg/kamailio/deb/jessie/control +++ b/pkg/kamailio/deb/jessie/control @@ -582,20 +582,6 @@ Description: authentication using ephemeral credentials module for Kamailio . This package provides the ephemeral module for Kamailio. -Package: kamailio-kazoo-modules -Architecture: linux-any -Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: kamailio (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends} -Description: kazoo modules for Kamailio - Kamailio is a very fast and flexible SIP (RFC3261) - proxy server. Written entirely in C, Kamailio can handle thousands calls - per second even on low-budget hardware. - . - This package provides the kazoo module for Kamailio. - Package: kamailio-rabbitmq-modules Architecture: linux-any Multi-Arch: same @@ -603,12 +589,15 @@ Pre-Depends: ${misc:Pre-Depends} Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} +Provides: kamailio-kazoo-modules +Conflicts: kamailio-kazoo-modules +Replaces: kamailio-kazoo-modules Description: RabbitMQ modules for Kamailio Kamailio is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, Kamailio can handle thousands calls per second even on low-budget hardware. . - This package provides the RabbitMQ module for Kamailio. + This package provides the RabbitMQ and kazoo modules for Kamailio. Package: kamailio-cnxcc-modules Architecture: linux-any diff --git a/pkg/kamailio/deb/jessie/rules b/pkg/kamailio/deb/jessie/rules index 0f6fe62a56e..68b7fe0e7da 100755 --- a/pkg/kamailio/deb/jessie/rules +++ b/pkg/kamailio/deb/jessie/rules @@ -37,7 +37,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils lua memcached \ snmpstats carrierroute xmpp cpl redis python geoip\ sqlite json mono ims sctp java \ - tls outbound websocket autheph dnssec kazoo cnxcc \ + tls outbound websocket autheph dnssec cnxcc \ erlang systemd rabbitmq # module groups to be packaged onto kamailio-extra-modules diff --git a/pkg/kamailio/deb/precise/rules b/pkg/kamailio/deb/precise/rules index 749e8156d4f..38b056b8d27 100755 --- a/pkg/kamailio/deb/precise/rules +++ b/pkg/kamailio/deb/precise/rules @@ -26,7 +26,7 @@ EXCLUDED_MODULES= # extra modules to skip, because they are not compilable now # - regardless if they go to the main kamailio package or to some module package, # they will be excluded from compile and install of all -EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa iptrtpproxy mi_xmlrpc dnssec kazoo cnxcc systemd rabbitmq +EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa iptrtpproxy mi_xmlrpc dnssec cnxcc systemd rabbitmq # module groups that are packaged in seperate packages # (with the name kamailio-$(group_name)-modules) diff --git a/pkg/kamailio/deb/sid/control b/pkg/kamailio/deb/sid/control index 87fd1dc9433..a6fdca549f1 100644 --- a/pkg/kamailio/deb/sid/control +++ b/pkg/kamailio/deb/sid/control @@ -568,20 +568,6 @@ Description: authentication using ephemeral credentials module for Kamailio . This package provides the ephemeral module for Kamailio. -Package: kamailio-kazoo-modules -Architecture: linux-any -Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: kamailio (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends} -Description: kazoo modules for Kamailio - Kamailio is a very fast and flexible SIP (RFC3261) - proxy server. Written entirely in C, Kamailio can handle thousands calls - per second even on low-budget hardware. - . - This package provides the kazoo module for Kamailio. - Package: kamailio-rabbitmq-modules Architecture: linux-any Multi-Arch: same @@ -589,12 +575,15 @@ Pre-Depends: ${misc:Pre-Depends} Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} +Provides: kamailio-kazoo-modules +Conflicts: kamailio-kazoo-modules +Replaces: kamailio-kazoo-modules Description: RabbitMQ modules for Kamailio Kamailio is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, Kamailio can handle thousands calls per second even on low-budget hardware. . - This package provides the RabbitMQ module for Kamailio. + This package provides the RabbitMQ and kazoo modules for Kamailio. Package: kamailio-cnxcc-modules Architecture: linux-any diff --git a/pkg/kamailio/deb/sid/rules b/pkg/kamailio/deb/sid/rules index ab1b2d4540b..562b7ef6e15 100755 --- a/pkg/kamailio/deb/sid/rules +++ b/pkg/kamailio/deb/sid/rules @@ -37,7 +37,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils lua memcached \ snmpstats carrierroute xmpp cpl redis python geoip\ sqlite json mono ims sctp java \ - tls outbound websocket autheph kazoo cnxcc \ + tls outbound websocket autheph cnxcc \ erlang systemd rabbitmq # module groups to be packaged onto kamailio-extra-modules diff --git a/pkg/kamailio/deb/squeeze/rules b/pkg/kamailio/deb/squeeze/rules index 3cb4fb06a3d..c1d9082944e 100755 --- a/pkg/kamailio/deb/squeeze/rules +++ b/pkg/kamailio/deb/squeeze/rules @@ -24,7 +24,7 @@ EXCLUDED_MODULES= # extra modules to skip, because they are not compilable now # - regardless if they go to the main kamailio package or to some module package, # they will be excluded from compile and install of all -EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa iptrtpproxy java dnssec sctp redis mono kazoo cnxcc jansson systemd http_async rabbitmq +EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa iptrtpproxy java dnssec sctp redis mono cnxcc jansson systemd http_async rabbitmq # module groups that are packaged in seperate packages # (with the name kamailio-$(group_name)-modules) diff --git a/pkg/kamailio/deb/stretch/control b/pkg/kamailio/deb/stretch/control index 87fd1dc9433..a6fdca549f1 100644 --- a/pkg/kamailio/deb/stretch/control +++ b/pkg/kamailio/deb/stretch/control @@ -568,20 +568,6 @@ Description: authentication using ephemeral credentials module for Kamailio . This package provides the ephemeral module for Kamailio. -Package: kamailio-kazoo-modules -Architecture: linux-any -Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: kamailio (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends} -Description: kazoo modules for Kamailio - Kamailio is a very fast and flexible SIP (RFC3261) - proxy server. Written entirely in C, Kamailio can handle thousands calls - per second even on low-budget hardware. - . - This package provides the kazoo module for Kamailio. - Package: kamailio-rabbitmq-modules Architecture: linux-any Multi-Arch: same @@ -589,12 +575,15 @@ Pre-Depends: ${misc:Pre-Depends} Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} +Provides: kamailio-kazoo-modules +Conflicts: kamailio-kazoo-modules +Replaces: kamailio-kazoo-modules Description: RabbitMQ modules for Kamailio Kamailio is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, Kamailio can handle thousands calls per second even on low-budget hardware. . - This package provides the RabbitMQ module for Kamailio. + This package provides the RabbitMQ and kazoo modules for Kamailio. Package: kamailio-cnxcc-modules Architecture: linux-any diff --git a/pkg/kamailio/deb/stretch/rules b/pkg/kamailio/deb/stretch/rules index ab1b2d4540b..562b7ef6e15 100755 --- a/pkg/kamailio/deb/stretch/rules +++ b/pkg/kamailio/deb/stretch/rules @@ -37,7 +37,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils lua memcached \ snmpstats carrierroute xmpp cpl redis python geoip\ sqlite json mono ims sctp java \ - tls outbound websocket autheph kazoo cnxcc \ + tls outbound websocket autheph cnxcc \ erlang systemd rabbitmq # module groups to be packaged onto kamailio-extra-modules diff --git a/pkg/kamailio/deb/trusty/control b/pkg/kamailio/deb/trusty/control index 465939c88cd..ec8bc670366 100644 --- a/pkg/kamailio/deb/trusty/control +++ b/pkg/kamailio/deb/trusty/control @@ -580,20 +580,6 @@ Description: authentication using ephemeral credentials module for Kamailio . This package provides the ephemeral module for Kamailio. -Package: kamailio-kazoo-modules -Architecture: linux-any -Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: kamailio (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends} -Description: kazoo modules for Kamailio - Kamailio is a very fast and flexible SIP (RFC3261) - proxy server. Written entirely in C, Kamailio can handle thousands calls - per second even on low-budget hardware. - . - This package provides the kazoo module for Kamailio. - Package: kamailio-rabbitmq-modules Architecture: linux-any Multi-Arch: same @@ -601,12 +587,15 @@ Pre-Depends: ${misc:Pre-Depends} Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} +Provides: kamailio-kazoo-modules +Conflicts: kamailio-kazoo-modules +Replaces: kamailio-kazoo-modules Description: RabbitMQ modules for Kamailio Kamailio is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, Kamailio can handle thousands calls per second even on low-budget hardware. . - This package provides the RabbitMQ module for Kamailio. + This package provides the RabbitMQ and kazoo modules for Kamailio. Package: kamailio-cnxcc-modules Architecture: linux-any diff --git a/pkg/kamailio/deb/trusty/rules b/pkg/kamailio/deb/trusty/rules index ce0bbefec42..ddf6e320441 100755 --- a/pkg/kamailio/deb/trusty/rules +++ b/pkg/kamailio/deb/trusty/rules @@ -37,7 +37,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils lua memcached \ snmpstats carrierroute xmpp cpl redis python geoip\ sqlite json mono ims sctp java \ - tls outbound websocket autheph dnssec kazoo cnxcc \ + tls outbound websocket autheph dnssec cnxcc \ erlang rabbitmq # module groups to be packaged onto kamailio-extra-modules diff --git a/pkg/kamailio/deb/wheezy/rules b/pkg/kamailio/deb/wheezy/rules index 749e8156d4f..38b056b8d27 100755 --- a/pkg/kamailio/deb/wheezy/rules +++ b/pkg/kamailio/deb/wheezy/rules @@ -26,7 +26,7 @@ EXCLUDED_MODULES= # extra modules to skip, because they are not compilable now # - regardless if they go to the main kamailio package or to some module package, # they will be excluded from compile and install of all -EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa iptrtpproxy mi_xmlrpc dnssec kazoo cnxcc systemd rabbitmq +EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa iptrtpproxy mi_xmlrpc dnssec cnxcc systemd rabbitmq # module groups that are packaged in seperate packages # (with the name kamailio-$(group_name)-modules) diff --git a/pkg/kamailio/deb/xenial/control b/pkg/kamailio/deb/xenial/control index 6ea9ef6bc78..90e223a1f59 100644 --- a/pkg/kamailio/deb/xenial/control +++ b/pkg/kamailio/deb/xenial/control @@ -583,20 +583,6 @@ Description: authentication using ephemeral credentials module for Kamailio . This package provides the ephemeral module for Kamailio. -Package: kamailio-kazoo-modules -Architecture: linux-any -Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: kamailio (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends} -Description: kazoo modules for Kamailio - Kamailio is a very fast and flexible SIP (RFC3261) - proxy server. Written entirely in C, Kamailio can handle thousands calls - per second even on low-budget hardware. - . - This package provides the kazoo module for Kamailio. - Package: kamailio-rabbitmq-modules Architecture: linux-any Multi-Arch: same @@ -604,12 +590,15 @@ Pre-Depends: ${misc:Pre-Depends} Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} +Provides: kamailio-kazoo-modules +Conflicts: kamailio-kazoo-modules +Replaces: kamailio-kazoo-modules Description: RabbitMQ modules for Kamailio Kamailio is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, Kamailio can handle thousands calls per second even on low-budget hardware. . - This package provides the RabbitMQ module for Kamailio. + This package provides the RabbitMQ and kazoo modules for Kamailio. Package: kamailio-cnxcc-modules Architecture: linux-any diff --git a/pkg/kamailio/deb/xenial/rules b/pkg/kamailio/deb/xenial/rules index a3e12f97847..ffca99012d7 100755 --- a/pkg/kamailio/deb/xenial/rules +++ b/pkg/kamailio/deb/xenial/rules @@ -37,7 +37,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils lua memcached \ snmpstats carrierroute xmpp cpl redis python geoip\ sqlite json mono ims sctp java \ - tls outbound websocket autheph dnssec kazoo cnxcc \ + tls outbound websocket autheph dnssec cnxcc \ erlang systemd rabbitmq # module groups to be packaged onto kamailio-extra-modules