[SCM] KDE PIM module packaging branch, master, updated. debian/4.10.5-1-10-gd1ccdd8

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepim.git;a=commitdiff;h=d1ccdd8

The following commit has been merged in the master branch:
commit d1ccdd8527a70367d7aefd221609c163f60ad74e
Merge: 8a3227a94df8ad2b5cc56c1a4a70647177479602 471d205ee4533b04aaf91a9b267ff3a0e425c3e3
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri Aug 2 09:37:06 2013 +0200

    Merge branch 'master' of git://git.debian.org/pkg-kde/kde-sc/kdepim
    
    Conflicts:
    	debian/changelog
    	debian/patches/series

 debian/changelog                                   |   14 +-
 debian/kalarm.lintian-overrides                    |    1 -
 debian/kleopatra.lintian-overrides                 |    1 +
 debian/ktimetracker.install                        |   10 +-
 debian/patches/kmail_reply-as-html.diff            |   17 +++
 debian/patches/korganizer_templates.diff           |  157 ++++++++++++++++++++
 debian/patches/series                              |    3 +
 ...m_Use-the-template-time-in-a-special-case.patch |  141 ++++++++++++++++++
 8 files changed, 337 insertions(+), 7 deletions(-)

diff --cc debian/changelog
index 5813661,ee0b1a3..1d2ad7d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,17 +1,22 @@@
  kdepim (4:4.10.5-2) UNRELEASED; urgency=low
  
++  [ Maximiliano Curia ]
 +  * New patch: spambayes.patch, thanks to Alexandre Fayolle
 +    <afayolle at debian.org>. (Closes: #602798)
 +  * kmail, update spambayes dependency version.
 +
-  -- Maximiliano Curia <maxy at debian.org>  Tue, 16 Jul 2013 18:42:40 +0200
+   [ Pino Toscano ]
+   * Backport upstream commit fe8ab0c4b6bebe0e5806a870b0946e13bec92c7e to
+     switch off the default value of the "Reply using HTML if present" option
+     in KMail; patch kmail_reply-as-html.diff. (Closes: #717113)
+   * Update lintian overrides.
+   * Backport upstream commits 2b160d53fe9c83fc2a0e65e510d0f02cb8670552 and
+     596c0df2933c1af13944d9a0c8e70d0f3e9966b0 to make the dates in organizer
+     templates not override the user's choice; patches korganizer_templates.diff
+     and upstream_Use-the-template-time-in-a-special-case.patch.
+     (Closes: #717093)
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 21 Jul 2013 13:24:07 +0200
  
  kdepim (4:4.10.5-1) unstable; urgency=low
  
diff --cc debian/patches/series
index edf0c9a,e61c968..fb8274e
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,4 +1,5 @@@
  debianize_akregator_default.diff
 +spambayes.patch
+ kmail_reply-as-html.diff
+ korganizer_templates.diff
+ upstream_Use-the-template-time-in-a-special-case.patch

-- 
KDE PIM module packaging