[Pkg-voip-commits] r9463 - in /kamailio/trunk/debian: changelog rules

[maniac-guest at alioth.debian.org]

Author: maniac-guest
Date: Wed Feb  1 22:05:31 2012
New Revision: 9463

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9463
Log:
Fix modules templates

Modified:
    kamailio/trunk/debian/changelog
    kamailio/trunk/debian/rules

Modified: kamailio/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/changelog?rev=9463&op=diff
==============================================================================
--- kamailio/trunk/debian/changelog (original)
+++ kamailio/trunk/debian/changelog Wed Feb  1 22:05:31 2012
@@ -5,6 +5,7 @@
     + replaced for the kamailio debian/rules. 
     + fix get-orig-source. Update URL
     + change UPVERSION initialitation. Now bpo versions works too
+    + fix modules cleanup install.
   * Switch to dpkg-source 3.0 (quilt) format
   * debian/control:
     + remove dpatch
@@ -17,7 +18,7 @@
   * debian/kamailio.init:
     + add $remote_fs (lintian suggestion)
 
- -- Victor Seva <linuxmaniac at torreviejawireless.org>  Wed, 01 Feb 2012 20:00:24 +0100
+ -- Victor Seva <linuxmaniac at torreviejawireless.org>  Wed, 01 Feb 2012 23:03:27 +0100
 
 kamailio (1.5.1-2) unstable; urgency=low
 

Modified: kamailio/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/rules?rev=9463&op=diff
==============================================================================
--- kamailio/trunk/debian/rules (original)
+++ kamailio/trunk/debian/rules Wed Feb  1 22:05:31 2012
@@ -36,7 +36,7 @@
 PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \
 			   ldap xml perl utils memcached \
 			   snmpstats carrierroute xmpp cpl lua python geoip\
-			   sqlite json
+			   sqlite json xmlrpc
 
 # name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b)
 LIBDIR ?= lib
@@ -78,11 +78,12 @@
 		# 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 \
+			for r in `find $$d -name 'lib*'|xargs`; 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
+		find $(CURDIR)/debian/kamailio-$(grp)-modules -depth -empty -type d -exec rmdir {} \;
 	)
 endef
 
@@ -91,16 +92,17 @@
 	$(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
+				basedir=$(CURDIR)/debian/kamailio-$(call mod_name,$(mod))-modules \
+				doc-dir=share/doc/kamailio-$(call mod_name,$(mod))-modules
 		# 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 \
+			test "$$d" != "$(CURDIR)/debian/kamailio-$(callmod_name,$(mod))-modules/usr/$(LIBDIR)/kamailio" &&\
+			for r in `find $$d -name 'lib*'|xargs`; 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"` ; \
+				rm -f $(CURDIR)/debian/kamailio-$(callmod_name,$(mod))-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"` ; \
 			done ; \
 		done
+		find $(CURDIR)/debian/kamailio-$(callmod_name,$(mod))-modules -depth -empty -type d -exec rmdir {} \;
 	)
 endef
 
@@ -171,7 +173,7 @@
 	dh_testdir
 	dh_testroot
 	dh_installdebconf	
-	dh_installdocs
+	dh_installdocs -XINSTALL
 	dh_installexamples
 	dh_installmenu
 	dh_installinit -pkamailio -- defaults 23