rev 6840 - in trunk/packages/kdepim/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2007-07-23 22:06:59 +0000 (Mon, 23 Jul 2007)
New Revision: 6840

Added:
   trunk/packages/kdepim/debian/patches/01_branch_kmail_forwarding.diff
Modified:
   trunk/packages/kdepim/debian/changelog
Log:
fix kmail and forwarding


Modified: trunk/packages/kdepim/debian/changelog
===================================================================
--- trunk/packages/kdepim/debian/changelog	2007-07-23 21:54:10 UTC (rev 6839)
+++ trunk/packages/kdepim/debian/changelog	2007-07-23 22:06:59 UTC (rev 6840)
@@ -1,19 +1,21 @@
 kdepim (4:3.5.7-2) unstable; urgency=low
 
-  * Rebuild with a fixed dpkg-dev (Closes: #427893, #425621, #425913, #431576). 
+  * Rebuild with a fixed dpkg-dev (Closes: #427893, #425621, #425913, #431576).
     Add a versioned build dependency.
 
   +++ Changes by Sune Vuorela:
 
   * Remove kleopatra readme. It is horribly outdated - and describes how to
     install unofficial packages that have been in Debian for ages.
-  * Add a patch to fix issues with quotas. Patch pulled from svn. 
+  * Add a patch to fix issues with quotas. Patch pulled from svn.
     (Closes: 426115)
   * Implement the use of uploaders.mk
   * Add patch to fix birthday reminders with korganizer. (Closes: 420826).
     Patch taken from upstream svn.
+  * Add patch from upstream svn to fix issue with templates and forwarding.
+    (Closes: 427803)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 22 May 2007 14:24:20 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 24 Jul 2007 00:05:45 +0200
 
 kdepim (4:3.5.7-1) unstable; urgency=low
 

Added: trunk/packages/kdepim/debian/patches/01_branch_kmail_forwarding.diff
===================================================================
--- trunk/packages/kdepim/debian/patches/01_branch_kmail_forwarding.diff	                        (rev 0)
+++ trunk/packages/kdepim/debian/patches/01_branch_kmail_forwarding.diff	2007-07-23 22:06:59 UTC (rev 6840)
@@ -0,0 +1,13 @@
+Index: kdepim/kmail/kmcommands.cpp
+===================================================================
+--- kdepim/kmail/kmcommands.cpp	(revision 685748)
++++ kdepim/kmail/kmcommands.cpp	(revision 685749)
+@@ -1246,7 +1246,7 @@
+     {
+       KMail::Composer * win = KMail::makeComposer( fwdMsg, id );
+       win->setCharset( fwdMsg->codec()->mimeName(), true );
+-      // win->setBody( QString::fromUtf8( msg->createForwardBody() ) );
++      win->setBody( fwdMsg->bodyToUnicode() );
+       win->show();
+     }
+   }