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

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 5e1d21600f9c007a8872d2c38ca89bf31f8e11de
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jul 21 13:27:06 2013 +0200

    switch off the default of "Reply using HTML if present" (#717113)
    
    backport upstream commit fe8ab0c4b6bebe0e5806a870b0946e13bec92c7e
---
 debian/changelog                        |    4 ++++
 debian/patches/kmail_reply-as-html.diff |   17 +++++++++++++++++
 debian/patches/series                   |    1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b3936c7..fc2b041 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 kdepim (4:4.10.5-2) UNRELEASED; urgency=low
 
+  [ 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)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 21 Jul 2013 13:24:07 +0200
 
diff --git a/debian/patches/kmail_reply-as-html.diff b/debian/patches/kmail_reply-as-html.diff
new file mode 100644
index 0000000..77a39e3
--- /dev/null
+++ b/debian/patches/kmail_reply-as-html.diff
@@ -0,0 +1,17 @@
+Author: Montel Laurent <montel at kde.org>
+Description: Switch the "Reply using HTML if present" option as off by default
+Origin: upstream, commit:fe8ab0c4b6bebe0e5806a870b0946e13bec92c7e
+Bug-Debian: http://bugs.debian.org/717113
+Applied-Upstream: 4.11
+
+--- a/templateparser/templateparser.kcfg
++++ b/templateparser/templateparser.kcfg
+@@ -18,7 +18,7 @@ xsi:schemaLocation="http://www.kde.org/s
+       </entry>
+         <entry name="ReplyUsingHtml" type="Bool" key="replySameFormat">
+         <label>Reply using HTML if present</label>
+-        <default>true</default>
++        <default>false</default>
+       </entry>
+ 
+       <entry name="CustomTemplates" type="StringList" key="CustomTemplates" />
diff --git a/debian/patches/series b/debian/patches/series
index 4235252..7a32ff1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 debianize_akregator_default.diff
+kmail_reply-as-html.diff

-- 
KDE PIM module packaging