Merge packaging from trunk

pkg/kamailio/deb/squeeze/changelog

@@ -1,3 +1,14 @@
+kamailio (3.3+ngcp2.6.5) unstable; urgency=low
+
+  [ Michael Prokop ]
+  * kamailio.postinst: postinst: do not exit if update-rc.d does not work
+
+  [ jbonilla ]
+  * kamailio.postinst: Remove debhelper mark fomr postinst script
+  * rules: disable dh_installdebconf
+
+ -- Jon Bonilla <jbonilla@sipwise.com>  Wed, 29 Aug 2012 10:30:35 +0200
+
 kamailio (3.3+ngcp2.6.4) unstable; urgency=low
 
   * Conflict with ngcp-system-tools-* packages.

pkg/kamailio/deb/squeeze/kamailio.postinst

@@ -1,13 +1,10 @@
 #! /bin/sh
 #
-# $Id$
-
-PKG=kamailio
-DEFAULTS=/etc/default/kamailio
-HOMEDIR=/var/run/kamailio
 
 set -e
 
+HOMEDIR=/var/run/kamailio
+
 restart_handler() {
   [ -n "$1" ] || return 1
 
@@ -24,7 +21,9 @@ initscript_handler() {
   [ -n "$1" ] || return 1
 
   if [ -x "/etc/init.d/$1" ]; then
-    update-rc.d "$1" defaults >/dev/null
+    if ! update-rc.d "$1" defaults >/dev/null ; then
+      echo "Warning: update-rc.d could not be executed, might be caused by mysql not available yet."
+    fi
     invoke-rc.d "$1" start || exit $?
   fi
 }
@@ -50,13 +49,12 @@ case "$1" in
     configure)
         adduser --quiet --system --group --disabled-password \
                 --shell /bin/false --gecos "Kamailio" \
-                --home $HOMEDIR kamailio || true
+                --home "$HOMEDIR" kamailio || true
         init_handler kamailio-lb
         init_handler kamailio-proxy
         ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
-
         ;;
 
     *)
@@ -65,5 +63,3 @@ case "$1" in
         ;;
 esac
 
-#DEBHELPER#
-

pkg/kamailio/deb/squeeze/rules

@@ -178,7 +178,7 @@ install: build
 binary-common: 
 	dh_testdir
 	dh_testroot
-	dh_installdebconf	
+#	dh_installdebconf	
 	dh_installdocs
 	dh_installexamples
 	dh_installmenu