[Pkg-voip-commits] r9450 - in /kamailio/trunk/debian: changelog control patches/ rules source/ source/format

maniac-guest at alioth.debian.org maniac-guest at alioth.debian.org
Tue Jan 24 10:04:45 UTC 2012 

Author: maniac-guest
Date: Tue Jan 24 10:04:45 2012
New Revision: 9450

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9450
Log:
New update release. This is WIP.

Added:
    kamailio/trunk/debian/source/
    kamailio/trunk/debian/source/format
Removed:
    kamailio/trunk/debian/patches/
Modified:
    kamailio/trunk/debian/changelog
    kamailio/trunk/debian/control
    kamailio/trunk/debian/rules

Modified: kamailio/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/changelog?rev=9450&op=diff
==============================================================================
--- kamailio/trunk/debian/changelog (original)
+++ kamailio/trunk/debian/changelog Tue Jan 24 10:04:45 2012
@@ -1,3 +1,18 @@
+kamailio (3.2.1-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/rules:
+    + replaced for the kamailio debian/rules. 
+    + fix get-orig-source. Update URL
+  * Switch to dpkg-source 3.0 (quilt) format
+  * debian/control:
+    + remove dpatch
+    + add myself as Uploader
+  * debian/patches:
+    + remove all patches.
+
+ -- Victor Seva <linuxmaniac at torreviejawireless.org>  Tue, 24 Jan 2012 10:42:02 +0100
+
 kamailio (1.5.1-2) unstable; urgency=low
 
   * extend debian/copyright after suggestion from Tzafrir Cohen, users don't

Modified: kamailio/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/control?rev=9450&op=diff
==============================================================================
--- kamailio/trunk/debian/control (original)
+++ kamailio/trunk/debian/control Tue Jan 24 10:04:45 2012
@@ -2,8 +2,38 @@
 Section: net
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
-Uploaders: Kilian Krause <kilian at debian.org>, Henning Westerholt <henning.westerholt at 1und1.de>
-Build-Depends: debhelper (>= 5), dpatch, libmysqlclient15-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, libcurl4-gnutls-dev, python, libpcre3-dev, docbook-xml, libpurple-dev
+Uploaders: Kilian Krause <kilian at debian.org>, Henning Westerholt <henning.westerholt at 1und1.de>, Victor Seva <linuxmaniac at torreviejawireless.org>
+Build-Depends: bison,
+ debhelper (>= 5),
+ docbook-xml,
+ dpkg-dev (>= 1.13.19),
+ flex,
+ libconfuse-dev,
+ libcurl4-gnutls-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,
+ libxml2-dev,
+ libxmlrpc-c3-dev,
+ python,
+ python-dev,
+ unixodbc-dev,
+ xsltproc
 Standards-Version: 3.8.1
 Homepage: http://www.kamailio.org/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/kamailio/trunk/
@@ -13,7 +43,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python, adduser
 Replaces: openser
-Suggests: kamailio-mysql-module, kamailio-postgres-module, kamailio-unixodbc-module, kamailio-jabber-module, kamailio-cpl-module, kamailio-radius-modules, kamailio-presence-modules, kamailio-xmlrpc-module, kamailio-perl-modules, kamailio-snmpstats-module, kamailio-xmpp-module, kamailio-carrierroute-module, kamailio-berkeley-module, kamailio-ldap-modules, kamailio-utils-module, kamailio-regex-modules, kamailio-purple-module
+Suggests: kamailio-mysql-modules, kamailio-postgres-modules, kamailio-unixodbc-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
 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
@@ -45,10 +75,76 @@
  This package contains the debugging symbols for the Kamailio binaries and
  modules. You only need to install it if you need to debug Kamailio.
 
-Package: kamailio-mysql-module
+Package: kamailio-geoip-modules
+Architecture: any
+Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+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
+ per second even on low-budget hardware.
+ .
+ This package provides the geoip module, an extension allowing to
+ use GeoIP API within configuration file.
+
+Package: kamailio-sqlite-modules
+Architecture: any
+Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), libsqlite3-0
+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
+ per second even on low-budget hardware.
+ .
+ This package provides the SQLite database driver for Kamailio.
+
+Package: kamailio-json-modules
+Architecture: any
+Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), libjson0, libevent-1.4-2
+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
+ and the JSON-RPC client over netstrings.
+
+Package: kamailio-memcached-modules
+Architecture: any
+Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Replaces: kamailio-memcached-module
+Description: Provides the memcached module, an interface to the memcached server
+ 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 memcached module, an interface to the memcached
+ server, a high-performance, distributed memory object caching system.
+
+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
+Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+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
+ per second even on low-budget hardware.
+ .
+ This package provides the app_python module, an extension allowing to
+ execute embedded Python applications within configuration file.
+
+Package: kamailio-mysql-modules
 Architecture: any
 Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), mysql-client
-Replaces: openser-mysql-module
+Replaces: openser-mysql-modules
 Description: MySQL 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
@@ -56,10 +152,10 @@
  .
  This package provides the MySQL database driver for Kamailio.
 
-Package: kamailio-postgres-module
+Package: kamailio-postgres-modules
 Architecture: any
 Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), postgresql-client
-Replaces: openser-postgres-module
+Replaces: openser-postgres-modules
 Description: PostgreSQL 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
@@ -67,21 +163,10 @@
  .
  This package provides the PostgreSQL database driver for Kamailio.
 
-Package: kamailio-jabber-module
-Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
-Replaces: openser-jabber-module
-Description: Jabber gateway 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 SIP to Jabber translator module for Kamailio.
-
-Package: kamailio-cpl-module
-Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
-Replaces: openser-cpl-module
+Package: kamailio-cpl-modules
+Architecture: any
+Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Replaces: openser-cpl-modules
 Description: CPL module (CPL interpreter engine) for Kamailio
  Kamailio is a very fast and flexible SIP (RFC3261)
  proxy server. Written entirely in C, Kamailio can handle thousands calls
@@ -103,10 +188,10 @@
  authentication, peering, group membership and messages URIs checking against a
  RADIUS server.
 
-Package: kamailio-unixodbc-module
-Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
-Replaces: openser-unixodbc-module
+Package: kamailio-unixodbc-modules
+Architecture: any
+Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Replaces: openser-unixodbc-modules
 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
@@ -127,10 +212,10 @@
  server and presence user agent for RICH presence, registrar-based presence,
  external triggered presence and XCAP support.
 
-Package: kamailio-xmlrpc-module
-Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
-Replaces: openser-xmlrpc-module
+Package: kamailio-xmlrpc-modules
+Architecture: any
+Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Replaces: openser-xmlrpc-modules
 Description: XML-RPC support for Kamailio's Management Interface
  Kamailio is a very fast and flexible SIP (RFC3261)
  proxy server. Written entirely in C, Kamailio can handle thousands calls
@@ -142,8 +227,8 @@
 Package: kamailio-perl-modules
 Architecture: any
 Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
-Replaces: openser-perl-module, openser-perl-modules
-Conflicts: openser-perl-module
+Replaces: openser-perl-modules, openser-perl-modules
+Conflicts: openser-perl-modules
 Description: Perl extensions and database driver for Kamailio
  Kamailio is a very fast and flexible SIP (RFC3261)
  proxy server. Written entirely in C, Kamailio can handle thousands calls
@@ -152,10 +237,10 @@
  This package provides an interface for Kamailio to write Perl extensions and
  the perlvdb database driver for Kamailio.
 
-Package: kamailio-snmpstats-module
+Package: kamailio-snmpstats-modules
 Architecture: any
 Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), snmpd
-Replaces: openser-snmpstats-module
+Replaces: openser-snmpstats-modules
 Description: SNMP AgentX subagent module for Kamailio
  Kamailio is a very fast and flexible SIP (RFC3261)
  proxy server. Written entirely in C, Kamailio can handle thousands calls
@@ -164,10 +249,10 @@
  This package provides the snmpstats module for Kamailio. This module acts
  as an AgentX subagent which connects to a master agent.
 
-Package: kamailio-xmpp-module
-Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
-Replaces: openser-xmpp-module
+Package: kamailio-xmpp-modules
+Architecture: any
+Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Replaces: openser-xmpp-modules
 Description: XMPP gateway module for Kamailio
  Kamailio is a very fast and flexible SIP (RFC3261)
  proxy server. Written entirely in C, Kamailio can handle thousands calls
@@ -175,10 +260,25 @@
  .
  This package provides the SIP to XMPP IM translator module for Kamailio.
 
-Package: kamailio-carrierroute-module
-Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
-Replaces: openser-carrierroute-module
+Package: kamailio-xml-modules
+Architecture: any
+Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Replaces: kamailio-xml-module, kamailio-xmlrpc-module
+Provides: kamailio-xmlrpc-modules
+Description: XML based extensions for Kamailio's Management Interface
+ 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 XMLRPC transport implementations for Kamailio's
+ Management and Control Interface.
+ - xmlops module for XPath operations in configuration file
+
+Package: kamailio-carrierroute-modules
+Architecture: any
+Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
+Replaces: openser-carrierroute-modules
 Description: carrierroute module for Kamailio
  Kamailio is a very fast and flexible SIP (RFC3261)
  proxy server. Written entirely in C, Kamailio can handle thousands calls
@@ -187,10 +287,10 @@
  This package provides the carrierroute module for Kamailio, an integrated
  solution for routing, balancing and blacklisting.
 
-Package: kamailio-berkeley-module
+Package: kamailio-berkeley-modules
 Architecture: any
 Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), db4.6-util
-Replaces: openser-berkeley-module
+Replaces: openser-berkeley-modules
 Description: Berkeley database module for Kamailio
  Kamailio is a very fast and flexible SIP (RFC3261)
  proxy server. Written entirely in C, Kamailio can handle thousands calls
@@ -213,7 +313,7 @@
  queries from the Kamailio config and storage of SIP account data in an LDAP
  directory.
 
-Package: kamailio-utils-module
+Package: kamailio-utils-modules
 Architecture: any
 Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
 Description: Provides a set utility functions for Kamailio
@@ -223,40 +323,6 @@
  .
  Provides a set of utility functions for Kamailio, which are not related
  to the server configuration.
-
-Package: kamailio-regex-modules
-Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
-Description: Provides the lcr, diaplan and regex modules
- 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.
- .
- Contains the lcr, diaplan and regex modules that depends on the pcre library.
-
-Package: kamailio-purple-module
-Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
-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-osp-module
-Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), osptoolkit
-Replaces: openser-osp-module
-Description: Open Settlement Protocol (OSP) 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 contains the Open Settlement Protocol (OSP) module for Kamailio,
- providing support for secure multi-lateral peering using the Open Settlement
- Protocol.
 
 Package: openser
 Architecture: all
@@ -284,9 +350,9 @@
  to Kamailio; it is an empty package that depends on the equivalent Kamailio
  package. You can safely remove this package.
 
-Package: openser-mysql-module
-Architecture: all
-Depends: kamailio-mysql-module
+Package: openser-mysql-modules
+Architecture: all
+Depends: kamailio-mysql-modules
 Description: MySQL database connectivity module for OpenSER - transitional package
  OpenSER is a very fast and flexible SIP (RFC3261)
  proxy server. Written entirely in C, OpenSER can handle thousands calls
@@ -296,9 +362,9 @@
  to Kamailio; it is an empty package that depends on the equivalent Kamailio
  package. You can safely remove this package.
 
-Package: openser-postgres-module
-Architecture: all
-Depends: kamailio-postgres-module
+Package: openser-postgres-modules
+Architecture: all
+Depends: kamailio-postgres-modules
 Description: PostgreSQL database connectivity module for OpenSER - transitional package
  OpenSER is a very fast and flexible SIP (RFC3261)
  proxy server. Written entirely in C, OpenSER can handle thousands calls
@@ -308,9 +374,9 @@
  to Kamailio; it is an empty package that depends on the equivalent Kamailio
  package. You can safely remove this package.
 
-Package: openser-jabber-module
-Architecture: all
-Depends: kamailio-jabber-module
+Package: openser-jabber-modules
+Architecture: all
+Depends: kamailio-jabber-modules
 Description: Jabber gateway module for OpenSER - transitional package
  OpenSER is a very fast and flexible SIP (RFC3261)
  proxy server. Written entirely in C, OpenSER can handle thousands calls
@@ -320,9 +386,9 @@
  to Kamailio; it is an empty package that depends on the equivalent Kamailio
  package. You can safely remove this package.
 
-Package: openser-cpl-module
-Architecture: all
-Depends: kamailio-cpl-module
+Package: openser-cpl-modules
+Architecture: all
+Depends: kamailio-cpl-modules
 Description: CPL module (CPL interpreter engine) for OpenSER - transitional package
  OpenSER is a very fast and flexible SIP (RFC3261)
  proxy server. Written entirely in C, OpenSER can handle thousands calls
@@ -344,9 +410,9 @@
  to Kamailio; it is an empty package that depends on the equivalent Kamailio
  package. You can safely remove this package.
 
-Package: openser-unixodbc-module
-Architecture: all
-Depends: kamailio-unixodbc-module
+Package: openser-unixodbc-modules
+Architecture: all
+Depends: kamailio-unixodbc-modules
 Description: unixODBC database connectivity module for OpenSER - transitional package
  OpenSER is a very fast and flexible SIP (RFC3261)
  proxy server. Written entirely in C, OpenSER can handle thousands calls
@@ -368,9 +434,9 @@
  to Kamailio; it is an empty package that depends on the equivalent Kamailio
  package. You can safely remove this package.
 
-Package: openser-xmlrpc-module
-Architecture: all
-Depends: kamailio-xmlrpc-module
+Package: openser-xmlrpc-modules
+Architecture: all
+Depends: kamailio-xmlrpc-modules
 Description: XML-RPC support for OpenSER's Management Interface - transitional package
  OpenSER is a very fast and flexible SIP (RFC3261)
  proxy server. Written entirely in C, OpenSER can handle thousands calls
@@ -383,8 +449,8 @@
 Package: openser-perl-modules
 Architecture: all
 Depends: kamailio-perl-modules
-Conflicts: openser-perl-module
-Replaces: openser-perl-module
+Conflicts: openser-perl-modules
+Replaces: openser-perl-modules
 Description: Perl extensions and database driver for OpenSER - transitional package
  OpenSER is a very fast and flexible SIP (RFC3261)
  proxy server. Written entirely in C, OpenSER can handle thousands calls
@@ -394,9 +460,9 @@
  to Kamailio; it is an empty package that depends on the equivalent Kamailio
  package. You can safely remove this package.
 
-Package: openser-snmpstats-module
-Architecture: all
-Depends: kamailio-snmpstats-module
+Package: openser-snmpstats-modules
+Architecture: all
+Depends: kamailio-snmpstats-modules
 Description: SNMP AgentX subagent module for OpenSER - transitional package
  OpenSER is a very fast and flexible SIP (RFC3261)
  proxy server. Written entirely in C, OpenSER can handle thousands calls
@@ -406,9 +472,9 @@
  to Kamailio; it is an empty package that depends on the equivalent Kamailio
  package. You can safely remove this package.
 
-Package: openser-xmpp-module
-Architecture: all
-Depends: kamailio-xmpp-module
+Package: openser-xmpp-modules
+Architecture: all
+Depends: kamailio-xmpp-modules
 Description: XMPP gateway module for OpenSER - transitional package
  OpenSER is a very fast and flexible SIP (RFC3261)
  proxy server. Written entirely in C, OpenSER can handle thousands calls
@@ -418,9 +484,9 @@
  to Kamailio; it is an empty package that depends on the equivalent Kamailio
  package. You can safely remove this package.
 
-Package: openser-carrierroute-module
-Architecture: all
-Depends: kamailio-carrierroute-module
+Package: openser-carrierroute-modules
+Architecture: all
+Depends: kamailio-carrierroute-modules
 Description: carrierroute module for OpenSER - transitional package
  OpenSER is a very fast and flexible SIP (RFC3261)
  proxy server. Written entirely in C, OpenSER can handle thousands calls
@@ -430,9 +496,9 @@
  to Kamailio; it is an empty package that depends on the equivalent Kamailio
  package. You can safely remove this package.
 
-Package: openser-berkeley-module
-Architecture: all
-Depends: kamailio-berkeley-module
+Package: openser-berkeley-modules
+Architecture: all
+Depends: kamailio-berkeley-modules
 Description: Berkeley database module for OpenSER - transitional package
  OpenSER is a very fast and flexible SIP (RFC3261)
  proxy server. Written entirely in C, OpenSER can handle thousands calls
@@ -454,14 +520,3 @@
  to Kamailio; it is an empty package that depends on the equivalent Kamailio
  package. You can safely remove this package.
 
-Package: openser-osp-module
-Architecture: all
-Depends: kamailio-osp-module
-Description: Open Settlement Protocol (OSP) module for OpenSER - transitional package
- OpenSER is a very fast and flexible SIP (RFC3261)
- proxy server. Written entirely in C, OpenSER can handle thousands calls
- per second even on low-budget hardware.
- .
- This package is a transitional package to help with the renaming of OpenSER
- to Kamailio; it is an empty package that depends on the equivalent Kamailio
- package. You can safely remove this package.

Modified: kamailio/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/rules?rev=9450&op=diff
==============================================================================
--- kamailio/trunk/debian/rules (original)
+++ kamailio/trunk/debian/rules Tue Jan 24 10:04:45 2012
@@ -2,182 +2,155 @@
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-ALL_PACKAGES = kamailio kamailio-mysql-module kamailio-postgres-module \
-	kamailio-jabber-module kamailio-cpl-module kamailio-radius-modules \
-	kamailio-unixodbc-module kamailio-presence-modules kamailio-xmlrpc-module \
-	kamailio-perl-modules kamailio-snmpstats-module kamailio-xmpp-module \
-	kamailio-carrierroute-module kamailio-berkeley-module kamailio-ldap-modules \
-	kamailio-utils-module kamailio-regex-modules kamailio-purple-module
-
 DEBVERSION:=$(shell head -n 1 debian/changelog \
                     | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
 UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
 
 FILENAME := kamailio_$(UPVERSION).orig.tar.gz
-UPFILENAME := kamailio-$(UPVERSION)-tls_src.tar.gz
-URL := http://kamailio.org/pub/kamailio/$(UPVERSION)/src/kamailio-$(UPVERSION)-tls_src.tar.gz
+URL := http://www.kamailio.org/pub/kamailio/$(UPVERSION)/src/kamailio-$(UPVERSION)_src.tar.gz
 
 # Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
-
-# Include dpatch rules
-include /usr/share/dpatch/dpatch.make
-
-
-# Do we want the TLS version ?
-# Disabled by default due to license issues, set to non-void to enable
-TLS=
-
-# Do we want to build the OSP module ?
-# Disabled by default due to license issues, set to non-void to enable
-OSP=
-
-ifeq (,$(OSP))
-	DH_OPTIONS = -Nkamailio-osp-module -Nopenser-osp-module
-else
-	ALL_PACKAGES += kamailio-osp-module
+#export DH_VERBOSE=1
+
+# This is the debhelper compatibility version to use.
+# export DH_COMPAT=4
+#  -- already set in compat
+#  force no striping (always include debug symbols for now)
+export DEB_BUILD_OPTIONS:="$(DEB_BUILD_OPTIONS) nostrip"
+
+# modules not in the "main" kamailio package
+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 rls iptrtpproxy mi_xmlrpc purple
+#EXTRA_EXCLUDED_MODULES=
+
+# possible module directories that can appear in MODULES_SP
+# (only used for deducing a module name)
+MDIRS=modules modules_s modules_k
+
+# modules packaged in separate packages (complete with full modules_* path)
+# with the package name: kamailio-$(module_name)-module
+MODULES_SP=
+
+# module groups that are packaged in seperate packages
+# (with the name kamailio-$(group_name)-modules)
+# Note: the order is important (should be in dependency order, the one
+# on which other depend first)
+PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \
+			   ldap xml perl utils memcached \
+			   snmpstats carrierroute xmpp cpl lua python geoip\
+			   sqlite json
+
+# name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b)
+LIBDIR ?= lib
+
+# directories with possible duplicate libraries (that should be deleted
+# from current module* packages)
+DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/$(LIBDIR)/kamailio \
+			$(CURDIR)/debian/kamailio-db-modules/usr/$(LIBDIR)/kamailio
+
+# modules names out of modules sp
+MODULES_SP_NAMES=$(filter-out $(MDIRS),$(subst /, ,$(MODULES_SP)))
+
+# "function" to get package short name out of a dir/module_name
+# it also transforms db_foo into foo
+mod_name=$(subst db_,,$(lastword $(subst /, ,$(1))))
+
+define PACKAGE_GRP_BUILD_template
+	# package all the modules in PACKAGE_GROUPS in separate packages
+	$(foreach grp,$(PACKAGE_GROUPS),\
+		$(MAKE) every-module group_include="k$(grp)"
+	)
+endef
+
+
+define PACKAGE_MODULE_BUILD_template
+	# package all the modules MODULES_SP in separate packages
+	$(foreach mod,$(MODULES_SP),\
+		$(MAKE) modules modules="$(mod)"
+	)
+endef
+
+
+define PACKAGE_GRP_INSTALL_template
+	$(foreach grp,$(PACKAGE_GROUPS),\
+		$(MAKE) install-modules-all group_include="k$(grp)" \
+		basedir=$(CURDIR)/debian/kamailio-$(grp)-modules \
+		cfg_prefix=$(CURDIR)/debian/kamailio-$(grp)-modules \
+		doc-dir=share/doc/kamailio-$(grp)-modules
+		# eliminate duplicate libs
+		-for d in $(DUP_LIBS_DIRS); do \
+			test "$$d" != "$(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio" &&\
+			for r in $$d/lib*; do \
+				echo "removing $(grp) lib `basename $$r` present also in $$d";\
+				rm -f $(CURDIR)/debian/kamailio-$(grp)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \
+			done ; \
+		done
+	)
+endef
+
+
+define PACKAGE_MODULE_INSTALL_template
+	$(foreach mod,$(MODULES_SP),
+		$(MAKE) install-modules-all modules="$(mod)" \
+				modules_s="" modules_k="" \
+				basedir=$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module \
+				doc-dir=share/doc/kamailio-$(call mod_name,$(mod))-module
+		# eliminate duplicate libs
+		-for d in $(DUP_LIBS_DIRS); do \
+			test "$$d" != "$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio" &&\
+			for r in $$d/lib*; do \
+				echo "removing $(call mod_name, $(mod)) lib `basename $$r` present also in $$d";\
+				rm -f $(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-module/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \
+			done ; \
+		done
+	)
+endef
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -g
 endif
-
-export DH_OPTIONS
-
-# modules depending on mysql
-MYSQL_MODULES = db_mysql
-# modules depending on postgres
-POSTGRES_MODULES = db_postgres
-# modules depending on unixODBC
-UNIXODBC_MODULES = db_unixodbc
-# jabber module
-JABBER_MODULES = jabber
-# cpl related modules
-CPL_MODULES = cpl-c
-# module depending on radiusclient
-RADIUS_MODULES = auth_radius misc_radius peering
-# presence related modules
-PRESENCE_MODULES = presence presence_xml presence_mwi presence_dialoginfo pua pua_bla pua_mi pua_usrloc pua_xmpp pua_dialoginfo xcap_client rls
-# XMLRPC module
-XMLRPC_MODULES = mi_xmlrpc
-# Perl module
-PERL_MODULES = perl perlvdb
-# SNMPstats module
-SNMPSTATS_MODULES = snmpstats
-# XMPP module
-XMPP_MODULES = xmpp
-# Carrierroute module
-CROUTE_MODULES = carrierroute
-# Berkeley DB module
-BERKELEY_MODULES = db_berkeley
-# LDAP modules
-LDAP_MODULES = ldap h350
-# utils module
-UTILS_MODULES = utils
-# modules depending on libpcre
-REGEX_MODULES = dialplan regex lcr
-# purple module
-PURPLE_MODULES = purple
-# OSP module
-OSP_MODULES = osp
-
-ALL_MODULES = $(MYSQL_MODULES) $(POSTGRES_MODULES) $(UNIXODBC_MODULES) $(JABBER_MODULES) $(CPL_MODULES) $(RADIUS_MODULES) $(PRESENCE_MODULES) $(XMLRPC_MODULES) $(PERL_MODULES) $(SNMPSTATS_MODULES) $(XMPP_MODULES) $(CROUTE_MODULES) $(BERKELEY_MODULES) $(LDAP_MODULES) $(UTILS_MODULES) $(REGEX_MODULES) $(PURPLE_MODULES) $(OSP_MODULES)
-
-# modules not in the "main" package or unstable modules
-EXCLUDED_MODULES = $(ALL_MODULES) pa
-
-# the same but with path prepended (needed for modules="...")
-MYSQL_MOD_PATH=$(addprefix modules/, $(MYSQL_MODULES))
-POSTGRES_MOD_PATH=$(addprefix modules/, $(POSTGRES_MODULES))
-UNIXODBC_MOD_PATH=$(addprefix modules/, $(UNIXODBC_MODULES))
-JABBER_MOD_PATH=$(addprefix modules/, $(JABBER_MODULES))
-CPL_MOD_PATH=$(addprefix modules/, $(CPL_MODULES))
-RADIUS_MOD_PATH=$(addprefix modules/, $(RADIUS_MODULES))
-PRESENCE_MOD_PATH=$(addprefix modules/, $(PRESENCE_MODULES))
-XMLRPC_MOD_PATH=$(addprefix modules/, $(XMLRPC_MODULES))
-PERL_MOD_PATH=$(addprefix modules/, $(PERL_MODULES))
-SNMPSTATS_MOD_PATH=$(addprefix modules/, $(SNMPSTATS_MODULES))
-XMPP_MOD_PATH=$(addprefix modules/, $(XMPP_MODULES))
-CROUTE_MOD_PATH=$(addprefix modules/, $(CROUTE_MODULES))
-BERKELEY_MOD_PATH=$(addprefix modules/, $(BERKELEY_MODULES))
-LDAP_MOD_PATH=$(addprefix modules/, $(LDAP_MODULES))
-UTILS_MOD_PATH=$(addprefix modules/, $(UTILS_MODULES))
-REGEX_MOD_PATH=$(addprefix modules/, $(REGEX_MODULES))
-PURPLE_MOD_PATH=$(addprefix modules/, $(PURPLE_MODULES))
-OSP_MOD_PATH=$(addprefix modules/, $(OSP_MODULES))
-
-ifeq (cc, $(CC))
-	CC = gcc
-endif
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-        CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
 
+%:
+	dh $@ --with quilt
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
 	# Add here commands to configure the package.
+	$(MAKE) FLAVOUR=kamailio cfg prefix=/usr cfg_prefix=$(CURDIR)/debian/kamailio \
+			cfg_target=/etc/kamailio/ \
+			basedir=$(CURDIR)/debian/kamailio \
+			skip_modules="$(EXCLUDED_MODULES) $(EXTRA_EXCLUDED_MODULES)" \
+			group_include="kstandard"
 
 	touch configure-stamp
 
 
 build: build-stamp
-build-stamp: patch-stamp configure-stamp
-	dh_testdir
-
+
+build-stamp: configure-stamp 
+	dh_testdir
 	# Add here commands to compile the package.
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) all skip_modules="$(EXCLUDED_MODULES)" cfg-target=/etc/kamailio/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(MYSQL_MOD_PATH)" cfg-target=/etc/kamailio/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(POSTGRES_MOD_PATH)" cfg-target=/etc/kamailio/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(UNIXODBC_MOD_PATH)" cfg-target=/etc/kamailio/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(JABBER_MOD_PATH)" cfg-target=/etc/kamailio/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(CPL_MOD_PATH)" cfg-target=/etc/kamailio/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(RADIUS_MOD_PATH)" cfg-target=/etc/kamailio/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(PRESENCE_MOD_PATH)" cfg-target=/etc/kamailio/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(XMLRPC_MOD_PATH)" cfg-target=/etc/kamailio/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(PERL_MOD_PATH)" cfg-target=/etc/kamailio/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(SNMPSTATS_MOD_PATH)" cfg-target=/etc/kamailio/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(XMPP_MOD_PATH)" cfg-target=/etc/kamailio/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(CROUTE_MOD_PATH)" cfg-target=/etc/kamailio/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(BERKELEY_MOD_PATH)" cfg-target=/etc/kamailio/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(LDAP_MOD_PATH)" cfg-target=/etc/kamailio/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(UTILS_MOD_PATH)" cfg-target=/etc/kamailio/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(REGEX_MOD_PATH)" cfg-target=/etc/kamailio/
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(PURPLE_MOD_PATH)" cfg-target=/etc/kamailio/
-ifneq (,$(OSP))
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(OSP_MOD_PATH)" cfg-target=/etc/kamailio/
-endif
-
-	# generate the db schemas
-	$(MAKE) dbschema
-
-	# generate the utils db_berkeley
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) utils include_modules="db_berkeley"
-
-	# generate the man pages for modules
-	$(MAKE) modules-docbook-man include_modules="$(ALL_MODULES)"
-
+	$(MAKE) all
+	# make groups
+	$(call PACKAGE_GRP_BUILD_template)
+	# make single-module packages
+	$(call PACKAGE_MODULE_BUILD_template)
 	touch build-stamp
 
-clean: real-clean unpatch
-real-clean:
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-
 	# Add here commands to clean up after the build process.
-	$(MAKE) TLS=$(TLS) include_modules="$(ALL_MODULES)" proper
-	rm -f cfg.tab.h
-	rm -f utils/kamunix/kamunix.o utils/kamunix/kamunix
-	rm -f utils/db_berkeley/kambdb_recover.o utils/db_berkeley/kambdb_recover
-
+	-$(MAKE) maintainer-clean
 	dh_clean
 
 install: build
@@ -185,188 +158,38 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-
 	# Add here commands to install the package into debian/kamailio
-	# kamailio base package
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install skip_modules="$(EXCLUDED_MODULES)" \
-		basedir=$(CURDIR)/debian/kamailio \
-		prefix=/usr \
-		cfg-prefix=$(CURDIR)/debian/kamailio \
-		cfg-target=/etc/kamailio/ \
-		doc-dir=share/doc/kamailio
-
-	find $(CURDIR)/debian/kamailio/etc/kamailio -type f -exec chmod -x {} \;
-	sed -i -e "s/^PATH.*//" $(CURDIR)/debian/kamailio/usr/sbin/kamctl
-
-	# install only the mysql module
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(MYSQL_MOD_PATH)"  \
-		basedir=$(CURDIR)/debian/kamailio-mysql-module \
-		prefix=/usr \
-		cfg-prefix=$(CURDIR)/debian/kamailio-mysql-module \
-		cfg-target=/etc/kamailio/ \
-		doc-dir=share/doc/kamailio-mysql-module
-
-	# install only the postgres module
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(POSTGRES_MOD_PATH)"  \
-		basedir=$(CURDIR)/debian/kamailio-postgres-module \
-		prefix=/usr \
-		cfg-prefix=$(CURDIR)/debian/kamailio-postgres-module \
-		cfg-target=/etc/kamailio/ \
-		doc-dir=share/doc/kamailio-postgres-module
-
-	# install only the unixodbc module
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(UNIXODBC_MOD_PATH)"  \
-		basedir=$(CURDIR)/debian/kamailio-unixodbc-module \
-		prefix=/usr \
-		cfg-prefix=$(CURDIR)/debian/kamailio-unixodbc-module \
-		cfg-target=/etc/kamailio/ \
-		doc-dir=share/doc/kamailio-unixodbc-module
-
-	# install only the jabber module
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(JABBER_MOD_PATH)"  \
-		basedir=$(CURDIR)/debian/kamailio-jabber-module \
-		prefix=/usr \
-		cfg-prefix=$(CURDIR)/debian/kamailio-jabber-module \
-		cfg-target=/etc/kamailio/ \
-		doc-dir=share/doc/kamailio-jabber-module
-
-	# install only the cpl module
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(CPL_MOD_PATH)"  \
-		basedir=$(CURDIR)/debian/kamailio-cpl-module \
-		prefix=/usr \
-		cfg-prefix=$(CURDIR)/debian/kamailio-cpl-module \
-		cfg-target=/etc/kamailio/ \
-		doc-dir=share/doc/kamailio-cpl-module
-
-	# install only the radius modules
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(RADIUS_MOD_PATH)"  \
-		basedir=$(CURDIR)/debian/kamailio-radius-modules \
-		prefix=/usr \
-		cfg-prefix=$(CURDIR)/debian/kamailio-radius-modules \
-		cfg-target=/etc/kamailio/ \
-		doc-dir=share/doc/kamailio-radius-modules
-
-	# install only the presence modules
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(PRESENCE_MOD_PATH)"  \
-		basedir=$(CURDIR)/debian/kamailio-presence-modules \
-		prefix=/usr \
-		cfg-prefix=$(CURDIR)/debian/kamailio-presence-modules \
-		cfg-target=/etc/kamailio/ \
-		doc-dir=share/doc/kamailio-presence-modules
-
-	# install only the xmlrpc module
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(XMLRPC_MOD_PATH)"  \
-		basedir=$(CURDIR)/debian/kamailio-xmlrpc-module \
-		prefix=/usr \
-		cfg-prefix=$(CURDIR)/debian/kamailio-xmlrpc-module \
-		cfg-target=/etc/kamailio/ \
-		doc-dir=share/doc/kamailio-xmlrpc-module
-
-	# install only the perl modules
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(PERL_MOD_PATH)"  \
-		basedir=$(CURDIR)/debian/kamailio-perl-modules \
-		prefix=/usr \
-		cfg-prefix=$(CURDIR)/debian/kamailio-perl-modules \
-		cfg-target=/etc/kamailio/ \
-		doc-dir=share/doc/kamailio-perl-modules
-
-	# install only the snmpstats module
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(SNMPSTATS_MOD_PATH)"  \
-		basedir=$(CURDIR)/debian/kamailio-snmpstats-module \
-		prefix=/usr \
-		cfg-prefix=$(CURDIR)/debian/kamailio-snmpstats-module \
-		cfg-target=/etc/kamailio/ \
-		doc-dir=share/doc/kamailio-snmpstats-module
-
-	# install only the xmpp module
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(XMPP_MOD_PATH)"  \
-		basedir=$(CURDIR)/debian/kamailio-xmpp-module \
-		prefix=/usr \
-		cfg-prefix=$(CURDIR)/debian/kamailio-xmpp-module \
-		cfg-target=/etc/kamailio/ \
-		doc-dir=share/doc/kamailio-xmpp-module
-
-	# install only the carrierroute module
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(CROUTE_MOD_PATH)"  \
-		basedir=$(CURDIR)/debian/kamailio-carrierroute-module \
-		prefix=/usr \
-		cfg-prefix=$(CURDIR)/debian/kamailio-carrierroute-module \
-		cfg-target=/etc/kamailio/ \
-		doc-dir=share/doc/kamailio-carrierroute-module
-
-	# install only the db_berkeley module
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(BERKELEY_MOD_PATH)"  \
-		basedir=$(CURDIR)/debian/kamailio-berkeley-module \
-		prefix=/usr \
-		cfg-prefix=$(CURDIR)/debian/kamailio-berkeley-module \
-		cfg-target=/etc/kamailio/ \
-		doc-dir=share/doc/kamailio-berkeley-module
-
-	# install only the ldap modules
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(LDAP_MOD_PATH)"  \
-		basedir=$(CURDIR)/debian/kamailio-ldap-modules \
-		prefix=/usr \
-		cfg-prefix=$(CURDIR)/debian/kamailio-ldap-modules \
-		cfg-target=/etc/kamailio/ \
-		doc-dir=share/doc/kamailio-ldap-modules
-
-	# install only the utils modules
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(UTILS_MOD_PATH)"  \
-		basedir=$(CURDIR)/debian/kamailio-utils-module \
-		prefix=/usr \
-		cfg-prefix=$(CURDIR)/debian/kamailio-utils-module \
-		cfg-target=/etc/kamailio/ \
-		doc-dir=share/doc/kamailio-utils-module
-
-	# install only the regex modules
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(REGEX_MOD_PATH)"  \
-		basedir=$(CURDIR)/debian/kamailio-regex-modules \
-		prefix=/usr \
-		cfg-prefix=$(CURDIR)/debian/kamailio-regex-modules \
-		cfg-target=/etc/kamailio/ \
-		doc-dir=share/doc/kamailio-regex-modules
-
-	# install only the purple modules
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(PURPLE_MOD_PATH)"  \
-		basedir=$(CURDIR)/debian/kamailio-purple-module \
-		prefix=/usr \
-		cfg-prefix=$(CURDIR)/debian/kamailio-purple-module \
-		cfg-target=/etc/kamailio/ \
-		doc-dir=share/doc/kamailio-purple-module
-
-ifneq (,$(OSP))
-	# install only the OSP module
-	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(OSP_MOD_PATH)"  \
-		basedir=$(CURDIR)/debian/kamailio-osp-module \
-		prefix=/usr \
-		cfg-prefix=$(CURDIR)/debian/kamailio-osp-module \
-		cfg-target=/etc/kamailio/ \
-		doc-dir=share/doc/kamailio-osp-module
-endif
-
-	# the modules packages all ship an empty /usr/sbin directory, let's clean that up
-	for p in $(ALL_PACKAGES); \
-		do rmdir --ignore-fail-on-non-empty $(CURDIR)/debian/$$p/usr/sbin; done
+	$(MAKE) install group_include="kstandard"
+	# make group packages
+	$(call PACKAGE_GRP_INSTALL_template)
+	# make single module packages
+	$(call PACKAGE_MODULE_INSTALL_template)
+	# install /etc/default/kamailio file
+	mkdir -p $(CURDIR)/debian/kamailio/etc/default
+	cp -f debian/kamailio.default $(CURDIR)/debian/kamailio/etc/default/kamailio
+
 
 # This single target is used to build all the packages, all at once, or
 # one at a time. So keep in mind: any options passed to commands here will
 # affect _all_ packages. Anything you want to only affect one package
 # should be put in another target, such as the install target.
-binary-arch: build install
+binary-common: 
 	dh_testdir
 	dh_testroot
+	dh_installdebconf	
 	dh_installdocs
 	dh_installexamples
-#	dh_installlogrotate
+	dh_installmenu
 	dh_installinit -pkamailio -- defaults 23
 	dh_installcron
 	dh_installman
 	dh_installinfo
-	dh_installchangelogs
+	dh_installchangelogs ChangeLog 
 	dh_link
 	dh_strip --dbg-package=kamailio-dbg
-	dh_compress
+	dh_compress 
 	dh_fixperms
+	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
@@ -375,9 +198,18 @@
 
 # Build architecture-independent packages using the common target
 binary-indep: build install
+# (Uncomment this next line if you have such packages.)
+#        $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 # We have nothing to do by default.
 
-binary: binary-indep binary-arch
+
+# Build architecture-dependent packages using the common target
+binary-arch: build install
+	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+# Any other binary targets build just one binary package at a time.
+binary-%: build install
+	$(MAKE) -f debian/rules binary-common DH_OPTIONS=-p$*
 
 print-version:
 	@@echo "Debian version:          $(DEBVERSION)"
@@ -389,4 +221,6 @@
 	@@echo Downloading $(FILENAME) from $(URL) ...
 	@@wget -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
 
-.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch real-clean
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
+

Added: kamailio/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/source/format?rev=9450&op=file
==============================================================================
--- kamailio/trunk/debian/source/format (added)
+++ kamailio/trunk/debian/source/format Tue Jan 24 10:04:45 2012
@@ -1,0 +1,1 @@
+3.0 (quilt)

More information about the Pkg-voip-commits mailing list