wrap and sort items in Debian packaging files

This makes reviews and diffs easier and helps in avoiding duplicate entries. devscripts's wrap-and-sort ftw. Closes: https://bugtracker.sipwise.com/view.php?id=1845 Acked-by: Jon Bonilla From: Michael Prokop <mprokop@sipwise.com>
13 years ago · 153a3ba271
parent f78c8f643e
commit 153a3ba271
6 changed files with 609 additions and 236 deletions
--- a/pkg/kamailio/deb/debian/control
+++ b/pkg/kamailio/deb/debian/control
@ -2,15 +2,67 @@ Source: kamailio
 Section: net
 Priority: optional
 Maintainer: Jon Bonilla <manwe@aholab.ehu.es>
-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, libgeoip-dev (>= 1.4.5), libhiredis-dev (>= 0.10.0), libsqlite3-dev, libjson0-dev, libevent-dev, libncurses5-dev, libmono-dev
+Build-Depends: bison,
+               debhelper (>= 5),
+               docbook-xml,
+               dpatch,
+               dpkg-dev (>= 1.13.19),
+               flex,
+               libconfuse-dev,
+               libcurl3-openssl-dev,
+               libdb-dev (>= 4.6.19),
+               libevent-dev,
+               libexpat1-dev,
+               libgeoip-dev (>= 1.4.5),
+               libhiredis-dev (>= 0.10.0),
+               libjson0-dev,
+               libldap2-dev,
+               liblua5.1-0-dev,
+               libmemcache-dev,
+               libmono-dev,
+               libmysqlclient-dev,
+               libncurses5-dev,
+               libpcre3-dev,
+               libperl-dev,
+               libpq-dev,
+               libpurple-dev,
+               libradiusclient-ng-dev,
+               libreadline-dev,
+               libsasl2-dev,
+               libsnmp-dev,
+               libsqlite3-dev,
+               libssl-dev,
+               libxml2-dev,
+               libxmlrpc-c3-dev,
+               python,
+               python-dev,
+               unixodbc-dev,
+               xsltproc,
+               zlib1g-dev
 Standards-Version: 3.8.0
 Homepage: http://www.kamailio.org/

 Package: kamailio
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
-Conflicts: kamailio-regex-modules, kamailio-dbg
-Suggests: kamailio-mysql-modules, kamailio-postgres-modules, kamailio-unixodbc-modules, kamailio-tls-modules, kamailio-cpl-modules, kamailio-radius-modules, kamailio-presence-modules, kamailio-xml-modules, kamailio-perl-modules, kamailio-snmpstats-modules, kamailio-xmpp-modules, kamailio-carrierroute-modules, kamailio-berkeley-modules, kamailio-ldap-modules, kamailio-lua-modules, kamailio-python-modules, kamailio-mono-modules
+Depends: adduser, ${misc:Depends}, ${shlibs:Depends}
+Conflicts: kamailio-dbg, kamailio-regex-modules
+Suggests: kamailio-berkeley-modules,
+          kamailio-carrierroute-modules,
+          kamailio-cpl-modules,
+          kamailio-ldap-modules,
+          kamailio-lua-modules,
+          kamailio-mono-modules,
+          kamailio-mysql-modules,
+          kamailio-perl-modules,
+          kamailio-postgres-modules,
+          kamailio-presence-modules,
+          kamailio-python-modules,
+          kamailio-radius-modules,
+          kamailio-snmpstats-modules,
+          kamailio-tls-modules,
+          kamailio-unixodbc-modules,
+          kamailio-xml-modules,
+          kamailio-xmpp-modules
 Description: very fast and configurable SIP proxy
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -28,10 +80,9 @@ Description: very fast and configurable SIP proxy
 This package contains the main Kamailio binary along with the principal modules
 and support binaries.

-
 Package: kamailio-mysql-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), mysql-client
+Depends: kamailio (= ${binary:Version}), mysql-client, ${shlibs:Depends}
 Replaces: kamailio-mysql-module
 Description: MySQL database connectivity module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -42,7 +93,7 @@ Description: MySQL database connectivity module for Kamailio

 Package: kamailio-postgres-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), postgresql-client
+Depends: kamailio (= ${binary:Version}), postgresql-client, ${shlibs:Depends}
 Replaces: kamailio-postgres-module
 Description: PostgreSQL database connectivity module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -53,7 +104,7 @@ Description: PostgreSQL database connectivity module for Kamailio

 Package: kamailio-cpl-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-cpl-module
 Description: CPL module (CPL interpreter engine) for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -65,7 +116,7 @@ Description: CPL module (CPL interpreter engine) for Kamailio

 Package: kamailio-radius-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Description: radius modules for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -76,19 +127,19 @@ Description: radius modules for Kamailio
 against a Radius Server.

 Package: kamailio-unixodbc-modules
-Architecture: any 
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Architecture: any
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-unixodbc-module
-Description: unixODBC 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 unixODBC database driver for Kamailio. 
+Description: unixODBC 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 unixODBC database driver for Kamailio.

 Package: kamailio-presence-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Description: SIMPLE presence modules for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -100,7 +151,7 @@ Description: SIMPLE presence modules for Kamailio

 Package: kamailio-xml-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-xml-module, kamailio-xmlrpc-module
 Provides: kamailio-xmlrpc-modules
 Description: XML based extensions for Kamailio's Management Interface
@ -115,13 +166,13 @@ Description: XML based extensions for Kamailio's Management Interface

 Package: kamailio-xmlrpc-modules
 Architecture: any
-Depends:  kamailio-xml-modules (= ${binary:Version})
+Depends: kamailio-xml-modules (= ${binary:Version})
 Description: Transitional package for kamailio-xml-modules
 Dummy package for transition handling

 Package: kamailio-perl-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-perl-module
 Conflicts: kamailio-perl-module
 Description: Perl extensions and database driver for Kamailio
@ -134,7 +185,7 @@ Description: Perl extensions and database driver for Kamailio

 Package: kamailio-snmpstats-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), snmpd
+Depends: kamailio (= ${binary:Version}), snmpd, ${shlibs:Depends}
 Replaces: kamailio-snmpstats-module
 Description: SNMP AgentX subagent module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -146,7 +197,7 @@ Description: SNMP AgentX subagent module for Kamailio

 Package: kamailio-xmpp-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-xmpp-module
 Description: XMPP gateway module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -157,7 +208,7 @@ Description: XMPP gateway module for Kamailio

 Package: kamailio-carrierroute-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-carrierroute-module
 Description: Carrierroute module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -169,7 +220,7 @@ Description: Carrierroute module for Kamailio

 Package: kamailio-berkeley-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), db4.6-util
+Depends: db4.6-util, kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-berkeley-module
 Description: Berkeley Database module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -182,7 +233,7 @@ Description: Berkeley Database module for Kamailio

 Package: kamailio-ldap-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Description: LDAP modules for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -194,7 +245,7 @@ Description: LDAP modules for Kamailio

 Package: kamailio-utils-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-utils-module
 Description: Provides a set utility functions for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -206,7 +257,7 @@ Description: Provides a set utility functions for Kamailio

 Package: kamailio-purple-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-purple-module
 Description: Provides the purple module, a multi-protocol IM gateway
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -218,7 +269,7 @@ Description: Provides the purple module, a multi-protocol IM gateway

 Package: kamailio-memcached-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-memcached-module
 Description: Provides the memcached module, an interface to the memcached server
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -230,14 +281,14 @@ Description: Provides the memcached module, an interface to the memcached server

 Package: kamailio-tls-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: kamailio (= ${Source-Version}), ${shlibs:Depends}
 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})
+Depends: kamailio (= ${Source-Version}), ${shlibs:Depends}
 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
@ -248,7 +299,7 @@ Description: contains the app_lua module

 Package: kamailio-mono-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: kamailio (= ${Source-Version}), ${shlibs:Depends}
 Description: contains the app_mono module
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -259,7 +310,7 @@ Description: contains the app_mono module

 Package: kamailio-python-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: kamailio (= ${Source-Version}), ${shlibs:Depends}
 Description: contains the app_python module
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -270,7 +321,7 @@ Description: contains the app_python module

 Package: kamailio-geoip-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: kamailio (= ${Source-Version}), ${shlibs:Depends}
 Description: contains the geoip module
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -281,7 +332,7 @@ Description: contains the geoip module

 Package: kamailio-redis-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), libhiredis0.10
+Depends: kamailio (= ${binary:Version}), libhiredis0.10, ${shlibs:Depends}
 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
@ -291,7 +342,7 @@ Description: Redis database connectivity module for Kamailio

 Package: kamailio-sqlite-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), libsqlite3-0
+Depends: kamailio (= ${binary:Version}), libsqlite3-0, ${shlibs:Depends}
 Description: SQLite 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
@ -301,7 +352,10 @@ Description: SQLite database connectivity module for Kamailio

 Package: kamailio-json-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), libjson0, libevent-1.4-2
+Depends: kamailio (= ${binary:Version}),
+         libevent-1.4-2,
+         libjson0,
+         ${shlibs:Depends}
 Description: Json parser and jsonrpc modules for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -312,9 +366,22 @@ Description: Json parser and jsonrpc modules for Kamailio

 Package: kamailio-nth
 Architecture: any
-Depends: screen, gdb, binutils, gcc, bison, flex, ngrep, tcpdump, iftop, lsof, psmisc, vim, bvi, most, mc, sipsak
+Depends: binutils,
+         bison,
+         bvi,
+         flex,
+         gcc,
+         gdb,
+         iftop,
+         lsof,
+         mc,
+         most,
+         ngrep,
+         psmisc,
+         screen,
+         sipsak,
+         tcpdump,
+         vim
 Description: Kamailio - package for "nice to have" installation
 This is a meta-package for easy installation various useful tools that may be
 handy on server with Kamailio installed.
-
-
--- a/pkg/kamailio/deb/lenny/control
+++ b/pkg/kamailio/deb/lenny/control
@ -2,15 +2,61 @@ Source: kamailio
 Section: net
 Priority: optional
 Maintainer: Jon Bonilla <manwe@aholab.ehu.es>
-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, libsqlite3-dev, libncurses5-dev
+Build-Depends: bison,
+               debhelper (>= 5),
+               docbook-xml,
+               dpatch,
+               dpkg-dev (>= 1.13.19),
+               flex,
+               libconfuse-dev,
+               libcurl3-openssl-dev,
+               libdb-dev (>= 4.6.19),
+               libexpat1-dev,
+               libldap2-dev,
+               liblua5.1-0-dev,
+               libmemcache-dev,
+               libmysqlclient-dev,
+               libncurses5-dev,
+               libpcre3-dev,
+               libperl-dev,
+               libpq-dev,
+               libpurple-dev,
+               libradiusclient-ng-dev,
+               libreadline-dev,
+               libsasl2-dev,
+               libsnmp-dev,
+               libsqlite3-dev,
+               libssl-dev,
+               libxml2-dev,
+               libxmlrpc-c3-dev,
+               python,
+               python-dev,
+               unixodbc-dev,
+               xsltproc,
+               zlib1g-dev
 Standards-Version: 3.8.0
 Homepage: http://www.kamailio.org/

 Package: kamailio
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
-Conflicts: kamailio-regex-modules, kamailio-dbg
-Suggests: kamailio-mysql-modules, kamailio-postgres-modules, kamailio-unixodbc-modules, kamailio-tls-modules, kamailio-cpl-modules, kamailio-radius-modules, kamailio-presence-modules, kamailio-xml-modules, kamailio-perl-modules, kamailio-snmpstats-modules, kamailio-xmpp-modules, kamailio-carrierroute-modules, kamailio-berkeley-modules, kamailio-ldap-modules, kamailio-lua-modules, kamailio-python-modules
+Depends: adduser, ${misc:Depends}, ${shlibs:Depends}
+Conflicts: kamailio-dbg, kamailio-regex-modules
+Suggests: kamailio-berkeley-modules,
+          kamailio-carrierroute-modules,
+          kamailio-cpl-modules,
+          kamailio-ldap-modules,
+          kamailio-lua-modules,
+          kamailio-mysql-modules,
+          kamailio-perl-modules,
+          kamailio-postgres-modules,
+          kamailio-presence-modules,
+          kamailio-python-modules,
+          kamailio-radius-modules,
+          kamailio-snmpstats-modules,
+          kamailio-tls-modules,
+          kamailio-unixodbc-modules,
+          kamailio-xml-modules,
+          kamailio-xmpp-modules
 Description: very fast and configurable SIP proxy
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -28,10 +74,9 @@ Description: very fast and configurable SIP proxy
 This package contains the main Kamailio binary along with the principal modules
 and support binaries.

-
 Package: kamailio-mysql-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), mysql-client
+Depends: kamailio (= ${binary:Version}), mysql-client, ${shlibs:Depends}
 Replaces: kamailio-mysql-module
 Description: MySQL database connectivity module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -42,7 +87,7 @@ Description: MySQL database connectivity module for Kamailio

 Package: kamailio-postgres-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), postgresql-client
+Depends: kamailio (= ${binary:Version}), postgresql-client, ${shlibs:Depends}
 Replaces: kamailio-postgres-module
 Description: PostgreSQL database connectivity module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -53,7 +98,7 @@ Description: PostgreSQL database connectivity module for Kamailio

 Package: kamailio-cpl-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-cpl-module
 Description: CPL module (CPL interpreter engine) for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -65,7 +110,7 @@ Description: CPL module (CPL interpreter engine) for Kamailio

 Package: kamailio-radius-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Description: radius modules for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -76,19 +121,19 @@ Description: radius modules for Kamailio
 against a Radius Server.

 Package: kamailio-unixodbc-modules
-Architecture: any 
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Architecture: any
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-unixodbc-module
-Description: unixODBC 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 unixODBC database driver for Kamailio. 
+Description: unixODBC 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 unixODBC database driver for Kamailio.

 Package: kamailio-presence-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Description: SIMPLE presence modules for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -100,7 +145,7 @@ Description: SIMPLE presence modules for Kamailio

 Package: kamailio-xml-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-xml-module, kamailio-xmlrpc-module
 Provides: kamailio-xmlrpc-modules
 Description: XML based extensions for Kamailio's Management Interface
@ -115,13 +160,13 @@ Description: XML based extensions for Kamailio's Management Interface

 Package: kamailio-xmlrpc-modules
 Architecture: any
-Depends:  kamailio-xml-modules (= ${binary:Version})
+Depends: kamailio-xml-modules (= ${binary:Version})
 Description: Transitional package for kamailio-xml-modules
 Dummy package for transition handling

 Package: kamailio-perl-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-perl-module
 Conflicts: kamailio-perl-module
 Description: Perl extensions and database driver for Kamailio
@ -134,7 +179,7 @@ Description: Perl extensions and database driver for Kamailio

 Package: kamailio-snmpstats-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), snmpd
+Depends: kamailio (= ${binary:Version}), snmpd, ${shlibs:Depends}
 Replaces: kamailio-snmpstats-module
 Description: SNMP AgentX subagent module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -146,7 +191,7 @@ Description: SNMP AgentX subagent module for Kamailio

 Package: kamailio-xmpp-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-xmpp-module
 Description: XMPP gateway module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -157,7 +202,7 @@ Description: XMPP gateway module for Kamailio

 Package: kamailio-carrierroute-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-carrierroute-module
 Description: Carrierroute module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -169,7 +214,7 @@ Description: Carrierroute module for Kamailio

 Package: kamailio-berkeley-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), db4.6-util
+Depends: db4.6-util, kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-berkeley-module
 Description: Berkeley Database module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -182,7 +227,7 @@ Description: Berkeley Database module for Kamailio

 Package: kamailio-ldap-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Description: LDAP modules for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -194,7 +239,7 @@ Description: LDAP modules for Kamailio

 Package: kamailio-utils-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-utils-module
 Description: Provides a set utility functions for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -206,7 +251,7 @@ Description: Provides a set utility functions for Kamailio

 Package: kamailio-purple-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-purple-module
 Description: Provides the purple module, a multi-protocol IM gateway
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -218,7 +263,7 @@ Description: Provides the purple module, a multi-protocol IM gateway

 Package: kamailio-memcached-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-memcached-module
 Description: Provides the memcached module, an interface to the memcached server
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -230,14 +275,14 @@ Description: Provides the memcached module, an interface to the memcached server

 Package: kamailio-tls-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: kamailio (= ${Source-Version}), ${shlibs:Depends}
 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})
+Depends: kamailio (= ${Source-Version}), ${shlibs:Depends}
 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
@ -248,7 +293,7 @@ Description: contains the app_lua module

 Package: kamailio-python-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: kamailio (= ${Source-Version}), ${shlibs:Depends}
 Description: contains the app_python module
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -280,7 +325,7 @@ Description: contains the app_python module

 Package: kamailio-sqlite-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), libsqlite3-0
+Depends: kamailio (= ${binary:Version}), libsqlite3-0, ${shlibs:Depends}
 Description: SQLite 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
@ -301,9 +346,22 @@ Description: SQLite database connectivity module for Kamailio

 Package: kamailio-nth
 Architecture: any
-Depends: screen, gdb, binutils, gcc, bison, flex, ngrep, tcpdump, iftop, lsof, psmisc, vim, bvi, most, mc, sipsak
+Depends: binutils,
+         bison,
+         bvi,
+         flex,
+         gcc,
+         gdb,
+         iftop,
+         lsof,
+         mc,
+         most,
+         ngrep,
+         psmisc,
+         screen,
+         sipsak,
+         tcpdump,
+         vim
 Description: Kamailio - package for "nice to have" installation
 This is a meta-package for easy installation various useful tools that may be
 handy on server with Kamailio installed.
-
-
--- a/pkg/kamailio/deb/lucid/control
+++ b/pkg/kamailio/deb/lucid/control
@ -2,15 +2,62 @@ Source: kamailio
 Section: net
 Priority: optional
 Maintainer: Jon Bonilla <manwe@aholab.ehu.es>
-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, libgeoip-dev (>= 1.4.5), libsqlite3-dev, libncurses5-dev
+Build-Depends: bison,
+               debhelper (>= 5),
+               docbook-xml,
+               dpatch,
+               dpkg-dev (>= 1.13.19),
+               flex,
+               libconfuse-dev,
+               libcurl3-openssl-dev,
+               libdb-dev (>= 4.6.19),
+               libexpat1-dev,
+               libgeoip-dev (>= 1.4.5),
+               libldap2-dev,
+               liblua5.1-0-dev,
+               libmemcache-dev,
+               libmysqlclient-dev,
+               libncurses5-dev,
+               libpcre3-dev,
+               libperl-dev,
+               libpq-dev,
+               libpurple-dev,
+               libradiusclient-ng-dev,
+               libreadline-dev,
+               libsasl2-dev,
+               libsnmp-dev,
+               libsqlite3-dev,
+               libssl-dev,
+               libxml2-dev,
+               libxmlrpc-c3-dev,
+               python,
+               python-dev,
+               unixodbc-dev,
+               xsltproc,
+               zlib1g-dev
 Standards-Version: 3.8.0
 Homepage: http://www.kamailio.org/

 Package: kamailio
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
-Conflicts: kamailio-regex-modules, kamailio-dbg
-Suggests: kamailio-mysql-modules, kamailio-postgres-modules, kamailio-unixodbc-modules, kamailio-tls-modules, kamailio-cpl-modules, kamailio-radius-modules, kamailio-presence-modules, kamailio-xml-modules, kamailio-perl-modules, kamailio-snmpstats-modules, kamailio-xmpp-modules, kamailio-carrierroute-modules, kamailio-berkeley-modules, kamailio-ldap-modules, kamailio-lua-modules, kamailio-python-modules
+Depends: adduser, ${misc:Depends}, ${shlibs:Depends}
+Conflicts: kamailio-dbg, kamailio-regex-modules
+Suggests: kamailio-berkeley-modules,
+          kamailio-carrierroute-modules,
+          kamailio-cpl-modules,
+          kamailio-ldap-modules,
+          kamailio-lua-modules,
+          kamailio-mysql-modules,
+          kamailio-perl-modules,
+          kamailio-postgres-modules,
+          kamailio-presence-modules,
+          kamailio-python-modules,
+          kamailio-radius-modules,
+          kamailio-snmpstats-modules,
+          kamailio-tls-modules,
+          kamailio-unixodbc-modules,
+          kamailio-xml-modules,
+          kamailio-xmpp-modules
 Description: very fast and configurable SIP proxy
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -28,10 +75,9 @@ Description: very fast and configurable SIP proxy
 This package contains the main Kamailio binary along with the principal modules
 and support binaries.

-
 Package: kamailio-mysql-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), mysql-client
+Depends: kamailio (= ${binary:Version}), mysql-client, ${shlibs:Depends}
 Replaces: kamailio-mysql-module
 Description: MySQL database connectivity module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -42,7 +88,7 @@ Description: MySQL database connectivity module for Kamailio

 Package: kamailio-postgres-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), postgresql-client
+Depends: kamailio (= ${binary:Version}), postgresql-client, ${shlibs:Depends}
 Replaces: kamailio-postgres-module
 Description: PostgreSQL database connectivity module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -53,7 +99,7 @@ Description: PostgreSQL database connectivity module for Kamailio

 Package: kamailio-cpl-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-cpl-module
 Description: CPL module (CPL interpreter engine) for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -65,7 +111,7 @@ Description: CPL module (CPL interpreter engine) for Kamailio

 Package: kamailio-radius-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Description: radius modules for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -76,19 +122,19 @@ Description: radius modules for Kamailio
 against a Radius Server.

 Package: kamailio-unixodbc-modules
-Architecture: any 
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Architecture: any
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-unixodbc-module
-Description: unixODBC 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 unixODBC database driver for Kamailio. 
+Description: unixODBC 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 unixODBC database driver for Kamailio.

 Package: kamailio-presence-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Description: SIMPLE presence modules for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -100,7 +146,7 @@ Description: SIMPLE presence modules for Kamailio

 Package: kamailio-xml-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-xml-module, kamailio-xmlrpc-module
 Provides: kamailio-xmlrpc-modules
 Description: XML based extensions for Kamailio's Management Interface
@ -115,13 +161,13 @@ Description: XML based extensions for Kamailio's Management Interface

 Package: kamailio-xmlrpc-modules
 Architecture: any
-Depends:  kamailio-xml-modules (= ${binary:Version})
+Depends: kamailio-xml-modules (= ${binary:Version})
 Description: Transitional package for kamailio-xml-modules
 Dummy package for transition handling

 Package: kamailio-perl-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-perl-module
 Conflicts: kamailio-perl-module
 Description: Perl extensions and database driver for Kamailio
@ -134,7 +180,7 @@ Description: Perl extensions and database driver for Kamailio

 Package: kamailio-snmpstats-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), snmpd
+Depends: kamailio (= ${binary:Version}), snmpd, ${shlibs:Depends}
 Replaces: kamailio-snmpstats-module
 Description: SNMP AgentX subagent module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -146,7 +192,7 @@ Description: SNMP AgentX subagent module for Kamailio

 Package: kamailio-xmpp-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-xmpp-module
 Description: XMPP gateway module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -157,7 +203,7 @@ Description: XMPP gateway module for Kamailio

 Package: kamailio-carrierroute-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-carrierroute-module
 Description: Carrierroute module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -169,7 +215,7 @@ Description: Carrierroute module for Kamailio

 Package: kamailio-berkeley-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), db4.6-util
+Depends: db4.6-util, kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-berkeley-module
 Description: Berkeley Database module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -182,7 +228,7 @@ Description: Berkeley Database module for Kamailio

 Package: kamailio-ldap-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Description: LDAP modules for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -194,7 +240,7 @@ Description: LDAP modules for Kamailio

 Package: kamailio-utils-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-utils-module
 Description: Provides a set utility functions for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -206,7 +252,7 @@ Description: Provides a set utility functions for Kamailio

 Package: kamailio-purple-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-purple-module
 Description: Provides the purple module, a multi-protocol IM gateway
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -218,7 +264,7 @@ Description: Provides the purple module, a multi-protocol IM gateway

 Package: kamailio-memcached-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-memcached-module
 Description: Provides the memcached module, an interface to the memcached server
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -230,14 +276,14 @@ Description: Provides the memcached module, an interface to the memcached server

 Package: kamailio-tls-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: kamailio (= ${Source-Version}), ${shlibs:Depends}
 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})
+Depends: kamailio (= ${Source-Version}), ${shlibs:Depends}
 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
@ -248,7 +294,7 @@ Description: contains the app_lua module

 Package: kamailio-python-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: kamailio (= ${Source-Version}), ${shlibs:Depends}
 Description: contains the app_python module
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -259,7 +305,7 @@ Description: contains the app_python module

 Package: kamailio-geoip-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: kamailio (= ${Source-Version}), ${shlibs:Depends}
 Description: contains the geoip module
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -280,7 +326,7 @@ Description: contains the geoip module

 Package: kamailio-sqlite-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), libsqlite3-0
+Depends: kamailio (= ${binary:Version}), libsqlite3-0, ${shlibs:Depends}
 Description: SQLite 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
@ -301,9 +347,22 @@ Description: SQLite database connectivity module for Kamailio

 Package: kamailio-nth
 Architecture: any
-Depends: screen, gdb, binutils, gcc, bison, flex, ngrep, tcpdump, iftop, lsof, psmisc, vim, bvi, most, mc, sipsak
+Depends: binutils,
+         bison,
+         bvi,
+         flex,
+         gcc,
+         gdb,
+         iftop,
+         lsof,
+         mc,
+         most,
+         ngrep,
+         psmisc,
+         screen,
+         sipsak,
+         tcpdump,
+         vim
 Description: Kamailio - package for "nice to have" installation
 This is a meta-package for easy installation various useful tools that may be
 handy on server with Kamailio installed.
-
-
--- a/pkg/kamailio/deb/precise/control
+++ b/pkg/kamailio/deb/precise/control
@ -2,15 +2,67 @@ Source: kamailio
 Section: net
 Priority: optional
 Maintainer: Jon Bonilla <manwe@aholab.ehu.es>
-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, libgeoip-dev (>= 1.4.5), libhiredis-dev (>= 0.10.0), libsqlite3-dev, libjson0-dev, libevent-dev, libncurses5-dev, libmono-2.0-dev
+Build-Depends: bison,
+               debhelper (>= 5),
+               docbook-xml,
+               dpatch,
+               dpkg-dev (>= 1.13.19),
+               flex,
+               libconfuse-dev,
+               libcurl3-openssl-dev,
+               libdb-dev (>= 4.6.19),
+               libevent-dev,
+               libexpat1-dev,
+               libgeoip-dev (>= 1.4.5),
+               libhiredis-dev (>= 0.10.0),
+               libjson0-dev,
+               libldap2-dev,
+               liblua5.1-0-dev,
+               libmemcache-dev,
+               libmono-2.0-dev,
+               libmysqlclient-dev,
+               libncurses5-dev,
+               libpcre3-dev,
+               libperl-dev,
+               libpq-dev,
+               libpurple-dev,
+               libradiusclient-ng-dev,
+               libreadline-dev,
+               libsasl2-dev,
+               libsnmp-dev,
+               libsqlite3-dev,
+               libssl-dev,
+               libxml2-dev,
+               libxmlrpc-c3-dev,
+               python,
+               python-dev,
+               unixodbc-dev,
+               xsltproc,
+               zlib1g-dev
 Standards-Version: 3.8.0
 Homepage: http://www.kamailio.org/

 Package: kamailio
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
-Conflicts: kamailio-regex-modules, kamailio-dbg
-Suggests: kamailio-mysql-modules, kamailio-postgres-modules, kamailio-unixodbc-modules, kamailio-tls-modules, kamailio-cpl-modules, kamailio-radius-modules, kamailio-presence-modules, kamailio-xml-modules, kamailio-perl-modules, kamailio-snmpstats-modules, kamailio-xmpp-modules, kamailio-carrierroute-modules, kamailio-berkeley-modules, kamailio-ldap-modules, kamailio-lua-modules, kamailio-python-modules, kamailio-mono-modules
+Depends: adduser, ${misc:Depends}, ${shlibs:Depends}
+Conflicts: kamailio-dbg, kamailio-regex-modules
+Suggests: kamailio-berkeley-modules,
+          kamailio-carrierroute-modules,
+          kamailio-cpl-modules,
+          kamailio-ldap-modules,
+          kamailio-lua-modules,
+          kamailio-mono-modules,
+          kamailio-mysql-modules,
+          kamailio-perl-modules,
+          kamailio-postgres-modules,
+          kamailio-presence-modules,
+          kamailio-python-modules,
+          kamailio-radius-modules,
+          kamailio-snmpstats-modules,
+          kamailio-tls-modules,
+          kamailio-unixodbc-modules,
+          kamailio-xml-modules,
+          kamailio-xmpp-modules
 Description: very fast and configurable SIP proxy
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -28,10 +80,9 @@ Description: very fast and configurable SIP proxy
 This package contains the main Kamailio binary along with the principal modules
 and support binaries.

-
 Package: kamailio-mysql-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), mysql-client
+Depends: kamailio (= ${binary:Version}), mysql-client, ${shlibs:Depends}
 Replaces: kamailio-mysql-module
 Description: MySQL database connectivity module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -42,7 +93,7 @@ Description: MySQL database connectivity module for Kamailio

 Package: kamailio-postgres-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), postgresql-client
+Depends: kamailio (= ${binary:Version}), postgresql-client, ${shlibs:Depends}
 Replaces: kamailio-postgres-module
 Description: PostgreSQL database connectivity module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -53,7 +104,7 @@ Description: PostgreSQL database connectivity module for Kamailio

 Package: kamailio-cpl-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-cpl-module
 Description: CPL module (CPL interpreter engine) for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -65,7 +116,7 @@ Description: CPL module (CPL interpreter engine) for Kamailio

 Package: kamailio-radius-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Description: radius modules for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -76,19 +127,19 @@ Description: radius modules for Kamailio
 against a Radius Server.

 Package: kamailio-unixodbc-modules
-Architecture: any 
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Architecture: any
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-unixodbc-module
-Description: unixODBC 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 unixODBC database driver for Kamailio. 
+Description: unixODBC 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 unixODBC database driver for Kamailio.

 Package: kamailio-presence-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Description: SIMPLE presence modules for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -100,7 +151,7 @@ Description: SIMPLE presence modules for Kamailio

 Package: kamailio-xml-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-xml-module, kamailio-xmlrpc-module
 Provides: kamailio-xmlrpc-modules
 Description: XML based extensions for Kamailio's Management Interface
@ -113,15 +164,9 @@ Description: XML based extensions for Kamailio's Management Interface
 Management and Control Interface.
 - xmlops module for XPath operations in configuration file

-#Package: kamailio-xmlrpc-modules
-#Architecture: any
-#Depends:  kamailio-xml-modules (= ${binary:Version})
-#Description: Transitional package for kamailio-xml-modules
-# Dummy package for transition handling
-
 Package: kamailio-perl-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-perl-module
 Conflicts: kamailio-perl-module
 Description: Perl extensions and database driver for Kamailio
@ -134,7 +179,7 @@ Description: Perl extensions and database driver for Kamailio

 Package: kamailio-snmpstats-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), snmpd
+Depends: kamailio (= ${binary:Version}), snmpd, ${shlibs:Depends}
 Replaces: kamailio-snmpstats-module
 Description: SNMP AgentX subagent module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -146,7 +191,7 @@ Description: SNMP AgentX subagent module for Kamailio

 Package: kamailio-xmpp-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-xmpp-module
 Description: XMPP gateway module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -157,7 +202,7 @@ Description: XMPP gateway module for Kamailio

 Package: kamailio-carrierroute-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-carrierroute-module
 Description: Carrierroute module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -169,7 +214,7 @@ Description: Carrierroute module for Kamailio

 Package: kamailio-berkeley-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), db4.6-util
+Depends: db4.6-util, kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-berkeley-module
 Description: Berkeley Database module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -182,7 +227,7 @@ Description: Berkeley Database module for Kamailio

 Package: kamailio-ldap-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Description: LDAP modules for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -194,7 +239,7 @@ Description: LDAP modules for Kamailio

 Package: kamailio-utils-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-utils-module
 Description: Provides a set utility functions for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -206,7 +251,7 @@ Description: Provides a set utility functions for Kamailio

 Package: kamailio-purple-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-purple-module
 Description: Provides the purple module, a multi-protocol IM gateway
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -218,7 +263,7 @@ Description: Provides the purple module, a multi-protocol IM gateway

 Package: kamailio-memcached-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-memcached-module
 Description: Provides the memcached module, an interface to the memcached server
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -230,14 +275,14 @@ Description: Provides the memcached module, an interface to the memcached server

 Package: kamailio-tls-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: kamailio (= ${Source-Version}), ${shlibs:Depends}
 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})
+Depends: kamailio (= ${Source-Version}), ${shlibs:Depends}
 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
@ -248,7 +293,7 @@ Description: contains the app_lua module

 Package: kamailio-mono-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: kamailio (= ${Source-Version}), ${shlibs:Depends}
 Description: contains the app_mono module
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -259,7 +304,7 @@ Description: contains the app_mono module

 Package: kamailio-python-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: kamailio (= ${Source-Version}), ${shlibs:Depends}
 Description: contains the app_python module
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -270,7 +315,7 @@ Description: contains the app_python module

 Package: kamailio-geoip-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: kamailio (= ${Source-Version}), ${shlibs:Depends}
 Description: contains the geoip module
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -281,7 +326,7 @@ Description: contains the geoip module

 Package: kamailio-redis-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), libhiredis0.10
+Depends: kamailio (= ${binary:Version}), libhiredis0.10, ${shlibs:Depends}
 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
@ -291,7 +336,7 @@ Description: Redis database connectivity module for Kamailio

 Package: kamailio-sqlite-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), libsqlite3-0
+Depends: kamailio (= ${binary:Version}), libsqlite3-0, ${shlibs:Depends}
 Description: SQLite 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
@ -301,7 +346,10 @@ Description: SQLite database connectivity module for Kamailio

 Package: kamailio-json-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), libjson0, libevent-1.4-2
+Depends: kamailio (= ${binary:Version}),
+         libevent-1.4-2,
+         libjson0,
+         ${shlibs:Depends}
 Description: Json parser and jsonrpc modules for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -312,9 +360,22 @@ Description: Json parser and jsonrpc modules for Kamailio

 Package: kamailio-nth
 Architecture: any
-Depends: screen, gdb, binutils, gcc, bison, flex, ngrep, tcpdump, iftop, lsof, psmisc, vim, bvi, most, mc, sipsak
+Depends: binutils,
+         bison,
+         bvi,
+         flex,
+         gcc,
+         gdb,
+         iftop,
+         lsof,
+         mc,
+         most,
+         ngrep,
+         psmisc,
+         screen,
+         sipsak,
+         tcpdump,
+         vim
 Description: Kamailio - package for "nice to have" installation
 This is a meta-package for easy installation various useful tools that may be
 handy on server with Kamailio installed.
-
-
--- a/pkg/kamailio/deb/squeeze/control
+++ b/pkg/kamailio/deb/squeeze/control
@ -2,15 +2,63 @@ Source: kamailio
 Section: net
 Priority: optional
 Maintainer: Jon Bonilla <manwe@aholab.ehu.es>
-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 (>= 1.4.5), libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev, libsqlite3-dev, libjson0-dev, libevent-dev, libncurses5-dev
+Build-Depends: bison,
+               debhelper (>= 5),
+               docbook-xml,
+               dpatch,
+               dpkg-dev (>= 1.13.19),
+               flex,
+               libconfuse-dev,
+               libcurl3-openssl-dev,
+               libdb-dev (>= 4.6.19),
+               libevent-dev,
+               libexpat1-dev,
+               libgeoip-dev (>= 1.4.5),
+               libjson0-dev,
+               libldap2-dev,
+               liblua5.1-0-dev,
+               libmemcache-dev,
+               libmysqlclient-dev,
+               libncurses5-dev,
+               libpcre3-dev,
+               libperl-dev,
+               libpq-dev,
+               libradiusclient-ng-dev,
+               libreadline-dev,
+               libsasl2-dev,
+               libsnmp-dev,
+               libsqlite3-dev,
+               libssl-dev,
+               libxml2-dev,
+               libxmlrpc-c3-dev,
+               python,
+               python-dev,
+               unixodbc-dev,
+               xsltproc,
+               zlib1g-dev
 Standards-Version: 3.8.0
 Homepage: http://www.kamailio.org/

 Package: kamailio
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
-Conflicts: kamailio-regex-modules, kamailio-dbg
-Suggests: kamailio-mysql-modules, kamailio-postgres-modules, kamailio-unixodbc-modules, kamailio-tls-modules, kamailio-cpl-modules, kamailio-radius-modules, kamailio-presence-modules, kamailio-xml-modules, kamailio-perl-modules, kamailio-snmpstats-modules, kamailio-xmpp-modules, kamailio-carrierroute-modules, kamailio-berkeley-modules, kamailio-ldap-modules, kamailio-lua-modules, kamailio-python-modules
+Depends: adduser, ${misc:Depends}, ${shlibs:Depends}
+Conflicts: kamailio-dbg, kamailio-regex-modules
+Suggests: kamailio-berkeley-modules,
+          kamailio-carrierroute-modules,
+          kamailio-cpl-modules,
+          kamailio-ldap-modules,
+          kamailio-lua-modules,
+          kamailio-mysql-modules,
+          kamailio-perl-modules,
+          kamailio-postgres-modules,
+          kamailio-presence-modules,
+          kamailio-python-modules,
+          kamailio-radius-modules,
+          kamailio-snmpstats-modules,
+          kamailio-tls-modules,
+          kamailio-unixodbc-modules,
+          kamailio-xml-modules,
+          kamailio-xmpp-modules
 Description: very fast and configurable SIP proxy
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -28,10 +76,9 @@ Description: very fast and configurable SIP proxy
 This package contains the main Kamailio binary along with the principal modules
 and support binaries.

-
 Package: kamailio-mysql-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), mysql-client
+Depends: kamailio (= ${binary:Version}), mysql-client, ${shlibs:Depends}
 Replaces: kamailio-mysql-module
 Description: MySQL database connectivity module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -42,7 +89,7 @@ Description: MySQL database connectivity module for Kamailio

 Package: kamailio-postgres-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), postgresql-client
+Depends: kamailio (= ${binary:Version}), postgresql-client, ${shlibs:Depends}
 Replaces: kamailio-postgres-module
 Description: PostgreSQL database connectivity module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -53,7 +100,7 @@ Description: PostgreSQL database connectivity module for Kamailio

 Package: kamailio-cpl-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-cpl-module
 Description: CPL module (CPL interpreter engine) for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -65,7 +112,7 @@ Description: CPL module (CPL interpreter engine) for Kamailio

 Package: kamailio-radius-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Description: radius modules for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -76,19 +123,19 @@ Description: radius modules for Kamailio
 against a Radius Server and for sending PacketCable Event Messages.

 Package: kamailio-unixodbc-modules
-Architecture: any 
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Architecture: any
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-unixodbc-module
-Description: unixODBC 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 unixODBC database driver for Kamailio. 
+Description: unixODBC 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 unixODBC database driver for Kamailio.

 Package: kamailio-presence-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Description: SIMPLE presence modules for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -100,7 +147,7 @@ Description: SIMPLE presence modules for Kamailio

 Package: kamailio-xml-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-xml-module, kamailio-xmlrpc-module
 Provides: kamailio-xmlrpc-modules
 Description: XML based extensions for Kamailio's Management Interface
@ -115,13 +162,13 @@ Description: XML based extensions for Kamailio's Management Interface

 Package: kamailio-xmlrpc-modules
 Architecture: any
-Depends:  kamailio-xml-modules (= ${binary:Version})
+Depends: kamailio-xml-modules (= ${binary:Version})
 Description: Transitional package for kamailio-xml-modules
 Dummy package for transition handling

 Package: kamailio-perl-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-perl-module
 Conflicts: kamailio-perl-module
 Description: Perl extensions and database driver for Kamailio
@ -134,7 +181,7 @@ Description: Perl extensions and database driver for Kamailio

 Package: kamailio-snmpstats-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), snmpd
+Depends: kamailio (= ${binary:Version}), snmpd, ${shlibs:Depends}
 Replaces: kamailio-snmpstats-module
 Description: SNMP AgentX subagent module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -146,7 +193,7 @@ Description: SNMP AgentX subagent module for Kamailio

 Package: kamailio-xmpp-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-xmpp-module
 Description: XMPP gateway module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -157,7 +204,7 @@ Description: XMPP gateway module for Kamailio

 Package: kamailio-carrierroute-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-carrierroute-module
 Description: Carrierroute module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -169,7 +216,7 @@ Description: Carrierroute module for Kamailio

 Package: kamailio-berkeley-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), db4.6-util
+Depends: db4.6-util, kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-berkeley-module
 Description: Berkeley Database module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -182,7 +229,7 @@ Description: Berkeley Database module for Kamailio

 Package: kamailio-ldap-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Description: LDAP modules for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -194,7 +241,7 @@ Description: LDAP modules for Kamailio

 Package: kamailio-utils-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-utils-module
 Description: Provides a set utility functions for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -218,7 +265,7 @@ Description: Provides a set utility functions for Kamailio

 Package: kamailio-memcached-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-memcached-module
 Description: Provides the memcached module, an interface to the memcached server
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -230,14 +277,14 @@ Description: Provides the memcached module, an interface to the memcached server

 Package: kamailio-tls-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: kamailio (= ${Source-Version}), ${shlibs:Depends}
 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})
+Depends: kamailio (= ${Source-Version}), ${shlibs:Depends}
 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
@ -257,10 +304,9 @@ Description: contains the app_lua module
 # This package provides the app_mono module, an extension allowing to
 # execute embedded Mono applications within configuration file.

-
 Package: kamailio-python-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: kamailio (= ${Source-Version}), ${shlibs:Depends}
 Description: contains the app_python module
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -271,7 +317,7 @@ Description: contains the app_python module

 Package: kamailio-geoip-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: kamailio (= ${Source-Version}), ${shlibs:Depends}
 Description: contains the geoip module
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -292,7 +338,7 @@ Description: contains the geoip module

 Package: kamailio-sqlite-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), libsqlite3-0
+Depends: kamailio (= ${binary:Version}), libsqlite3-0, ${shlibs:Depends}
 Description: SQLite 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
@ -302,20 +348,36 @@ Description: SQLite database connectivity module for Kamailio

 Package: kamailio-json-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), libjson0, libevent-1.4-2
+Depends: kamailio (= ${binary:Version}),
+         libevent-1.4-2,
+         libjson0,
+         ${shlibs:Depends}
 Description: Json parser and jsonrpc 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 json parser for Kamailio's configuration file 
+ This package provides json parser for Kamailio's configuration file
 and the JSON-RPC client over netstrings.

 Package: kamailio-nth
 Architecture: any
-Depends: screen, gdb, binutils, gcc, bison, flex, ngrep, tcpdump, iftop, lsof, psmisc, vim, bvi, most, mc, sipsak
+Depends: binutils,
+         bison,
+         bvi,
+         flex,
+         gcc,
+         gdb,
+         iftop,
+         lsof,
+         mc,
+         most,
+         ngrep,
+         psmisc,
+         screen,
+         sipsak,
+         tcpdump,
+         vim
 Description: Kamailio - package for "nice to have" installation
 This is a meta-package for easy installation various useful tools that may be
 handy on server with Kamailio installed.
-
-
--- a/pkg/kamailio/deb/wheezy/control
+++ b/pkg/kamailio/deb/wheezy/control
@ -2,15 +2,66 @@ Source: kamailio
 Section: net
 Priority: optional
 Maintainer: Jon Bonilla <manwe@aholab.ehu.es>
-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), libmono-2.0-dev, liblua5.1-0-dev
+Build-Depends: bison,
+               debhelper (>= 5),
+               docbook-xml,
+               dpatch,
+               dpkg-dev (>= 1.13.19),
+               flex,
+               libconfuse-dev,
+               libcurl3-openssl-dev,
+               libdb-dev (>= 4.6.19),
+               libevent-dev,
+               libexpat1-dev,
+               libgeoip-dev (>= 1.4.5),
+               libhiredis-dev (>= 0.10.0),
+               libjson0-dev,
+               libldap2-dev,
+               liblua5.1-0-dev,
+               libmemcache-dev,
+               libmono-2.0-dev,
+               libmysqlclient-dev,
+               libncurses5-dev,
+               libpcre3-dev,
+               libperl-dev,
+               libpq-dev,
+               libradiusclient-ng-dev,
+               libreadline-dev,
+               libsasl2-dev,
+               libsnmp-dev,
+               libsqlite3-dev,
+               libssl-dev,
+               libxml2-dev,
+               libxmlrpc-c3-dev,
+               python,
+               python-dev,
+               unixodbc-dev,
+               xsltproc,
+               zlib1g-dev
 Standards-Version: 3.8.0
 Homepage: http://www.kamailio.org/

 Package: kamailio
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
-Conflicts: kamailio-regex-modules, kamailio-dbg
-Suggests: kamailio-mysql-modules, kamailio-postgres-modules, kamailio-unixodbc-modules, kamailio-tls-modules, kamailio-cpl-modules, kamailio-radius-modules, kamailio-presence-modules, kamailio-xml-modules, kamailio-perl-modules, kamailio-snmpstats-modules, kamailio-xmpp-modules, kamailio-carrierroute-modules, kamailio-berkeley-modules, kamailio-ldap-modules, kamailio-lua-modules, kamailio-python-modules, kamailio-mono-modules
+Depends: adduser, ${misc:Depends}, ${shlibs:Depends}
+Conflicts: kamailio-dbg, kamailio-regex-modules
+Suggests: kamailio-berkeley-modules,
+          kamailio-carrierroute-modules,
+          kamailio-cpl-modules,
+          kamailio-ldap-modules,
+          kamailio-lua-modules,
+          kamailio-mono-modules,
+          kamailio-mysql-modules,
+          kamailio-perl-modules,
+          kamailio-postgres-modules,
+          kamailio-presence-modules,
+          kamailio-python-modules,
+          kamailio-radius-modules,
+          kamailio-snmpstats-modules,
+          kamailio-tls-modules,
+          kamailio-unixodbc-modules,
+          kamailio-xml-modules,
+          kamailio-xmpp-modules
 Description: very fast and configurable SIP proxy
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -28,10 +79,9 @@ Description: very fast and configurable SIP proxy
 This package contains the main Kamailio binary along with the principal modules
 and support binaries.

-
 Package: kamailio-mysql-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), mysql-client
+Depends: kamailio (= ${binary:Version}), mysql-client, ${shlibs:Depends}
 Replaces: kamailio-mysql-module
 Description: MySQL database connectivity module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -42,7 +92,7 @@ Description: MySQL database connectivity module for Kamailio

 Package: kamailio-postgres-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), postgresql-client
+Depends: kamailio (= ${binary:Version}), postgresql-client, ${shlibs:Depends}
 Replaces: kamailio-postgres-module
 Description: PostgreSQL database connectivity module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -53,7 +103,7 @@ Description: PostgreSQL database connectivity module for Kamailio

 Package: kamailio-cpl-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-cpl-module
 Description: CPL module (CPL interpreter engine) for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -65,7 +115,7 @@ Description: CPL module (CPL interpreter engine) for Kamailio

 Package: kamailio-radius-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Description: radius modules for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -76,19 +126,19 @@ Description: radius modules for Kamailio
 against a Radius Server.

 Package: kamailio-unixodbc-modules
-Architecture: any 
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Architecture: any
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-unixodbc-module
-Description: unixODBC 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 unixODBC database driver for Kamailio. 
+Description: unixODBC 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 unixODBC database driver for Kamailio.

 Package: kamailio-presence-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Description: SIMPLE presence modules for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -100,7 +150,7 @@ Description: SIMPLE presence modules for Kamailio

 Package: kamailio-xml-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-xml-module, kamailio-xmlrpc-module
 Provides: kamailio-xmlrpc-modules
 Description: XML based extensions for Kamailio's Management Interface
@ -115,13 +165,13 @@ Description: XML based extensions for Kamailio's Management Interface

 Package: kamailio-xmlrpc-modules
 Architecture: any
-Depends:  kamailio-xml-modules (= ${binary:Version})
+Depends: kamailio-xml-modules (= ${binary:Version})
 Description: Transitional package for kamailio-xml-modules
 Dummy package for transition handling

 Package: kamailio-perl-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-perl-module
 Conflicts: kamailio-perl-module
 Description: Perl extensions and database driver for Kamailio
@ -134,7 +184,7 @@ Description: Perl extensions and database driver for Kamailio

 Package: kamailio-snmpstats-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), snmpd
+Depends: kamailio (= ${binary:Version}), snmpd, ${shlibs:Depends}
 Replaces: kamailio-snmpstats-module
 Description: SNMP AgentX subagent module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -146,7 +196,7 @@ Description: SNMP AgentX subagent module for Kamailio

 Package: kamailio-xmpp-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-xmpp-module
 Description: XMPP gateway module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -157,7 +207,7 @@ Description: XMPP gateway module for Kamailio

 Package: kamailio-carrierroute-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-carrierroute-module
 Description: Carrierroute module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -169,7 +219,7 @@ Description: Carrierroute module for Kamailio

 Package: kamailio-berkeley-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), db4.6-util
+Depends: db4.6-util, kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-berkeley-module
 Description: Berkeley Database module for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -182,7 +232,7 @@ Description: Berkeley Database module for Kamailio

 Package: kamailio-ldap-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Description: LDAP modules for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -194,7 +244,7 @@ Description: LDAP modules for Kamailio

 Package: kamailio-utils-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-utils-module
 Description: Provides a set utility functions for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -218,7 +268,7 @@ Description: Provides a set utility functions for Kamailio

 Package: kamailio-memcached-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Depends: kamailio (= ${binary:Version}), ${shlibs:Depends}
 Replaces: kamailio-memcached-module
 Description: Provides the memcached module, an interface to the memcached server
 Kamailio is a very fast and flexible SIP (RFC3261)
@ -230,14 +280,14 @@ Description: Provides the memcached module, an interface to the memcached server

 Package: kamailio-tls-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: kamailio (= ${Source-Version}), ${shlibs:Depends}
 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})
+Depends: kamailio (= ${Source-Version}), ${shlibs:Depends}
 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
@ -248,7 +298,7 @@ Description: contains the app_lua module

 Package: kamailio-mono-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: kamailio (= ${Source-Version}), ${shlibs:Depends}
 Description: contains the app_mono module
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -259,7 +309,7 @@ Description: contains the app_mono module

 Package: kamailio-python-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: kamailio (= ${Source-Version}), ${shlibs:Depends}
 Description: contains the app_python module
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -270,7 +320,7 @@ Description: contains the app_python module

 Package: kamailio-geoip-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: kamailio (= ${Source-Version}), ${shlibs:Depends}
 Description: contains the geoip module
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -281,7 +331,7 @@ Description: contains the geoip module

 Package: kamailio-redis-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), libhiredis0.10
+Depends: kamailio (= ${binary:Version}), libhiredis0.10, ${shlibs:Depends}
 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
@ -291,7 +341,7 @@ Description: Redis database connectivity module for Kamailio

 Package: kamailio-sqlite-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), libsqlite3-0
+Depends: kamailio (= ${binary:Version}), libsqlite3-0, ${shlibs:Depends}
 Description: SQLite 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
@ -301,7 +351,10 @@ Description: SQLite database connectivity module for Kamailio

 Package: kamailio-json-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), libjson0, libevent-1.4-2
+Depends: kamailio (= ${binary:Version}),
+         libevent-1.4-2,
+         libjson0,
+         ${shlibs:Depends}
 Description: Json parser and jsonrpc modules for Kamailio
 Kamailio is a very fast and flexible SIP (RFC3261)
 proxy server. Written entirely in C, Kamailio can handle thousands calls
@ -312,9 +365,22 @@ Description: Json parser and jsonrpc modules for Kamailio

 Package: kamailio-nth
 Architecture: any
-Depends: screen, gdb, binutils, gcc, bison, flex, ngrep, tcpdump, iftop, lsof, psmisc, vim, bvi, most, mc, sipsak
+Depends: binutils,
+         bison,
+         bvi,
+         flex,
+         gcc,
+         gdb,
+         iftop,
+         lsof,
+         mc,
+         most,
+         ngrep,
+         psmisc,
+         screen,
+         sipsak,
+         tcpdump,
+         vim
 Description: Kamailio - package for "nice to have" installation
 This is a meta-package for easy installation various useful tools that may be
 handy on server with Kamailio installed.
-
-