- remove debian-sarge, etch is now oldstable

- copy debian to debian-lenny, to enable changes for new unstable


git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5664 689a6050-402a-0410-94f2-e92a70836424

pkg/kamailio/debian-lenny/compat

@@ -0,0 +1 @@
+5

pkg/kamailio/debian-sarge/control → pkg/kamailio/debian-lenny/control

@@ -3,8 +3,11 @@ Section: net
 Priority: optional
 Maintainer: Debian VoIP Team <[email protected]>
 Uploaders: Kilian Krause <[email protected]>
-Build-Depends: debhelper (>= 4), dpatch, libmysqlclient14-dev | libmysqlclient-dev, libexpat1-dev, libxml2-dev, postgresql-dev, libradius-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp5-dev, libdb4.3-dev, libsensors-dev, xsltproc, libconfuse-dev, libldap2-dev, libcurl3-dev, python, docbook-xml
-Standards-Version: 3.7.2
+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
+Standards-Version: 3.8.0
+Homepage: http://www.kamailio.org/
+Vcs-Svn: svn://svn.debian.org/pkg-voip/kamailio/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/kamailio/?op=log
 
 Package: kamailio
 Architecture: any
@@ -30,8 +33,8 @@ Description: very fast and configurable SIP proxy
 Package: kamailio-dbg
 Priority: extra
 Architecture: any
-Depends: kamailio (= ${Source-Version})
-Conflicts: kamailio (<< ${Source-Version})
+Depends: kamailio (= ${binary:Version})
+Conflicts: kamailio (<< ${binary:Version})
 Description: very fast and configurable SIP proxy [debug symbols]
  Kamailio is a very fast and flexible SIP (RFC3261)
  proxy server. Written entirely in C, Kamailio can handle thousands calls
@@ -42,7 +45,7 @@ Description: very fast and configurable SIP proxy [debug symbols]
 
 Package: kamailio-mysql-module
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version}), mysql-client
+Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), mysql-client
 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
@@ -52,7 +55,7 @@ Description: MySQL database connectivity module for Kamailio
 
 Package: kamailio-postgres-module
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version}), postgresql-client
+Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), postgresql-client
 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
@@ -62,7 +65,7 @@ Description: PostgreSQL database connectivity module for Kamailio
 
 Package: kamailio-jabber-module
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
 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
@@ -72,7 +75,7 @@ Description: Jabber gateway module for Kamailio
 
 Package: kamailio-cpl-module
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
 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
@@ -83,7 +86,7 @@ Description: CPL module (CPL interpreter engine) for Kamailio
 
 Package: kamailio-radius-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
 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
@@ -95,7 +98,7 @@ Description: radius modules for Kamailio
 
 Package: kamailio-unixodbc-module 
 Architecture: any 
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
 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 
@@ -105,7 +108,7 @@ Description: unixODBC database connectivity module for Kamailio
 
 Package: kamailio-presence-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
 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
@@ -117,7 +120,7 @@ Description: SIMPLE presence modules for Kamailio
 
 Package: kamailio-xmlrpc-module
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
 Description: XMLRPC 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
@@ -128,7 +131,7 @@ Description: XMLRPC support for Kamailio's Management Interface
 
 Package: kamailio-perl-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
 Replaces: kamailio-perl-module
 Conflicts: kamailio-perl-module
 Description: Perl extensions and database driver for Kamailio
@@ -141,7 +144,7 @@ Description: Perl extensions and database driver for Kamailio
 
 Package: kamailio-snmpstats-module
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version}), snmpd
+Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), snmpd
 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
@@ -152,7 +155,7 @@ Description: SNMP AgentX subagent module for Kamailio
 
 Package: kamailio-xmpp-module
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
 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
@@ -162,7 +165,7 @@ Description: XMPP gateway module for Kamailio
 
 Package: kamailio-carrierroute-module
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
 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
@@ -173,7 +176,7 @@ Description: Carrierroute module for Kamailio
 
 Package: kamailio-berkeley-module
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version}), db4.3-util
+Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), db4.6-util
 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
@@ -185,7 +188,7 @@ Description: Berkeley Database module for Kamailio
 
 Package: kamailio-ldap-modules
 Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${Source-Version})
+Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
 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
@@ -203,8 +206,8 @@ Description: Provides a set utility functions for Kamailio
  proxy server. Written entirely in C, Kamailio can handle thousands calls
  per second even on low-budget hardware.
  .
- This package provides a set of utility functions for Kamailio, which are
- not related to the server configuration.
+ Provides a set of utility functions for Kamailio, which are not related
+ to the server configuration.
 
 Package: kamailio-regex-modules
 Architecture: any
@@ -215,3 +218,14 @@ Description: Provides the lcr, diaplan and regex modules
  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.

pkg/kamailio/debian-sarge/kamailio.default → pkg/kamailio/debian-lenny/kamailio.default

@@ -19,6 +19,6 @@ MEMORY=64
 # or 'no' to disable this feature. This option is case sensitive and only
 # accepts 'yes' and 'no' and only in lowercase letters.
 # On some systems (e.g. Ubuntu 6.10, Debian 4.0) it is necessary to specify
-# a directory for the core files to get the dump. Look into the kamailio
+# a directory for the core files to get a dump. Look into the kamailio
 # init file for an example configuration.
 DUMP_CORE=no

pkg/kamailio/debian-sarge/kamailio.init → pkg/kamailio/debian-lenny/kamailio.init

@@ -93,7 +93,7 @@ MEMORY=$((`echo $MEMORY | sed -e 's/[^0-9]//g'`))
 if test "$DUMP_CORE" = "yes" ; then
     # set proper ulimit
     ulimit -c unlimited
-
+    
     # directory for the core dump files
     # COREDIR=/home/corefiles
     # [ -d $COREDIR ] || mkdir $COREDIR

pkg/kamailio/debian-sarge/rules → pkg/kamailio/debian-lenny/rules

@@ -2,8 +2,6 @@
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
-DH_COMPAT=$(shell cat $(CURDIR)/debian/compat)
-
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 ALL_PACKAGES = kamailio kamailio-mysql-module kamailio-postgres-module \
@@ -11,7 +9,7 @@ ALL_PACKAGES = kamailio kamailio-mysql-module kamailio-postgres-module \
 	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-utils-module kamailio-regex-modules kamailio-purple-module
 
 DEBVERSION:=$(shell head -n 1 debian/changelog \
                     | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
@@ -45,7 +43,7 @@ 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
+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
@@ -64,8 +62,10 @@ LDAP_MODULES = ldap h350
 UTILS_MODULES = utils
 # modules depending on libpcre
 REGEX_MODULES = dialplan regex lcr
+# purple module
+PURPLE_MODULES = purple
 
-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)
+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)
 
 # modules not in the "main" package or unstable modules
 EXCLUDED_MODULES = $(ALL_MODULES) pa osp
@@ -87,6 +87,7 @@ 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))
 
 ifeq (cc, $(CC))
 	CC = gcc
@@ -134,6 +135,7 @@ build-stamp: patch-stamp configure-stamp
 	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/
 
 	# generate the utils db_berkeley
 	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) utils include_modules="db_berkeley"
@@ -303,6 +305,14 @@ install: build
 		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
+
 	# 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
@@ -323,17 +333,7 @@ binary-arch: build install
 	dh_installinfo
 	dh_installchangelogs
 	dh_link
-# Emulate debhelper v5 behaviour for Sarge backports with debhelper v4
-ifeq ($(DH_COMPAT),4)
-	dh_strip --keep-debug
-	mkdir -p $(CURDIR)/debian/kamailio-dbg/usr/lib/debug
-	for p in $(ALL_PACKAGES); do \
-		tar cf - -C $(CURDIR)/debian/$$p/usr/lib/debug . | tar xf - -C $(CURDIR)/debian/kamailio-dbg/usr/lib/debug \
-			&& rm -rf $(CURDIR)/debian/$$p/usr/lib/debug; \
-	done
-else
 	dh_strip --dbg-package=kamailio-dbg
-endif
 	dh_compress 
 	dh_fixperms
 	dh_installdeb

pkg/kamailio/debian-sarge/compat

@@ -1 +0,0 @@
-4