Merge branch 'master' of https://github.com/kamailio/kamailio

* 'master' of https://github.com/kamailio/kamailio:
  pkg/kamailio/deb: remove obsolete purple module from packages

pkg/kamailio/deb/debian/backports/squeeze

@@ -50,12 +50,6 @@ sed -i -e '/libsctp-dev/d' -e '/^Package: kamailio-sctp-modules/,/^$/d' \
 sed -i -e 's/ sctp[ ,$]*/ /' ${DIST}/rules
 sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ sctp/' ${DIST}/rules
 
-# No purple module:
-sed -i -e '/libpurple-dev/d' -e '/^Package: kamailio-purple-modules/,/^$/d' \
-	${DIST}/control
-sed -i -e 's/ purple[ ,$]*/ /' ${DIST}/rules
-sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ purple/' ${DIST}/rules
-
 # No libhiredis:
 sed -i -e '/libhiredis-dev/d' -e '/^Package: kamailio-redis-modules/,/^$/d' \
 	${DIST}/control

pkg/kamailio/deb/debian/backports/wheezy

@@ -13,12 +13,6 @@ sed -i -e '/dh-systemd/d' ${DIST}/control
 sed -i -e '/dh_systemd/d' ${DIST}/rules
 rm ${DIST}/kamailio.service
 
-# No purple module:
-sed -i -e '/libpurple-dev/d' -e '/^Package: kamailio-purple-modules/,/^$/d' \
-	${DIST}/control
-sed -i -e 's/ purple[ ,$]*/ /' ${DIST}/rules
-sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ purple/' ${DIST}/rules
-
 # No mi_xmlrpc module
 sed -i -e '/libxmlrpc-c3-dev/d' -e '/^Package: kamailio-xmlrpc-modules/,/^$/d' \
 	${DIST}/control

pkg/kamailio/deb/debian/control

@@ -31,7 +31,6 @@ Build-Depends: bison,
                libpcre3-dev,
                libperl-dev,
                libpq-dev,
-               libpurple-dev,
                librabbitmq-dev,
                libradcli-dev,
                libreadline-dev,
@@ -358,21 +357,6 @@ Description: SNMP AgentX subagent module for Kamailio
  This package provides the snmpstats module for Kamailio. This module acts
  as an AgentX subagent which connects to a master agent.
 
-Package: kamailio-purple-modules
-Architecture: linux-any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: kamailio (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: Provides the purple module, a multi-protocol IM gateway
- 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 purple module, a multi-protocol instant
- messaging gateway module.
-
 Package: kamailio-xmpp-modules
 Architecture: linux-any
 Multi-Arch: same

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 \
-			   purple tls outbound websocket autheph dnssec kazoo cnxcc \
+			   tls outbound websocket autheph dnssec kazoo cnxcc \
 			   erlang systemd
 
 # module groups to be packaged onto kamailio-extra-modules

pkg/kamailio/deb/jessie/control

@@ -31,7 +31,6 @@ Build-Depends: bison,
                libpcre3-dev,
                libperl-dev,
                libpq-dev,
-               libpurple-dev,
                librabbitmq-dev,
                libfreeradius-client-dev,
                libreadline-dev,
@@ -357,21 +356,6 @@ Description: SNMP AgentX subagent module for Kamailio
  This package provides the snmpstats module for Kamailio. This module acts
  as an AgentX subagent which connects to a master agent.
 
-Package: kamailio-purple-modules
-Architecture: linux-any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: kamailio (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: Provides the purple module, a multi-protocol IM gateway
- 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 purple module, a multi-protocol instant
- messaging gateway module.
-
 Package: kamailio-xmpp-modules
 Architecture: linux-any
 Multi-Arch: same

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 \
-			   purple tls outbound websocket autheph dnssec kazoo cnxcc \
+			   tls outbound websocket autheph dnssec kazoo cnxcc \
 			   erlang systemd
 
 # module groups to be packaged onto kamailio-extra-modules

pkg/kamailio/deb/precise/control

@@ -30,7 +30,6 @@ Build-Depends: bison,
                libpcre3-dev,
                libperl-dev,
                libpq-dev,
-               libpurple-dev,
                libradiusclient-ng-dev,
                libreadline-dev,
                libsasl2-dev,
@@ -353,21 +352,6 @@ Description: SNMP AgentX subagent module for Kamailio
  This package provides the snmpstats module for Kamailio. This module acts
  as an AgentX subagent which connects to a master agent.
 
-Package: kamailio-purple-modules
-Architecture: linux-any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: kamailio (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: Provides the purple module, a multi-protocol IM gateway
- 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 purple module, a multi-protocol instant
- messaging gateway module.
-
 Package: kamailio-xmpp-modules
 Architecture: linux-any
 Multi-Arch: same

pkg/kamailio/deb/precise/rules

@@ -36,7 +36,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 \
-			   purple tls outbound websocket autheph \
+			   tls outbound websocket autheph \
 			   erlang
 
 # module groups to be packaged onto kamailio-extra-modules

pkg/kamailio/deb/sid/control

@@ -31,7 +31,6 @@ Build-Depends: bison,
                libpcre3-dev,
                libperl-dev,
                libpq-dev,
-               libpurple-dev,
                librabbitmq-dev,
                libradcli-dev,
                libreadline-dev,
@@ -357,21 +356,6 @@ Description: SNMP AgentX subagent module for Kamailio
  This package provides the snmpstats module for Kamailio. This module acts
  as an AgentX subagent which connects to a master agent.
 
-Package: kamailio-purple-modules
-Architecture: linux-any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: kamailio (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: Provides the purple module, a multi-protocol IM gateway
- 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 purple module, a multi-protocol instant
- messaging gateway module.
-
 Package: kamailio-xmpp-modules
 Architecture: linux-any
 Multi-Arch: same

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 \
-			   purple tls outbound websocket autheph dnssec kazoo cnxcc \
+			   tls outbound websocket autheph dnssec kazoo cnxcc \
 			   erlang systemd
 
 # module groups to be packaged onto kamailio-extra-modules

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 purple redis mono kazoo cnxcc jansson systemd http_async
+EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa iptrtpproxy java dnssec sctp redis mono kazoo cnxcc jansson systemd http_async
 
 # module groups that are packaged in seperate packages
 # (with the name kamailio-$(group_name)-modules)

pkg/kamailio/deb/stretch/control

@@ -31,7 +31,6 @@ Build-Depends: bison,
                libpcre3-dev,
                libperl-dev,
                libpq-dev,
-               libpurple-dev,
                librabbitmq-dev,
                libradcli-dev,
                libreadline-dev,
@@ -357,21 +356,6 @@ Description: SNMP AgentX subagent module for Kamailio
  This package provides the snmpstats module for Kamailio. This module acts
  as an AgentX subagent which connects to a master agent.
 
-Package: kamailio-purple-modules
-Architecture: linux-any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: kamailio (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: Provides the purple module, a multi-protocol IM gateway
- 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 purple module, a multi-protocol instant
- messaging gateway module.
-
 Package: kamailio-xmpp-modules
 Architecture: linux-any
 Multi-Arch: same

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 \
-			   purple tls outbound websocket autheph dnssec kazoo cnxcc \
+			   tls outbound websocket autheph dnssec kazoo cnxcc \
 			   erlang systemd
 
 # module groups to be packaged onto kamailio-extra-modules

pkg/kamailio/deb/trusty/control

@@ -30,7 +30,6 @@ Build-Depends: bison,
                libpcre3-dev,
                libperl-dev,
                libpq-dev,
-               libpurple-dev,
                librabbitmq-dev,
                libfreeradius-client-dev,
                libreadline-dev,
@@ -355,21 +354,6 @@ Description: SNMP AgentX subagent module for Kamailio
  This package provides the snmpstats module for Kamailio. This module acts
  as an AgentX subagent which connects to a master agent.
 
-Package: kamailio-purple-modules
-Architecture: linux-any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: kamailio (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: Provides the purple module, a multi-protocol IM gateway
- 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 purple module, a multi-protocol instant
- messaging gateway module.
-
 Package: kamailio-xmpp-modules
 Architecture: linux-any
 Multi-Arch: same

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 \
-			   purple tls outbound websocket autheph dnssec kazoo cnxcc \
+			   tls outbound websocket autheph dnssec kazoo cnxcc \
 			   erlang
 
 # module groups to be packaged onto kamailio-extra-modules

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 purple mi_xmlrpc dnssec kazoo cnxcc systemd
+EXTRA_EXCLUDED_MODULES=bdb dbtext oracle pa iptrtpproxy mi_xmlrpc dnssec kazoo cnxcc systemd
 
 # module groups that are packaged in seperate packages
 # (with the name kamailio-$(group_name)-modules)

pkg/kamailio/deb/xenial/control

@@ -31,7 +31,6 @@ Build-Depends: bison,
                libpcre3-dev,
                libperl-dev,
                libpq-dev,
-               libpurple-dev,
                librabbitmq-dev,
                libradcli-dev,
                libreadline-dev,
@@ -358,21 +357,6 @@ Description: SNMP AgentX subagent module for Kamailio
  This package provides the snmpstats module for Kamailio. This module acts
  as an AgentX subagent which connects to a master agent.
 
-Package: kamailio-purple-modules
-Architecture: linux-any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: kamailio (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: Provides the purple module, a multi-protocol IM gateway
- 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 purple module, a multi-protocol instant
- messaging gateway module.
-
 Package: kamailio-xmpp-modules
 Architecture: linux-any
 Multi-Arch: same

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 \
-			   purple tls outbound websocket autheph dnssec kazoo cnxcc \
+			   tls outbound websocket autheph dnssec kazoo cnxcc \
 			   erlang systemd
 
 # module groups to be packaged onto kamailio-extra-modules