Imported Debian patch 0.10.0-1

diff --cc debian/changelog
index 4937bf8,0000000..eaa8eb2
mode 100644,000000..100644
--- 1/debian/changelog
--- /dev/null
+++ b/debian/changelog
@@@ -1,110 -1,0 +1,123 @@@
++mcabber (0.10.0-1) unstable; urgency=low
++
++  * New upstream release, requiring now libloudmouth1-dev.
++  * Fix typo in changelog.
++  * Add ${misc:Depends} to Depends of the package.
++  * Bump to Standards-Version 3.8.4.
++  * Updated Homepage URL in control, watch and copyright files.
++  * Enhanced package description with Upstream input.
++  * Updated copyright information with Upstream input.
++  * Remove dpatch handling, patch not needed anymore.
++
++ -- Gerfried Fuchs <rhonda@debian.at>  Tue, 13 Apr 2010 07:55:17 +0200
++
 +mcabber (0.9.10-1) unstable; urgency=low
 +
 +  * New upstream release:
 +    - fixes FTBFS problem (closes: #546681)
 +    - reduces CPU usage on reconnect troubles (closes: #510545)
 +  * Adding myself to Uploaders.
 +  * Bump Standards-Version to 3.8.3.
 +  * Raise debhelper and compat to 7, use dh_prep instead of dh_clean -k.
 +  * Switched README.source from the full text to a reference to the file
 +    included with the dpatch package.
-   * Updated copyright informations slightly in debian/copyright.
++  * Updated copyright information slightly in debian/copyright.
 +  * Remove duplication of Section and Priority in binary package control file
 +    stanca.
 +  * Fix config.{sub,guess} handling.
 +
 + -- Gerfried Fuchs <rhonda@debian.at>  Thu, 08 Oct 2009 19:37:25 +0200
 +
 +mcabber (0.9.9-0.1) unstable; urgency=low
 +
 +  * Non-maintainer upload.
 +  * New upstream release.
 +  * Build-Depends changes: added libgcrypt11-dev (closes: #497384), versioned
 +    dependency on libotr2-dev (closes: #510200)
 +
 + -- Gerfried Fuchs <rhonda@debian.at>  Wed, 18 Feb 2009 21:44:27 +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

diff --cc debian/control
index f748d73,0000000..1f9e216
mode 100644,000000..100644
--- 1/debian/control
--- /dev/null
+++ b/debian/control
@@@ -1,16 -1,0 +1,16 @@@
 +Source: mcabber
 +Section: net
 +Priority: optional
 +Maintainer: Mario Iseli <mario@debian.org>
 +Uploaders: Gerfried Fuchs <rhonda@debian.at>
- Build-Depends: debhelper (>= 7), autotools-dev, libglib2.0-dev, libncursesw5-dev, libssl-dev, libgpgme11-dev, dpatch, libotr2-dev (>= 3.1.0), libgcrypt11-dev, libaspell-dev
- Homepage: http://www.lilotux.net/~mikael/mcabber/
- Standards-Version: 3.8.3
++Build-Depends: debhelper (>= 7), autotools-dev, libglib2.0-dev, libncursesw5-dev, libssl-dev, libgpgme11-dev, libotr2-dev (>= 3.1.0), libgcrypt11-dev, libaspell-dev, libloudmouth1-dev
++Homepage: http://www.mcabber.com/
++Standards-Version: 3.8.4
 +
 +Package: mcabber
 +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.
++Depends: ${shlibs:Depends}, ${misc:Depends}
++Description: small Jabber (XMPP) console client
++ MCabber is a Jabber (XMPP) text-mode client, which includes features such as
++ SASL support, history logging, commands completion, dynamic modules and
++ external actions triggers.

diff --cc debian/copyright
index 39286c3,0000000..5252872
mode 100644,000000..100644
--- 1/debian/copyright
--- /dev/null
+++ b/debian/copyright
@@@ -1,177 -1,0 +1,45 @@@
 +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/>
++It was downloaded from <http://www.mcabber.com/>
 +
 +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)
++License
 +
-    Copyright (C) 2005-2008 Mikael Berthe <bmikael@lists.lilotux.net>
++   Copyright (C) 2005-2010 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
 +version 2 can be found in `/usr/share/common-licenses/GPL-2', later
 +versions can be found in the same directory.
- 
- 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
- 
- 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.

diff --cc debian/rules
index 964a425,0000000..7fd30e2
mode 100755,000000..100755
--- 1/debian/rules
--- /dev/null
+++ b/debian/rules
@@@ -1,70 -1,0 +1,68 @@@
 +#!/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
++config.status:
 +      dh_testdir
 +      cp -f /usr/share/misc/config.sub config.sub
 +      cp -f /usr/share/misc/config.guess config.guess
-       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
++      CFLAGS="$(CFLAGS)" ./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 --enable-modules
 +
 +build: build-stamp
 +
 +build-stamp:  config.status
 +      dh_testdir
 +      $(MAKE)
 +      touch build-stamp
 +
- clean: unpatch
++clean:
 +      dh_testdir
 +      dh_testroot
 +      rm -f build-stamp
 +      [ ! -f Makefile ] || $(MAKE) distclean
 +      rm -f config.sub config.guess
 +
 +
 +      dh_clean
 +
 +install: build
 +      dh_testdir
 +      dh_testroot
 +      dh_prep
 +      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

diff --cc debian/watch
index 7f94cbb,0000000..f95acc0
mode 100644,000000..100644
--- 1/debian/watch
--- /dev/null
+++ b/debian/watch
@@@ -1,2 -1,0 +1,2 @@@
 +version=3
- http://www.lilotux.net/~mikael/mcabber/files/mcabber-([0-9.]+)\.tar\.bz2
++http://www.mcabber.com/files/mcabber-([0-9.]+)\.tar\.bz2