Merge lp:~schumski-deactivatedaccount-deactivatedaccount/ubuntu/quantal/kmess/1045090 into lp:ubuntu/quantal/kmess

[šumski]

* New upstream release
* Add upstream's commit for fixing crashes with newer Qt

[Jamie Strandboge (jdstrand)]

As mentioned in bug #1045090, this needs an FFe before it can be considered.

review: Needs Information

Unmerged revisions

1. By šumski on 2012-09-02

Initial

=== added directory 'debian'
=== renamed directory 'debian' => 'debian.moved'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2012-09-02 22:50:23 +0000
@@ -0,0 +1,181 @@
+kmess (2.0.6.2-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Add upstream's commit for fixing crashes with newer Qt
+
+ -- schumski <[e-mail]>  Sun, 02 Sep 2012 22:39:45 +0200
+
+kmess (2.0.6.1-2) unstable; urgency=high
+
+  * Add follow-location-redirects.diff, this makes KMess usable with the latest
+    changes in MSN servers. (Closes: #648080)
+  * Update Vcs-* fields, this package was moved to git.
+  * Bump Standards-Version to 3.9.2, no changes needed.
+  * Add myself to Uploaders.
+  * Urgency is high because this upload fixes an RC bug which affects testing.
+
+ -- José Manuel Santamaría Lema <[e-mail]>  Wed, 09 Nov 2011 15:31:56 +0100
+
+kmess (2.0.6.1-1) unstable; urgency=low
+
+  * New Upstream Release (Closes: #602938, #610153).
+
+  [ Ana Beatriz Guerrero Lopez ]
+  * Remove Mario Iseli from Uploaders (MIA).
+
+  [ George Kiagiadakis ]
+  * Drop all patches; applied upstream.
+  * Add myself to uploaders.
+  * Drop dependency on libqca2-plugin-ossl; kmess now uses gcrypt.
+  * Bump standards-version to 3.9.1; no changes required.
+  * Add DEB_KDE_LINK_WITH_AS_NEEDED := yes to avoid uselessly
+    linking on nepomuk and soprano libs.
+
+ -- George Kiagiadakis <[e-mail]>  Mon, 04 Apr 2011 14:28:04 +0300
+
+kmess (2.0.3-2) unstable; urgency=low
+
+  [ Pino Toscano ] 
+  * Add cmake as build dependency, as it is no more provided by kdelibs5-dev.
+    (Closes: #582198)
+
+ -- Mark Purcell <[e-mail]>  Fri, 21 May 2010 16:56:06 +1000
+
+kmess (2.0.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+  [ Fathi Boudra]
+  * Switch to dpkg-source 3.0 (quilt) format.
+  * Add patches:
+    - 01_no_debugfull_build.diff
+      default build should not bet set to debugfull
+    - 02_no_desktop_encoding_key.diff
+      remove deprecated encoding key from desktop file
+    - 03_comments_cleanup.diff
+      fix comments related to Debian package names
+  * Drop 01_dont-build-depend-on-libqca2-plugin-ossl.diff - not needed anymore.
+  * Cleanup build dependencies:
+    - Remove libqca2-dev, libphonon-dev, libqt4-phonon-dev and patchutils.
+    - Add libgcrypt11-dev.
+  * Bump to Standars-Version 3.8.4 (no changes needed).
+
+ -- Debian KDE Extras Team <[e-mail]>  Wed, 24 Mar 2010 13:11:52 +0100
+
+kmess (2.0.2-1) unstable; urgency=low
+
+  * New upstream release 
+    - Fixes friendly names (LP: #485640)
+  * Update Homepage: http://kmess.org
+  * Add Build-Depends: libphonon-dev | libqt4-phonon-dev (ubuntu friendly)
+  * kmess.1 fix lintian:hyphen-used-as-minus-sign
+
+ -- Mark Purcell <[e-mail]>  Sat, 05 Dec 2009 21:19:26 +1100
+
+kmess (2.0-3) unstable; urgency=low
+
+  +++ Changes by José Manuel Santamaría Lema:
+
+  * Fix FTBFS with binutils-gold. (Closes: #555020)
+  * Added 12_rev5667_fixed_likeback_icons_install_condition.diff - without this
+    patch the package will not install some icons, specifically those clearly
+    visible in the right upper corner of the main window.
+  * Bump to Standars-Version 3.8.3, no changes needed.
+  * Don't refer to symlinks for text licenses in debian/copyright
+
+ -- Debian KDE Extras Team <[e-mail]>  Mon, 09 Nov 2009 00:04:39 +0100
+
+kmess (2.0-2) unstable; urgency=low
+
+  * Update debian/watch to handle rc/beta & alpha upstream 
+  * Include upstream rev5532 - Work around KDE bug #209960 that caused a
+    crash when closing the account settings dialog.  (Closes: #551061)
+
+ -- Mark Purcell <[e-mail]>  Tue, 20 Oct 2009 19:11:36 +1100
+
+kmess (2.0-1) unstable; urgency=low
+
+  * New upstream release 
+
+ -- Mark Purcell <[e-mail]>  Wed, 02 Sep 2009 07:40:00 +1000
+
+kmess (2.0~beta2-1) unstable; urgency=low
+
+  * New upstream release 
+    - Fixes "the '">' characters appears" (Closes: #530358)
+  * Add Build-Depends: libgif-dev
+
+ -- Mark Purcell <[e-mail]>  Tue, 26 May 2009 22:58:41 +1000
+
+kmess (2.0~beta1-2) unstable; urgency=low
+
+  * Add Build-Depends: debhelper >=7
+
+  +++ Changes by George Kiagiadakis:
+
+  * Fix FTBFS (Closes: #524085)
+    - Add patch 01_dont-build-depend-on-libqca2-plugin-ossl.diff.
+    - Depend on libqca2-plugin-ossl.
+    - Build-depend on libxss-dev.
+
+ -- Mark Purcell <[e-mail]>  Thu, 23 Apr 2009 09:19:48 +1000
+
+kmess (2.0~beta1-1) unstable; urgency=low
+
+  * New upstream release
+    - Closes: #516284, #515663, #449797, #460746
+  * Update Build-Depends: kdelibs5-dev (KDE4 release)
+  * Update Standards Version 3.8.1. Add Homepage: Vcs: headers
+  * Build Depends: libkonq5-dev - context menu integration with Konqueror
+  * Update other Build-Depends:
+  * Update debian/compat -> 7
+  * Add ${misc:Depends}
+  * kmess.menu section -> Applications/Network/Communication
+
+ -- Mark Purcell <[e-mail]>  Sun, 12 Apr 2009 13:58:31 +1000
+
+kmess (1.5~pre2-1) experimental; urgency=low
+
+  * New upstream release
+    - Release highlights:
+       - added support for now playing information
+       - added file transfer previews
+       - fixed critical bugs with the direct file transfer
+       - fixed clickable links in the chat window
+       - fixed problems with emoticon styles
+       - fixed problems with the installation
+       - updated many translations
+    - Upload pre releases to experimental
+  * Update debian/watch
+  * Maintainer: Debian KDE Extras Team
+    - Thanks to Mario Iseli for his work todate and welcome to the team!
+
+ -- Mark Purcell <[e-mail]>  Wed, 04 Jul 2007 07:31:05 +0100
+
+kmess (1.4.3-2) unstable; urgency=low
+
+  * Saven kmess.desktop as UTF-8 File. (Closes: #368844)
+
+ -- Mario Iseli <[e-mail]>  Sun,  4 Jun 2006 20:55:23 +0200
+
+kmess (1.4.3-1) unstable; urgency=low
+
+  * New upstream release
+  * Removed ballonbase.patch, it's fixed in the new upstream.
+
+ -- Mario Iseli <[e-mail]>  Sat, 20 May 2006 14:39:09 +0200
+
+kmess (1.4.2-2) unstable; urgency=medium
+
+  * Added a patch (debian/patches/01_ballonbase.patch) to fix
+    building. (Closes: #357764)
+
+ -- Mario Iseli <[e-mail]>  Tue, 21 Mar 2006 17:59:11 +0100
+
+kmess (1.4.2-1) unstable; urgency=low
+
+  * Initial release Closes: #339571
+  * wrote a manpage
+
+ -- Mario Iseli <[e-mail]>  Mon, 21 Nov 2005 19:07:16 +0100
+

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2012-09-02 22:50:23 +0000
@@ -0,0 +1,1 @@
+7

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2012-09-02 22:50:23 +0000
@@ -0,0 +1,23 @@
+Source: kmess
+Section: net
+Priority: optional
+Maintainer: Debian KDE Extras Team <[e-mail]>
+Uploaders: Mark Purcell <[e-mail]>, George Kiagiadakis <[e-mail]>,
+ José Manuel Santamaría Lema <[e-mail]>
+Build-Depends: cdbs, debhelper (>= 7), automoc, pkg-kde-tools (>= 0.6.4), cmake,
+ kdelibs5-dev, libgcrypt11-dev, libgif-dev, libkonq5-dev, libxml2-dev,
+ libxslt1-dev, libxss-dev, zlib1g-dev
+Standards-Version: 3.9.2
+Homepage: http://kmess.org
+Vcs-Git: git://git.debian.org/pkg-kde/kde-extras/kmess.git
+Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-extras/kmess.git;a=summary
+
+Package: kmess
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: konqueror
+Description: MSN messenger for KDE
+ An alternative MSN Messenger chat client for Linux. It allows Linux users
+ to chat with friends who use MSN Messenger in Windows or Mac OS. The
+ strength of KMess is it's integration with the KDE desktop environment,
+ focus on MSN Messenger specific features and an easy-to-use interface.

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2012-09-02 22:50:23 +0000
@@ -0,0 +1,50 @@
+This package was first debianized by Mario Iseli <[e-mail]> on
+Mon, 21 Nov 2005 19:07:16 +0100.
+
+It was downloaded from <http://kmess.sourceforge.net>.
+
+Copyright Holders: Mike K. Bennett <[e-mail]>
+		   Michael Curtis <[e-mail]>
+		   Jan Toenjes <[e-mail]>
+		   Lin Haoxiang <[e-mail]>
+		   Diederik van der Boor <[e-mail]>
+
+License (crypt/bithelp.h and crypt/sha1.cpp):
+
+	This library is free software; you can redistribute it and/or
+	modify it under the terms of the GNU Lesser General Public
+	License as published by the Free Software Foundation; either
+	version 2.1 of the License, or (at your option) any later version.
+
+	This library 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
+	Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public
+	License along with this library; 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 Lesser General Public License 2.1
+can be found in /usr/share/common-licenses/LGPL-2.1 file.
+
+License (everything else):
+
+	Copyright (C) 2003-2005 Jan Toenjes <[e-mail]>
+
+	This program 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 program 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 program; 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 2
+can be found in /usr/share/common-licenses/GPL-2 file.

=== added file 'debian/docs'
--- debian/docs	1970-01-01 00:00:00 +0000
+++ debian/docs	2012-09-02 22:50:23 +0000
@@ -0,0 +1,1 @@
+FEATURES

=== added file 'debian/kmess.1'
--- debian/kmess.1	1970-01-01 00:00:00 +0000
+++ debian/kmess.1	2012-09-02 22:50:23 +0000
@@ -0,0 +1,139 @@
+.TH KMESS 1 "Nov 2005" "K Desktop Environment" "MSN messenger for KDE"
+.SH NAME
+kmess
+- MSN messenger for KDE
+.SH SYNOPSIS
+kmess [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+Kmess is a MSN messenger for the K Desktop Environment. It supports only
+the MSN protocol and has a nice design.
+
+.SH OPTIONS
+.SS Arguments:
+.TP
+.B \-\-autologin
+Autologin with the given email address
+.SS
+
+.SS Generic options:
+.TP
+.B  \-\-help                                                
+Show help about options
+.TP
+.B  \-\-help-qt
+Show Qt specific options
+.TP
+.B  \-\-help-kde                
+Show KDE specific options
+.TP  
+.B  \-\-help-all
+Show all options
+.TP
+.B  \-\-author                  
+Show author information
+.TP
+.B  -v, \-\-version             
+Show version information
+.TP
+.B  \-\-license
+Show license information
+.SS
+
+.SS Qt options:
+.TP
+.B  \-\-display <displayname>   
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap        
+Causes the application to install a private color map on an 8-bit display
+.TP
+.B  \-\-ncols <count>           
+Limits the number of colors allocated in the color cube on an 8-bit display,
+if the application is using the QApplication::ManyColor color specification
+.TP
+.B  \-\-nograb
+Tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb
+Running under a debugger can cause an implicit \-\-nograb, use --dograb 
+to override
+.TP  
+.B  \-\-sync
+Switches to synchronous mode for debugging
+.TP
+.B  \-\-fn, --font <fontname>
+Defines the application font
+.TP
+.B  \-\-bg, --background <color>
+Sets the default background color and an application palette (light 
+and dark shades are calculated)
+.TP
+.B  \-\-fg, --foreground <color>
+Dets the default foreground color
+.TP
+.B  \-\-btn, --button <color>
+Sets the default button color
+.TP
+.B  \-\-name <name>             
+Sets the application name
+.TP
+.B  \-\-title <title>
+Sets the application title (caption)
+.TP
+.B  \-\-visual TrueColor
+Forces the application to use a TrueColor visual on an 8-bit display
+.TP
+.B  \-\-inputstyle <inputstyle> 
+Sets XIM (X Input Method) input style. Possible values are onthespot,
+overthespot, offthespot and root
+.TP
+.B  \-\-im <XIM server>         
+Set XIM server
+.TP
+.B  \-\-noxim                   
+Disable XIM
+.TP
+.B  \-\-reverse            
+Mirrors the whole layout of widgets
+.SS
+
+.SS KDE options:
+.TP
+.B  \-\-caption <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler   
+Disable crash handler, to get core dumps
+.TP 
+.B  \-\-waitforwm
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style <style>           
+Sets the application GUI style
+.TP
+.B  \-\-geometry <geometry>     
+Sets the client geometry of the main widget - see man X for the argument format
+.SS 
+
+.SH SEE ALSO
+/usr/share/doc/kmess/README
+.br
+.SH AUTHORS
+.nf
+Mario Iseli <[e-mail]>
+

=== added file 'debian/kmess.menu'
--- debian/kmess.menu	1970-01-01 00:00:00 +0000
+++ debian/kmess.menu	2012-09-02 22:50:23 +0000
@@ -0,0 +1,5 @@
+?package(kmess): \
+    needs="X11" \
+    section="Applications/Network/Communication" \
+    title="kmess" \
+    command="/usr/bin/kmess"

=== added directory 'debian/patches'
=== added file 'debian/patches/qdelete.diff'
--- debian/patches/qdelete.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/qdelete.diff	2012-09-02 22:50:23 +0000
@@ -0,0 +1,15 @@
+--- a/src/model/contactlistmodelitem.cpp
++++ b/src/model/contactlistmodelitem.cpp
+@@ -79,7 +79,11 @@
+  */
+ ContactListModelItem::~ContactListModelItem()
+ {
+-  qDeleteAll( childItems_ );
++  while( !childItems_.isEmpty() )
++  {
++    delete childItems_.takeFirst();
++  }
++
+   childItems_.clear();
+ 
+   // Delete this item from the parent's children

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2012-09-02 22:50:23 +0000
@@ -0,0 +1,1 @@
+qdelete.diff
\ No newline at end of file

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2012-09-02 22:50:23 +0000
@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+
+FILENAME = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+UPFILENAME = $(DEB_SOURCE_PACKAGE)-$(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/~//').tar.gz
+URL = http://heanet.dl.sourceforge.net/$(DEB_SOURCE_PACKAGE)/$(UPFILENAME)
+
+DEB_KDE_LINK_WITH_AS_NEEDED := yes
+
+include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+
+DEB_INSTALL_MANPAGES_kmess := debian/kmess.1
+DEB_INSTALL_MENU_ARGS := debian/kmess.menu

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2012-09-02 22:50:23 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)

=== added file 'debian/watch'
--- debian/watch	1970-01-01 00:00:00 +0000
+++ debian/watch	2012-09-02 22:50:23 +0000
@@ -0,0 +1,6 @@
+version=3
+#http://prdownloads.sourceforge.net/kmess/kmess-(.*)\.tar\.gz
+
+# Find new files on sourceforge, for debscripts >= 2.9
+opts="uversionmangle=s/rc/~rc/;s/beta/~beta/;s/alpha/~alpha/" \
+ http://sf.net/kmess/kmess-(.*)\.tar\.gz debian svn-upgrade