MT#5891 fix lintian warnings

debian/control

@@ -50,7 +50,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/kamailio/?op=log
 
 Package: ngcp-kamailio
 Architecture: any
-Multi-Arch: same
+Multi-Arch: foreign
 Pre-Depends: ${misc:Pre-Depends}
 Depends: adduser, python, ${misc:Depends}, ${shlibs:Depends}
 Conflicts: kamailio
@@ -425,7 +425,7 @@ Description: Berkeley database module for Kamailio
 
 Package: ngcp-kamailio-berkeley-bin
 Architecture: any
-Multi-Arch: same
+Multi-Arch: foreign
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Conflicts: kamailio-berkeley-bin
@@ -530,7 +530,7 @@ Package: ngcp-kamailio-java-modules
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: gjc-jre,
+Depends: gcj-jre,
          ngcp-kamailio (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}

debian/ngcp-kamailio-autheph-modules.lintian-overrides

@@ -0,0 +1 @@
+ngcp-kamailio-autheph-modules binary: possible-gpl-code-linked-with-openssl

debian/ngcp-kamailio-dnssec-modules.lintian-overrides

@@ -0,0 +1 @@
+ngcp-kamailio-dnssec-modules binary: possible-gpl-code-linked-with-openssl

debian/ngcp-kamailio-outbound-modules.lintian-overrides

@@ -0,0 +1 @@
+ngcp-kamailio-outbound-modules binary: possible-gpl-code-linked-with-openssl

debian/ngcp-kamailio-tls-modules.lintian-overrides

@@ -0,0 +1 @@
+ngcp-kamailio-tls-modules binary: possible-gpl-code-linked-with-openssl

debian/ngcp-kamailio-websocket-modules.lintian-overrides

@@ -0,0 +1 @@
+ngcp-kamailio-websocket-modules binary: possible-gpl-code-linked-with-openssl

debian/ngcp-kamailio.lintian-overrides

@@ -0,0 +1,2 @@
+ngcp-kamailio: postrm-contains-additional-updaterc.d-calls etc/init.d/kamailio-proxy
+ngcp-kamailio: postrm-contains-additional-updaterc.d-calls etc/init.d/kamailio-lb

debian/ngcp-kamailio.preinst

@@ -4,25 +4,7 @@ set -e
 
 case "$1" in
     install|upgrade)
-        # updating from an OpenSER installation
-        if dpkg --compare-versions "$2" "<" "1.4.0"; then
-            # check for old configuration
-            if [ -r /etc/openser/openser.cfg ]; then
-                echo "Found old OpenSER installation, trying to move configuration files to new location."
-                mkdir -p /etc/kamailio
-                mv /etc/openser/openser.cfg /etc/kamailio/kamailio.cfg
-                echo "Moved \"/etc/openser/openser.cfg\" to \"/etc/kamailio/kamailio.cfg\"."
-                if [ -r /etc/openser/openserctlrc ]; then
-                    mv /etc/openser/openserctlrc /etc/kamailio/kamctlrc
-                    echo "Moved \"/etc/openser/openserctlrc\" to \"/etc/kamailio/kamctlrc\"."
-                fi
-                if [ -r /etc/default/openser ]; then
-                    mv /etc/default/openser /etc/default/kamailio
-                    echo "Moved \"/etc/default/openser\" to \"/etc/default/kamailio\"."
-                fi
-                echo "Please take a look at kamailio.README.debian about how to upgrade your configuration."
-            fi
-        elif dpkg --compare-versions "$2" "<" "4.1.0"; then
+        if dpkg --compare-versions "$2" "<" "4.1.0"; then
             # sync_branch is obsolete
             if [ -f /etc/default/kamailio.lb ]; then
                 sed -e 's/RUN_KAMAILIO=yes/RUN_KAMAILIO=no/' -i /etc/default/kamailio.lb
@@ -36,7 +18,7 @@ case "$1" in
 
     abort-upgrade)
         ;;
-    
+
     *)
         echo "preinst called with unknown argument \`$1'" >&2
         exit 1

debian/rules

@@ -21,7 +21,7 @@ include /usr/share/dpkg/buildflags.mk
 #export DH_VERBOSE=1
 
 # modules not in the "main" kamailio package
-EXCLUDED_MODULES= 
+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,
@@ -106,7 +106,7 @@ configure-stamp:
 build: build-stamp
 build-arch: build-stamp
 build-indep: build-stamp
-build-stamp: configure-stamp 
+build-stamp: configure-stamp
 	dh_testdir
 	# Add here commands to compile the package.
 	$(MAKE) -j`nproc` all
@@ -134,22 +134,22 @@ install: build
 	# make group packages
 	$(call PACKAGE_GRP_INSTALL_template)
 	mv $(CURDIR)/debian/$(PKG_NAME)-berkeley-modules/usr/sbin/kambdb_recover \
-		$(CURDIR)/debian/$(PKG_NAME)-berkeley-bin/usr/sbin/kambdb_recover 
+		$(CURDIR)/debian/$(PKG_NAME)-berkeley-bin/usr/sbin/kambdb_recover
 
 
 # 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-common: 
+binary-common:
 	dh_testdir
 	dh_testroot
-	dh_installdebconf	
+	dh_installdebconf
 	dh_installdocs
 	dh_installexamples
 	dh_installmenu
-	dh_installinit --name=kamailio-lb -- defaults 23
-	dh_installinit --name=kamailio-proxy -- defaults 23
+	dh_installinit -n --name=kamailio-lb -- defaults 23
+	dh_installinit -n --name=kamailio-proxy -- defaults 23
 	dh_installcron
 	dh_installman
 	dh_installinfo
@@ -157,7 +157,7 @@ binary-common:
 	dh_lintian
 	dh_link
 	dh_strip --dbg-package=$(PKG_NAME)-dbg
-	dh_compress 
+	dh_compress
 	dh_fixperms
 	dh_makeshlibs
 	dh_installdeb

debian/source.lintian-overrides

@@ -1,2 +0,0 @@
-# can be removed when/if the code is moved to GnuTLS
-ngcp-kamailio-tls-modules source: possible-gpl-code-linked-with-openssl