Merging a bunch of Debian packaging fixes from AnAnt, the package should be

Lintian clean now (or at least *much* cleaner than before). Thanks!

16 files changed, 66 insertions, 29 deletions

diff --git a/debian/bitlbee-common.config b/debian/bitlbee-common.config
index 9bb78237..c2437b54 100644
--- a/debian/bitlbee-common.config
+++ b/debian/bitlbee-common.config
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 . /usr/share/debconf/confmodule
 [ -f /etc/default/bitlbee ] && . /etc/default/bitlbee
diff --git a/debian/bitlbee-common.init b/debian/bitlbee-common.init
index be1dcd66..fd10b0af 100644
--- a/debian/bitlbee-common.init
+++ b/debian/bitlbee-common.init
@@ -4,10 +4,10 @@
 # Required-Start:    $remote_fs $syslog
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
-# Default-Stop:      1
+# Default-Stop:      0 1 6
+# Short-Description:       Start and stop BitlBee IRC to other chat networks gateway
 ### END INIT INFO
 #
-# Init script for BitlBee Debian package. Based on skeleton init script:
 #
 # Version:	@(#)skeleton  2.85-23  28-Jul-2004  miquels@cistron.nl
 #
diff --git a/debian/bitlbee-common.postinst b/debian/bitlbee-common.postinst
index c965e09c..3225a02a 100644
--- a/debian/bitlbee-common.postinst
+++ b/debian/bitlbee-common.postinst
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 . /usr/share/debconf/confmodule
 
@@ -15,7 +17,7 @@ BITLBEE_DISABLED=0
 BITLBEE_UPGRADE_DONT_RESTART=0
 [ -r /etc/default/bitlbee ] && . /etc/default/bitlbee
 
-if [ "$BITLBEE_DISABLED" = "0" ] && type update-inetd > /dev/null 2> /dev/null &&
+if [ "$BITLBEE_DISABLED" = "0" ] && which update-inetd > /dev/null 2> /dev/null &&
    ( expr "$2" : '0\..*' > /dev/null || expr "$2" : '1\.0\..*' > /dev/null ); then
 	## Make sure the inetd entry is gone (can still be there from a
 	## previous version.
@@ -70,7 +72,7 @@ fi
 # works since the debconf code will pick a free port on new installs.
 if [ "$BITLBEE_UPGRADE_DONT_RESTART" != "1" ]; then
 	unset IS_UPGRADE
-	if type netstat > /dev/null 2> /dev/null; then
+	if which netstat > /dev/null 2> /dev/null; then
 		netstat -an | grep -q :$PORT\\b.*LISTEN && IS_UPGRADE=1
 	else
 		[ -n "$2" ] && IS_UPGRADE=1
diff --git a/debian/bitlbee-common.postrm b/debian/bitlbee-common.postrm
index 5c3b4b2e..de48e229 100644
--- a/debian/bitlbee-common.postrm
+++ b/debian/bitlbee-common.postrm
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 [ "$1" = "purge" ] || exit 0
 
diff --git a/debian/bitlbee-common.prerm b/debian/bitlbee-common.prerm
index 50a49bee..768ddc15 100644
--- a/debian/bitlbee-common.prerm
+++ b/debian/bitlbee-common.prerm
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 if [ "$1" = "upgrade" ]; then
 	## To prevent the help function from breaking in currently running
diff --git a/debian/bitlbee-libpurple.lintian-overrides b/debian/bitlbee-libpurple.lintian-overrides
new file mode 100644
index 00000000..171dc61f
--- /dev/null
+++ b/debian/bitlbee-libpurple.lintian-overrides
@@ -0,0 +1,2 @@
+# manpage is installed in bitlbee-common, which bitlbee depends on
+bitlbee-libpurple: binary-without-manpage usr/sbin/bitlbee
diff --git a/debian/bitlbee.lintian-overrides b/debian/bitlbee.lintian-overrides
new file mode 100644
index 00000000..d2e25f8e
--- /dev/null
+++ b/debian/bitlbee.lintian-overrides
@@ -0,0 +1,2 @@
+# manpage is installed in bitlbee-common, which bitlbee depends on
+bitlbee: binary-without-manpage usr/sbin/bitlbee
diff --git a/debian/bitlbee.prerm b/debian/bitlbee.prerm
index c61db24b..eeba2862 100644
--- a/debian/bitlbee.prerm
+++ b/debian/bitlbee.prerm
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 if [ "$1" != "upgrade" ]; then
 	invoke-rc.d bitlbee stop || exit 0
diff --git a/debian/changelog b/debian/changelog
index 5532b95d..a2711f84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+bitlbee (3.0-2) UNRELEASED; urgency=low
+
+  * debian/bitlbee-common.postinst: Replace 'type' with 'which' to avoid
+    bashism.
+  * debian/{*.prerm, *.postinst, *.postrm, *.config}: use set -e in the body
+    of maintainer scripts.
+  * debian/control:
+    + Corrected short description of bitlbee-plugin-otr
+    + Bumped Standards-Version to 3.9.1
+    + Added ${misc:Depends} for bitlbee & bitlbee-libpurple
+    + Moved dependency on adduser to bitlbee-common
+    + Bumped debhelper version to 6.0.7~ for dh_lintian
+  * debian/copyright: Refer to /usr/share/common-licenses/GPL-2
+  * Added lintian overrides for bitlbee & bitlbee-libpurple
+  * Explicitly set source format to 1.0
+  * debian/bitlbee-common.init:
+    + Add Short-Description header.
+    + Also stop at runlevels 0 and 6.
+
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org>  Mon, 25 Oct 2010 16:56:24 +0200
+
 bitlbee (3.0-1) unstable; urgency=low
 
   * A milestone upstream release. See the non-Debian changelog.
diff --git a/debian/control b/debian/control
index a21e65ab..d9101cdf 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,15 @@ Section: net
 Priority: optional
 Maintainer: Wilmer van der Gaast <wilmer@gaast.net>
 Uploaders: Jelmer Vernooij <jelmer@samba.org>
-Standards-Version: 3.8.4
-Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), po-debconf, libpurple-dev, libotr2-dev, debhelper (>= 6)
+Standards-Version: 3.9.1
+Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), po-debconf, libpurple-dev, libotr2-dev, debhelper (>= 6.0.7~)
 Homepage: http://www.bitlbee.org/
 Vcs-Bzr: http://code.bitlbee.org/bitlbee/
 DM-Upload-Allowed: yes
 
 Package: bitlbee
 Architecture: any
-Depends: ${shlibs:Depends}, adduser, debianutils (>= 1.16), bitlbee-common (= ${bee:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${bee:Version})
 Conflicts: bitlbee-libpurple
 Replaces: bitlbee-libpurple
 Description: An IRC to other chat networks gateway (default version)
@@ -21,7 +21,7 @@ Description: An IRC to other chat networks gateway (default version)
 
 Package: bitlbee-libpurple
 Architecture: any
-Depends: ${shlibs:Depends}, adduser, debianutils (>= 1.16), bitlbee-common (= ${bee:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${bee:Version})
 Conflicts: bitlbee
 Replaces: bitlbee
 Description: An IRC to other chat networks gateway (using libpurple)
@@ -39,7 +39,7 @@ Description: An IRC to other chat networks gateway (using libpurple)
 
 Package: bitlbee-common
 Architecture: all
-Depends: ${misc:Depends}, net-tools
+Depends: ${misc:Depends}, net-tools, adduser
 Replaces: bitlbee
 Description: An IRC to other chat networks gateway (common files/docs)
  This program can be used as an IRC server which forwards everything you
@@ -62,7 +62,7 @@ Description: An IRC to other chat networks gateway (dev files)
 Package: bitlbee-plugin-otr
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${bee:Version}) | bitlbee-libpurple (= ${bee:Version}), bitlbee-common (= ${bee:Version})
-Description: An IRC to other chat networks gateway (default version)
+Description: An IRC to other chat networks gateway (OTR plugin)
  This program can be used as an IRC server which forwards everything you
  say to people on other chat networks: Jabber (which includes Google Talk
  and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
diff --git a/debian/copyright b/debian/copyright
index 03db5c7a..a29a43b3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -24,7 +24,7 @@ BitlBee License:
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License with
-  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2;
   if not, write to the Free Software Foundation, Inc., 51 Franklin St, 
   Fifth Floor, Boston, MA 02110-1301, USA.
 ============================================================================
diff --git a/debian/rules b/debian/rules
index 8cc46b87..221587ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -86,6 +86,7 @@ binary-common:
 	dh_installdebconf
 	dh_installinit --init-script=bitlbee
 	dh_installman
+	dh_lintian
 	dh_strip
 	dh_link
 	dh_compress
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 00000000..d3827e75
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0
diff --git a/doc/bitlbee.8 b/doc/bitlbee.8
index 36576e59..d01ec39e 100644
--- a/doc/bitlbee.8
+++ b/doc/bitlbee.8
@@ -18,21 +18,21 @@ BitlBee \- IRC gateway to IM chat networks
 .SH SYNOPSIS
 .PP
 .B bitlbee
-[-I]
-[-c \fIconfiguration file\fP]
-[-d \fIconfiguration directory\fP]
+[\-I]
+[\-c \fIconfiguration file\fP]
+[\-d \fIconfiguration directory\fP]
 .PP
 .B bitlbee
--D
-[-i \fIaddress\fP]
-[-p \fIport number\fP]
-[-n]
-[-v]
-[-c \fIconfiguration file\fP]
-[-d \fIconfiguration directory\fP]
+\-D
+[\-i \fIaddress\fP]
+[\-p \fIport number\fP]
+[\-n]
+[\-v]
+[\-c \fIconfiguration file\fP]
+[\-d \fIconfiguration directory\fP]
 .PP
 .B bitlbee
--h
+\-h
 .RI
 .SH DESCRIPTION
 BitlBee is an IRC daemon that can talk to instant messaging 
diff --git a/protocols/oscar/chatnav.c b/protocols/oscar/chatnav.c
index d94d3c7b..7cfc52af 100644
--- a/protocols/oscar/chatnav.c
+++ b/protocols/oscar/chatnav.c
@@ -371,7 +371,7 @@ static int parseinfo(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, ai
 	}
 
 	if (snac2->family != 0x000d) {
-		imcb_error(sess->aux_data, "recieved response that maps to corrupt request!");
+		imcb_error(sess->aux_data, "received response that maps to corrupt request!");
 		return 0;
 	}
 
diff --git a/protocols/oscar/im.c b/protocols/oscar/im.c
index 51d8ec74..4169ea4d 100644
--- a/protocols/oscar/im.c
+++ b/protocols/oscar/im.c
@@ -936,7 +936,7 @@ static int outgoingim(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, a
 	channel = aimbs_get16(bs);
 
 	if (channel != 0x01) {
-		imcb_error(sess->aux_data, "icbm: ICBM recieved on unsupported channel.  Ignoring.");
+		imcb_error(sess->aux_data, "icbm: ICBM received on unsupported channel.  Ignoring.");
 		return 0;
 	}