--- mcabber-0.9.7.orig/config.guess
+++ mcabber-0.9.7/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2008-01-23'
+timestamp='2006-07-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -56,8 +56,8 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -161,7 +161,6 @@
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@@ -330,7 +329,7 @@
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+    i86pc:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
@@ -532,7 +531,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[45])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -781,7 +780,7 @@
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
-    *:MINGW*:*)
+    i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
@@ -791,18 +790,12 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:[3456]*)
-    	case ${UNAME_MACHINE} in
-	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	    EM64T | authenticamd)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	esac ;;
+    x86:Interix*:[3456]*)
+	echo i586-pc-interix${UNAME_RELEASE}
+	exit ;;
+    EM64T:Interix*:[3456]*)
+	echo x86_64-unknown-interix${UNAME_RELEASE}
+	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
@@ -836,14 +829,7 @@
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     arm*:Linux:*:*)
-	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-	fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -964,9 +950,6 @@
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
-    xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -1225,15 +1208,6 @@
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
 	exit ;;
-    SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1484,9 +1458,9 @@
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
--- mcabber-0.9.7.orig/config.sub
+++ mcabber-0.9.7/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2008-01-16'
+timestamp='2006-07-02'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -245,12 +245,12 @@
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fido | fr30 | frv \
+	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep \
+	| maxq | mb | microblaze | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -276,7 +276,6 @@
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| score \
 	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -285,7 +284,7 @@
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -324,7 +323,7 @@
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
@@ -368,15 +367,11 @@
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa*-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -447,14 +442,6 @@
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -487,8 +474,8 @@
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16)
-		basic_machine=cr16-unknown
+	cr16c)
+		basic_machine=cr16c-unknown
 		os=-elf
 		;;
 	crds | unos)
@@ -680,14 +667,6 @@
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -703,10 +682,6 @@
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -833,14 +808,6 @@
 		basic_machine=i860-intel
 		os=-osf
 		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
@@ -942,10 +909,6 @@
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -957,9 +920,6 @@
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@@ -1049,10 +1009,6 @@
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
-	tile*)
-		basic_machine=tile-unknown
-		os=-linux-gnu
-		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -1258,7 +1214,7 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+	      | -skyos* | -haiku* | -rdos* | -toppers*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1410,9 +1366,6 @@
 # system, and we'll never get to this point.
 
 case $basic_machine in
-        score-*)
-		os=-elf
-		;;
         spu-*)
 		os=-elf
 		;;
@@ -1453,9 +1406,6 @@
 	m68*-cisco)
 		os=-aout
 		;;
-        mep-*)
-		os=-elf
-		;;
 	mips*-cisco)
 		os=-elf
 		;;
--- mcabber-0.9.7.orig/debian/dirs
+++ mcabber-0.9.7/debian/dirs
@@ -0,0 +1 @@
+usr/bin
--- mcabber-0.9.7.orig/debian/docs
+++ mcabber-0.9.7/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README
+TODO
--- mcabber-0.9.7.orig/debian/rules
+++ mcabber-0.9.7/debian/rules
@@ -0,0 +1,73 @@
+#!/usr/bin/make -f
+
+include /usr/share/dpatch/dpatch.make
+
+#export DH_VERBOSE=1
+
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+config.status: patch
+	dh_testdir
+	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-gpgme --enable-aspell --enable-otr
+
+build: build-stamp
+
+build-stamp:  config.status
+	dh_testdir
+	$(MAKE)
+	touch build-stamp
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp config.log
+	[ ! -f Makefile ] || $(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/mcabber
+
+binary-indep: build install
+
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs ChangeLog
+	dh_installdocs
+	dh_installexamples
+	dh_installmenu
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
--- mcabber-0.9.7.orig/debian/menu
+++ mcabber-0.9.7/debian/menu
@@ -0,0 +1,2 @@
+?package(mcabber):needs="text" section="Applications/Network/Communication"\
+  title="mcabber" command="/usr/bin/mcabber"
--- mcabber-0.9.7.orig/debian/control
+++ mcabber-0.9.7/debian/control
@@ -0,0 +1,18 @@
+Source: mcabber
+Section: net
+Priority: optional
+Maintainer: Mario Iseli <mario@debian.org>
+Uploaders: Gerfried Fuchs <rhonda@debian.at>
+Build-Depends: debhelper (>= 5.0.0), autotools-dev, libglib2.0-dev, libncursesw5-dev, libssl-dev, libgpgme11-dev, dpatch, libotr2-dev (>= 3.1.0), libaspell-dev, libgcrypt11-dev
+Homepage: http://www.lilotux.net/~mikael/mcabber/
+Standards-Version: 3.8.0
+
+Package: mcabber
+Section: net
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Small Jabber console client
+ MCabber is a Jabber text-mode client, which includes features such as
+ SSL support, history logging, commands completion, and external actions
+ triggers.
--- mcabber-0.9.7.orig/debian/changelog
+++ mcabber-0.9.7/debian/changelog
@@ -0,0 +1,92 @@
+mcabber (0.9.7-0.1~bpo40+1) etch-backports; urgency=low
+
+  * Rebuild for etch-backports.
+  * Add libgcrypt11-dev to Build-Depends (see #497384)
+  * Add versioned-depends on libotr2-dev
+
+ -- Gerfried Fuchs <rhonda@debian.at>  Tue, 30 Dec 2008 13:07:49 +0100
+
+mcabber (0.9.7-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream release, which includes:
+    - using stat instead of lstat for permission check (closes: #475182)
+  * Fix watchfile to watch only for numbered versions (closes: #479601)
+  * Updated Standards-Version to 3.8.0:
+    - Added README.source quick introduction on dpatch usage.
+
+ -- Gerfried Fuchs <rhonda@debian.at>  Wed, 16 Jul 2008 17:51:43 +0200
+
+mcabber (0.9.5-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * --enable-otr and add Build-Depends libotr2-dev (Closes: #453729).
+  * Add Build-Depends on libaspell-dev to make --enable-aspell actually work
+    (Closes: #461977).
+
+ -- Gerfried Fuchs <rhonda@debian.at>  Tue, 22 Jan 2008 15:59:24 +0100
+
+mcabber (0.9.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * New maintainer E-Mail address.
+  * Added Homepage field to debian/control.
+  * Fix debian-rules-ignores-make-clean-error by checking if the file exists
+    if the file exists..
+
+ -- Mario Iseli <mario@debian.org>  Tue, 20 Nov 2007 13:47:26 +0100
+
+mcabber (0.9.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Updated the manpage patch.
+  * Added --enable-aspell and --enable-gpgme to the call of configure.
+
+ -- Mario Iseli <admin@marioiseli.com>  Wed, 20 Jun 2007 17:27:50 +0100
+
+mcabber (0.9.1-1) unstable; urgency=low
+
+  * New upstream release (Closes: #420065).
+  * Added build-dependency on libgpgme-dev to enable GPG support.
+  * Added build-dependency on dpatch and added a first patch in debian/patches
+    to fix the manpage.
+
+ -- Mario Iseli <admin@marioiseli.com>  Thu, 19 Apr 2007 21:02:12 +0200
+
+mcabber (0.8.3-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Mario Iseli <admin@marioiseli.com>  Sun, 19 Nov 2006 14:13:06 +0100
+
+mcabber (0.8.2-2) unstable; urgency=low
+
+  * Added support for Unicode (linked against linbcursesw5)
+  * Depend now on libncursesw5
+  * Build-Depend now on linbcursesw5-dev
+
+ -- Mario Iseli <admin@marioiseli.com>  Wed, 11 Oct 2006 23:02:51 +0200
+
+mcabber (0.8.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Mario Iseli <admin@marioiseli.com>  Sat, 23 Sep 2006 11:36:18 +0200
+
+mcabber (0.8.1-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Mario Iseli <admin@marioiseli.com>  Mon, 21 Aug 2006 23:25:51 +0200
+
+mcabber (0.8.0-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Mario Iseli <admin@marioiseli.com>  Mon, 14 Aug 2006 19:39:56 +0200
+
+mcabber (0.7.8-1) unstab le; urgency=low
+
+  * Initial release Closes: #362617
+
+ -- Mario Iseli <admin@marioiseli.com>  Sat, 08 Jul 2006 00:43:32 +0200
--- mcabber-0.9.7.orig/debian/watch
+++ mcabber-0.9.7/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://www.lilotux.net/~mikael/mcabber/files/mcabber-([0-9.]+)\.tar\.bz2
--- mcabber-0.9.7.orig/debian/compat
+++ mcabber-0.9.7/debian/compat
@@ -0,0 +1 @@
+5
--- mcabber-0.9.7.orig/debian/copyright
+++ mcabber-0.9.7/debian/copyright
@@ -0,0 +1,179 @@
+This package was debianized by Mario Iseli <admin@marioiseli.com> on
+Sat, 08 Jul 2006 01:02:41 +0200.
+
+It was downloaded from <http://www.lilotux.net/~mikael/mcabber/>
+
+Copyright Holders: Mikael Berthe <bmikael@lists.lilotux.net>
+		   Konstantin Klyagin <konst@konst.org.ua>
+		   Peter Deutsch <ghost@aladdin.com>
+		   Panos Tsirigotis <panos@alumni.cs.colorado.edu>
+		   The Jabber Team http://jabber.org/
+		   Tha Apache Group
+		   Thomas Muldowney
+		   Ryan Eatmon
+		   Robert Norris
+		   Jeremie Miller
+		   Daniel Borca
+		   James Clark
+		   Free Software Foundation, Inc.
+		   Massachusetts Institute of Technology
+		   See also: /usr/share/doc/mcabber/AUTHORS
+
+License (for the files written by Mikael Berthe)
+
+   Copyright (C) 2005-2006 Mikael Berthe <bmikael@lists.lilotux.net>
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+   Mikael Berthe has added an exception to the license which allows linking
+   with OpenSSL.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+License (everything not mentioned below):
+
+   Copyright (C) 2002-1005 Konstantin Klyagin <konst@konst.org.ua>
+   Copyright (C) 1989,1991 Free Software Foundation, Inc.
+   Copyright (C) 1991 by the Massachusetts Institute of Technology
+   Copyright (C) 1998-1999 The Jabber Team http://jabber.org/
+   Copyright (C) 1998-2002 Jeremie Miller
+   Copyright (C) 2002 Thomas Muldowney
+   Copyright (C) 2002 Ryan Eatmon
+   Copyright (C) 2002 Robert Norris
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+License (for connwrap/md5.c and connwrap/md5.h):
+
+   Copyright (C) 1999 Peter Deutsch <ghost@aladdin.com>
+
+   This software is provided 'as-is', without any express or implied
+   warranty.  In no event will the authors be held liable for any damages
+   arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any purpose,
+   including commercial applications, and to alter it and redistribute it
+   freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you must not
+      claim that you wrote the original software. If you use this software
+      in a product, an acknowledgment in the product documentation would be
+      appreciated but is not required.
+   2. Altered source versions must be plainly marked as such, and must not be
+      misrepresented as being the original software.
+   3. This notice may not be removed or altered from any source distribution.
+
+License (for libjabber/asciitab.h, libjabber/hashtable.c,
+   libjabber/hashtable.h, libjabber/iasciitab.h, libjabber/latin1tab.h,
+   libjabber/sha.c libjabber/utf8tab.h libjabber/xmldef.h,
+   libjabber/xmlparse.c, libjabber/xmlparse.h, libjabber/xmlrole.c,
+   libjabber/xmlrole.h, libjabber/xmltok.c, libjabber/xmltok.h,
+   libjabber/xmltok_impl_c.h and libjabber/xmltok_impl.h):
+
+   Copyright (C) 1998, 1999 James Clark
+
+   The contents of this file are subject to the Mozilla Public License
+   Version 1.1 (the "License"); you may not use this file except in
+   compliance with the License. You may obtain a copy of the License at
+   http://www.mozilla.org/MPL/
+
+   Software distributed under the License is distributed on an "AS IS"
+   basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+   License for the specific language governing rights and limitations
+   under the License.
+
+   The Original Code is expat.
+
+   Contributor(s):
+
+   Alternatively, the contents of this file may be used under the terms
+   of the GNU General Public License (the "GPL"), in which case the
+   provisions of the GPL are applicable instead of those above.  If you
+   wish to allow use of your version of this file only under the terms of
+   the GPL and not to allow others to use your version of this file under
+   the MPL, indicate your decision by deleting the provisions above and
+   replace them with the notice and other provisions required by the
+   GPL. If you do not delete the provisions above, a recipient may use
+   your version of this file under either the MPL or the GPL.
+
+License (for libjabber/snprintf.h):
+
+   Copyright (C) 1995-1998 The Apache Group.  All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in
+      the documentation and/or other materials provided with the
+      distribution.
+
+   3. All advertising materials mentioning features or use of this
+      software must display the following acknowledgment:
+      "This product includes software developed by the Apache Group
+      for use in the Apache HTTP server project (http://www.apache.org/)."
+
+   4. The names "Apache Server" and "Apache Group" must not be used to
+      endorse or promote products derived from this software without
+      prior written permission.
+
+   5. Redistributions of any form whatsoever must retain the following
+      acknowledgment:
+      "This product includes software developed by the Apache Group
+      for use in the Apache HTTP server project (http://www.apache.org/)."
+
+   THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+   EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+   PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
+   ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+   NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+   OF THE POSSIBILITY OF SUCH DAMAGE.
+
+   This software consists of voluntary contributions made by many
+   individuals on behalf of the Apache Group and was originally based
+   on public domain software written at the National Center for
+   Supercomputing Applications, University of Illinois, Urbana-Champaign.
+   For more information on the Apache Group and the Apache HTTP server
+   project, please see <http://www.apache.org/>.
+
+   This code is based on, and used with the permission of, the
+   SIO stdio-replacement strx_* functions by Panos Tsirigotis
+   <panos@alumni.cs.colorado.edu> for xinetd.
--- mcabber-0.9.7.orig/debian/examples
+++ mcabber-0.9.7/debian/examples
@@ -0,0 +1 @@
+mcabberrc.example
--- mcabber-0.9.7.orig/debian/README.source
+++ mcabber-0.9.7/debian/README.source
@@ -0,0 +1,26 @@
+This package uses dpatch to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To get the fully patched source after unpacking the source package, cd
+to the root level of the source package and run:
+
+    debian/rules patch
+
+Removing a patch is as simple as removing its entry from the
+debian/patches/00list file, and please also remove the patch file
+itself.
+
+Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
+where you should replace XX with a new number and patchname with a
+descriptive shortname of the patch. You can then simply edit all the
+files your patch wants to edit, and then simply "exit 0" from the shell
+to actually create the patch file.
+
+To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
+and replace XX_patchname with the actual filename from debian/patches
+you want to use.
+
+To clean up afterwards again, "debian/rules unpatch" will do the
+work for you - or you can of course choose to call
+"fakeroot debian/rules clean" all together.
--- mcabber-0.9.7.orig/debian/patches/01_manpage.dpatch
+++ mcabber-0.9.7/debian/patches/01_manpage.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_manpage.dpatch by Mario Iseli <admin@marioiseli.com>
+##
+## DP: Fixes the line 195 in the manpage because lintian treated it as wrong
+## DP: linebreaking due to the many "\-" in a chain.
+
+@DPATCH@
+
+diff -Naur mcabber-0.9.3/doc/mcabber.1 mcabber-0.9.3.new/doc/mcabber.1
+--- mcabber-0.9.3/doc/mcabber.1	2007-06-20 18:05:40.000000000 +0100
++++ mcabber-0.9.3.new/doc/mcabber.1	2007-06-20 18:07:44.000000000 +0100
+@@ -192,7 +192,7 @@
+ Ctrl\-o
+ .sp
+ T}:T{
+-Accept line and put the next history line in the input line (accept\-line\-and\-down\-history)
++Accept line and put the next history line in the input line (accept \- line \- and \- down \- history)
+ .sp
+ T}
+ T{
--- mcabber-0.9.7.orig/debian/patches/00list
+++ mcabber-0.9.7/debian/patches/00list
@@ -0,0 +1 @@
+01_manpage
