updated debian lenny packaging files for K 3.0

- credits to Jonas Bergler <jonas.bergler [at] staff.snap.net.nz>

pkg/kamailio/debian-lenny/changelog

@@ -1,3 +1,10 @@
+kamailio (3.0.0-rc2) unstable; urgency=low
+
+  * update to 3.0.0-rc2 from upstream
+  * updated debian/rules to work with the new style module packaging
+
+ -- Jonas Bergler <[email protected]>  Wed, 18 Nov 2009 12:30:02 +1300
+
 kamailio (1.5.0-svn1) unstable; urgency=low
 
   * increment debian packaging for trunk

pkg/kamailio/debian-lenny/patches/00list

@@ -1,3 +0,0 @@
-10_no_lib64_on_64_bits
-11_always_smp
-

pkg/kamailio/debian-lenny/patches/10_no_lib64_on_64_bits.dpatch

@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_no_lib64_on_64_bits.dpatch by  <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Debian uses /usr/lib even for 64bit architectures.
-
-@DPATCH@
-diff -urNad kamailio-1.2.0~/Makefile.defs kamailio-1.2.0/Makefile.defs
---- kamailio-1.2.0~/Makefile.defs	2007-02-24 12:35:45.000000000 +0100
-+++ kamailio-1.2.0/Makefile.defs	2007-02-24 16:26:45.886854110 +0100
-@@ -123,14 +123,12 @@
- bin-dir = sbin/
- 
- ARCH_B= $(shell echo $(ARCH) | sed -e 's/.*64.*/64b/')
--ifeq ($(ARCH_B),64b)
--	LIBDIR ?= lib64
--else
--	LIBDIR ?= lib
-+ifneq ($(ARCH_B),64b)
- 	# assume 32b - it is not really used further
- 	ARCH_B=32b
- endif
- 
-+LIBDIR ?= lib
- lib-dir = $(LIBDIR)/$(MAIN_NAME)
- modules-dir = $(LIBDIR)/$(MAIN_NAME)/modules/
- 

pkg/kamailio/debian-lenny/patches/11_always_smp.dpatch

@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11_always_smp.dpatch by  <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Always build for SMP.
-
-@DPATCH@
-diff -urNad kamailio-1.2.0~/Makefile.defs kamailio-1.2.0/Makefile.defs
---- kamailio-1.2.0~/Makefile.defs	2007-02-24 16:28:43.152825070 +0100
-+++ kamailio-1.2.0/Makefile.defs	2007-02-24 16:28:46.123102964 +0100
-@@ -82,12 +82,7 @@
- 	endif
- endif
- 
--SMP_STR = $(shell uname -v | grep -i "SMP")
--ifeq (,$(SMP_STR))
--	ISSMP=no
--else
--	ISSMP=yes
--endif
-+ISSMP=yes
- 
- OSREL = $(shell uname -r)
- # numerical version (good for comparisons: A.B.C => A*1000000+B*1000+C)

pkg/kamailio/debian-lenny/rules

@@ -73,6 +73,13 @@ ALL_MODULES = $(MYSQL_MODULES) $(POSTGRES_MODULES) $(UNIXODBC_MODULES) $(JABBER_
 # modules not in the "main" package or unstable modules
 EXCLUDED_MODULES = $(ALL_MODULES) pa osp
 
+# module directories
+MODULE_DIRS=modules modules_s modules_k
+
+# library directories for cleaning up duplicates
+DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/lib/kamailio
+
+
 # the same but with path prepended (needed for modules="...")
 MYSQL_MOD_PATH=$(addprefix modules/, $(MYSQL_MODULES))
 POSTGRES_MOD_PATH=$(addprefix modules/, $(POSTGRES_MODULES))
@@ -146,7 +153,7 @@ build-stamp: patch-stamp configure-stamp
 	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) modules-docbook-man include_modules="$(ALL_MODULES)"
 
 	touch build-stamp
 
@@ -172,58 +179,65 @@ install: build
 
 	# 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)" \
+	#CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install skip_modules="$(EXCLUDED_MODULES)" \
+	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install \
 		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 {} \;
+	# 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)"  \
+	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(MYSQL_MOD_PATH)" \
+		modules_s="" modules_k="" \
 		basedir=$(CURDIR)/debian/kamailio-mysql-module \
 		prefix=/usr \
-		cfg-prefix=$(CURDIR)/debian/kamailio-mysql-module \
 		cfg-target=/etc/kamailio/ \
+		cfg-prefix=$(CURDIR)/debian/kamailio-mysql-module \
 		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)"  \
+	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(POSTGRES_MOD_PATH)" \
+		modules_s="" modules_k="" \
 		basedir=$(CURDIR)/debian/kamailio-postgres-module \
 		prefix=/usr \
-		cfg-prefix=$(CURDIR)/debian/kamailio-postgres-module \
 		cfg-target=/etc/kamailio/ \
+		cfg-prefix=$(CURDIR)/debian/kamailio-postgres-module \
 		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)"  \
+	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(UNIXODBC_MOD_PATH)" \
+		modules_s="" modules_k="" \
 		basedir=$(CURDIR)/debian/kamailio-unixodbc-module \
 		prefix=/usr \
-		cfg-prefix=$(CURDIR)/debian/kamailio-unixodbc-module \
 		cfg-target=/etc/kamailio/ \
+		cfg-prefix=$(CURDIR)/debian/kamailio-unixodbc-module \
 		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)"  \
+	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(JABBER_MOD_PATH)" \
+		modules_s="" modules_k="" \
 		basedir=$(CURDIR)/debian/kamailio-jabber-module \
 		prefix=/usr \
-		cfg-prefix=$(CURDIR)/debian/kamailio-jabber-module \
 		cfg-target=/etc/kamailio/ \
+		cfg-prefix=$(CURDIR)/debian/kamailio-jabber-module \
 		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)"  \
+	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(CPL_MOD_PATH)" \
+		modules_s="" modules_k="" \
 		basedir=$(CURDIR)/debian/kamailio-cpl-module \
 		prefix=/usr \
-		cfg-prefix=$(CURDIR)/debian/kamailio-cpl-module \
 		cfg-target=/etc/kamailio/ \
+		cfg-prefix=$(CURDIR)/debian/kamailio-cpl-module \
 		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)"  \
+		modules_s="" modules_k="" \
 		basedir=$(CURDIR)/debian/kamailio-radius-modules \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/kamailio-radius-modules \
@@ -232,6 +246,7 @@ install: build
 
 	# install only the presence modules
 	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(PRESENCE_MOD_PATH)"  \
+		modules_s="" modules_k="" \
 		basedir=$(CURDIR)/debian/kamailio-presence-modules \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/kamailio-presence-modules \
@@ -240,6 +255,7 @@ install: build
 
 	# install only the xmlrpc module
 	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(XMLRPC_MOD_PATH)"  \
+		modules_s="" modules_k="" \
 		basedir=$(CURDIR)/debian/kamailio-xmlrpc-module \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/kamailio-xmlrpc-module \
@@ -248,6 +264,7 @@ install: build
 
 	# install only the perl modules
 	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(PERL_MOD_PATH)"  \
+		modules_s="" modules_k="" \
 		basedir=$(CURDIR)/debian/kamailio-perl-modules \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/kamailio-perl-modules \
@@ -256,6 +273,7 @@ install: build
 
 	# install only the snmpstats module
 	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(SNMPSTATS_MOD_PATH)"  \
+		modules_s="" modules_k="" \
 		basedir=$(CURDIR)/debian/kamailio-snmpstats-module \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/kamailio-snmpstats-module \
@@ -264,6 +282,7 @@ install: build
 
 	# install only the xmpp module
 	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(XMPP_MOD_PATH)"  \
+		modules_s="" modules_k="" \
 		basedir=$(CURDIR)/debian/kamailio-xmpp-module \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/kamailio-xmpp-module \
@@ -272,6 +291,7 @@ install: build
 
 	# install only the carrierroute module
 	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(CROUTE_MOD_PATH)"  \
+		modules_s="" modules_k="" \
 		basedir=$(CURDIR)/debian/kamailio-carrierroute-module \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/kamailio-carrierroute-module \
@@ -280,6 +300,7 @@ install: build
 
 	# install only the db_berkeley module
 	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(BERKELEY_MOD_PATH)"  \
+		modules_s="" modules_k="" \
 		basedir=$(CURDIR)/debian/kamailio-berkeley-module \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/kamailio-berkeley-module \
@@ -288,6 +309,7 @@ install: build
 
 	# install only the ldap modules
 	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(LDAP_MOD_PATH)"  \
+		modules_s="" modules_k="" \
 		basedir=$(CURDIR)/debian/kamailio-ldap-modules \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/kamailio-ldap-modules \
@@ -296,6 +318,7 @@ install: build
 
 	# install only the utils modules
 	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(UTILS_MOD_PATH)"  \
+		modules_s="" modules_k="" \
 		basedir=$(CURDIR)/debian/kamailio-utils-module \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/kamailio-utils-module \
@@ -304,6 +327,7 @@ install: build
 
 	# install only the regex modules
 	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(REGEX_MOD_PATH)"  \
+		modules_s="" modules_k="" \
 		basedir=$(CURDIR)/debian/kamailio-regex-modules \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/kamailio-regex-modules \
@@ -320,15 +344,29 @@ install: build
 
 	# install only the memcached modules
 	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(MEMCACHED_MOD_PATH)"  \
+		modules_s="" modules_k="" \
 		basedir=$(CURDIR)/debian/kamailio-memcached-module \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/kamailio-memcached-module \
 		cfg-target=/etc/kamailio/ \
 		doc-dir=share/doc/kamailio-memcached-module
 
+	# eliminate duplicate libs
+	-for p in $(ALL_PACKAGES); do \
+		echo "### Processing duplicate libs for '$$p'"; \
+		for d in $(DUP_LIBS_DIRS); do \
+			test "$$d" != "$(CURDIR)/debian/$$p/usr/lib/kamailio" &&\
+			for r in $$d/lib*; do \
+				echo " removing $$p lib `basename $$r` present also in $$d";\
+				rm -f $(CURDIR)/debian/$$p/usr/lib/kamailio/`basename "$$r"` ; \
+			done ; \
+		done ; \
+	done
+
+
 	# 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
+	#for p in $(ALL_PACKAGES); \
+	#	do rmdir --ignore-fail-on-non-empty $(CURDIR)/debian/$$p/usr/sbin; done
 
 # 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
@@ -350,7 +388,8 @@ binary-arch: build install
 	dh_compress 
 	dh_fixperms
 	dh_installdeb
-	dh_shlibdeps
+	dh_makeshlibs
+	LD_LIBRARY_PATH="$(CURDIR)/debian/kamailio/usr/lib/kamailio/" dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb