rev 4903 - kde-extras/mailody/trunk/debian

Tom Albers tomalbers-guest at alioth.debian.org
Tue Nov 14 22:00:20 UTC 2006


Author: tomalbers-guest
Date: 2006-11-14 23:00:19 +0100 (Tue, 14 Nov 2006)
New Revision: 4903

Modified:
   kde-extras/mailody/trunk/debian/changelog
   kde-extras/mailody/trunk/debian/control
   kde-extras/mailody/trunk/debian/copyright
   kde-extras/mailody/trunk/debian/mailody.manpage
Log:
Prepare for release tomorrow.


Modified: kde-extras/mailody/trunk/debian/changelog
===================================================================
--- kde-extras/mailody/trunk/debian/changelog	2006-11-14 08:11:10 UTC (rev 4902)
+++ kde-extras/mailody/trunk/debian/changelog	2006-11-14 22:00:19 UTC (rev 4903)
@@ -1,10 +1,8 @@
-mailody (0.2.0~beta1-0) UNRELEASED; urgency=low
+mailody (0.2.0~rc1-0) UNRELEASED; urgency=low
 
-  !!! TODO before upload: 
-  * tarball needs some fixes (see FIXME in copyright)
+  [ Tom Albers ]
+  * new upstream release
 
-  * first upstream release
-
   [ Achim Bohnet ]
   * Initial upload (Closes: #396110)
   * Added mailody.1 manpage

Modified: kde-extras/mailody/trunk/debian/control
===================================================================
--- kde-extras/mailody/trunk/debian/control	2006-11-14 08:11:10 UTC (rev 4902)
+++ kde-extras/mailody/trunk/debian/control	2006-11-14 22:00:19 UTC (rev 4903)
@@ -12,6 +12,7 @@
 Depends: ${shlibs:Depends}
 Description: fast IMAP mail user agent for KDE
  Mailody is a fast IMAP mail user agent (MUA).  It favours speed
- over bloat.
+ over bloat.  It supports tabbed email reading, threads messages
+ and supports server-based labeling of messages.
  .
  Homepage: http://www.mailody.net/

Modified: kde-extras/mailody/trunk/debian/copyright
===================================================================
--- kde-extras/mailody/trunk/debian/copyright	2006-11-14 08:11:10 UTC (rev 4902)
+++ kde-extras/mailody/trunk/debian/copyright	2006-11-14 22:00:19 UTC (rev 4903)
@@ -3,48 +3,50 @@
 
 Mailody was downloaded from http://mailody.sf.net/
 
-*****************************************************************
-FIXME:
-	!!! 2 files trival header files without license
-		libkmime/kmime_version.h
-		libkmime/kmime_warning.h
-
-    TA: those files are only header files and that seems 
-        not to be copyrightable. We need to decide what
-        to do.....
-
-*****************************************************************
-
 Upstream author is 
 	Tom Albers <tomalbers at kde.nl>
 
 	libkmime is a modfied version from kdepim. Authors
-	see AUTHORS.kmime and AUTHORS.knode. Modifications
+	see AUTHORS in libkmime folder. Modifications
     to this library are returned back to upstream directly.
 
     libkmime is copied from kde-pim/libkmime from the Qt3/KDE3.5 
     branch of kdepim, you can find the current version at:
        http://websvn.kde.org/branches/KDE/3.5/kdepim/libkmime/
 
+    for KDE4, the license has changed from GPL[2[+]] to LPGP,
+    that change is copied over upstream.
+
 Translations:
+  bg: Zlatko Popov <zlatkopopov at fsa-bg.org>
+  br: Thierry Vignaud <tvignaud at mandrakesoft.com>
+  da: Erik Kjær Pedersen <erik at binghamton.edu>
+  de: Mark Volkert <mark.volkert at rakekniven.de>
+      Thomas Reitelbach <tr at erdfunkstelle.de>
+                                    el: unknown and empty - strip?
+  ga: Kevin Patrick Scannell <scannell at SLU.EDU>
+  jp: Yukiko Bando <ybando at k6.dion.ne.jp>
+  nl: Rinse de Vries <rinsedevries at kde.nl>
+      Tom Albers <tomalbers at kde.nl>
+  pt: José Nuno Coelho Pires <jncp at netcabo.pt>
+  sk: Richard Fric <Richard.Fric at kdemail.net>
+  sv: Stefan Asserhäll <stefan.asserhall at comhem.se>
 
-	<no translations yet (0.2-beta1) >
-
 Copyrights:
-
    src/
-	Copyright (C) 2006 Tom Albers <tomalbers at kde.nl>
-	Copyright 2005,2006 by Gilles Caulier <caulier.gilles at free.fr>
-	Copyright 2004 by Renchi Raju
-	Copyright 2005-2006 by Joern Ahrens <joern.ahrens at kdemail.net>
+    Copyright (C) 2006 KovoKs <info at kovoks.nl>
+	Copyright (C) 2005,2006 by Gilles Caulier <caulier.gilles at free.fr>
+	Copyright (C) 2004 by Renchi Raju
+	Copyright (C) 2005-2006 by Joern Ahrens <joern.ahrens at kdemail.net>
+    Copyright (C) 2005-2006 Bram Schoenmakers <bramschoenmakers at kde.nl
+    Copyright (c) 2002 Dave Corrie <kde at davecorrie.com>
 	Copyright (C) 2001 Christoph Cullmann <cullmann at kde.org>
 	Copyright (C) 2001 Joseph Wenninger <jowenn at kde.org>
 	Copyright (C) 2001 Anders Lund <anders.lund at lund.tdcadsl.dk>
 
    libkmime/
-	Copyright (c) 2001,2002,2004 Marc Mutz <mutz at kde.org>
 	Copyright (c) 2001,2002 the KMime authors
-    	Copyright (c) 1999-2001 the KNode authors.
+      see AUTHORS file for details
 
    icons/
     Copyright (c) 2006 Lee Olson <clearbeast at gmail.com>
@@ -52,8 +54,7 @@
        see mail below.
 
 License:
-
-   Most parts are distributed under the GPL v2 or later
+   The main part of Mailody is licenced GPL v2 or later
     
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public
@@ -70,16 +71,6 @@
 	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
-  Some parts use GPL v2:
-
-  src/filebrowser.cpp/h
-  libkmime/
-	kmime_codec_identity.h
-	kmime_charfreq.cpp
-	kmime_headers.h
-
-
-
 	This library is free software; you can redistribute it and/or
 	modify it under the terms of the GNU Library General Public
 	License version 2 as published by the Free Software Foundation.
@@ -94,50 +85,25 @@
 	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 	Boston, MA 02110-1301, USA.
 
-  Some sue GPL v2 with, special exception to link to Qt:
+  src/filebrowser.cpp/h and libkmime/* are licenced LPGL v2 or later
 
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
 
-  libkmime/
-	kmime_mdn.cpp/.h
-	kmime_codec_qp.cpp/.h
-	kmime_codec_uuencode.cpp/.h
-	kmime_codecs.cpp/.h
-	kmime_codec_base64.cpp/.h
-	kmime_codec_identity.cpp
-	kmime_header_parsing.cpp/.h
+    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
+    Library General Public License for more details.
 
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
 
-	KMime is free software; you can redistribute it and/or modify it
-	under the terms of the GNU General Public License, version 2, as
-	published by the Free Software Foundation.
-
-	KMime 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 library; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-	In addition, as a special exception, the copyright holders give
-	permission to link the code of this library with any edition of
-	the Qt library by Trolltech AS, Norway (or with modified versions
-	of Qt that use the same license as Qt), and distribute linked
-	combinations including the two.  You must obey the GNU General
-	Public License in all respects for all of the code used other than
-	Qt.  If you modify this file, you may extend this exception to
-	your version of the file, but you are not obligated to do so.  If
-	you do not wish to do so, delete this exception statement from
-	your version.
-
-
-  On Debian GNU/Linux systems, the complete text of the GNU General
-  Public License can be found in /usr/share/common-licenses/GPL file.
-
 ----------------------------------------------------------------------
 Mail from Lee Olson:
-
     Return-Path: <clearbeast at gmail.com>
     Received: by 10.78.196.6 with HTTP; Mon, 30 Oct 2006 05:19:25 -0800 (PST)
     Message-ID: <7020eca30610300519w3a44c888lf66b8e92d9a95130 at mail.gmail.com>
@@ -169,6 +135,7 @@
 ----------------------------------------------------------------------
 
 The Debian packaging is under the same license as the program.
+ (C) 2006 Tom Albers <tomalbers at kde.nl>
  (C) 2006 Achim Bohnet <ach at mpe.mpg.de>
  (C) 2006 Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 

Modified: kde-extras/mailody/trunk/debian/mailody.manpage
===================================================================
--- kde-extras/mailody/trunk/debian/mailody.manpage	2006-11-14 08:11:10 UTC (rev 4902)
+++ kde-extras/mailody/trunk/debian/mailody.manpage	2006-11-14 22:00:19 UTC (rev 4903)
@@ -33,6 +33,12 @@
 .TP
     * When you have associated pictures in your KDE addressbook, it will show them when you read a message from that person.
 
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B email
+Send a message to that address
 .SS "Generic options:"
 .TP
 \fB\-\-help\fR




More information about the pkg-kde-commits mailing list