Merge branch 'master' of ssh://git.sip-router.org/sip-router

pkg/kamailio/deb/wheezy/control

@@ -2,7 +2,7 @@ Source: kamailio
 Section: net
 Priority: optional
 Maintainer: Jon Bonilla <[email protected]>
-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, liblua5.1-0-dev, python-dev, libsasl2-dev, libgeoip-dev (>= 1.4.5), libsqlite3-dev, libjson0-dev, libevent-dev, libncurses5-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, python-dev, libsasl2-dev, libgeoip-dev (>= 1.4.5), libsqlite3-dev, libjson0-dev, libevent-dev, libncurses5-dev, libhiredis-dev (>= 0.10.0)
 Standards-Version: 3.8.0
 Homepage: http://www.kamailio.org/
 
@@ -235,16 +235,16 @@ Description: contains the TLS kamailio transport module
  This has been split out of the main kamailio package, so that kamailio will not
  depend on openssl. This module will enable you to use the TLS transport.
 
-Package: kamailio-lua-modules
-Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
-Description: contains the app_lua module
- 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 app_lua module, an extension allowing to
- execute embedded Lua applications within configuration file.
+#Package: kamailio-lua-modules
+#Architecture: any
+#Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+#Description: contains the app_lua module
+# 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 app_lua module, an extension allowing to
+# execute embedded Lua applications within configuration file.
 
 Package: kamailio-python-modules
 Architecture: any
@@ -268,15 +268,15 @@ Description: contains the geoip module
  This package provides the geoip module, an extension allowing to
  use GeoIP API within configuration file.
 
-#Package: kamailio-redis-modules
-#Architecture: any
-#Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), libhiredis0.10
-#Description: Redis database connectivity module 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 Redis NOSQL database driver for Kamailio.
+Package: kamailio-redis-modules
+Architecture: any
+Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), libhiredis0.10
+Description: Redis database connectivity module 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 Redis NOSQL database driver for Kamailio.
 
 Package: kamailio-sqlite-modules
 Architecture: any

pkg/kamailio/deb/wheezy/rules

@@ -42,7 +42,7 @@ MODULES_SP=
 # on which other depend first)
 PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \
 			   ldap xml perl utils memcached tls \
-			   snmpstats carrierroute xmpp cpl lua python geoip\
+			   snmpstats carrierroute xmpp cpl redis python geoip\
 			   sqlite json
 
 # name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b)