[SCM] KOffice packaging branch, master, updated. debian/2.2.1-4-66-gbce28cf

[Modestas Vainius]

The following commit has been merged in the master branch:
commit bce28cf8b621d782c29b42b2ce1c0f27b874c8f5
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Wed Jan 5 00:11:23 2011 +0200

    Drop kspread_backport_fix_time_values_in_ods.diff, stolen from upstream.
---
 debian/changelog                                   |    1 +
 .../kspread_backport_fix_time_values_in_ods.diff   |   32 --------------------
 2 files changed, 1 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a900374..e632536 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ koffice (1:2.2.84-1) UNRELEASED; urgency=low
 
   [ Modestas Vainius ]
   * Add Vcs-* fields to debian/control.
+  * Drop kspread_backport_fix_time_values_in_ods.diff, stolen from upstream.
 
  -- Raúl Sánchez Siles <rasasi78 at gmail.com>  Thu, 25 Nov 2010 00:58:59 +0100
 
diff --git a/debian/patches/kspread_backport_fix_time_values_in_ods.diff b/debian/patches/kspread_backport_fix_time_values_in_ods.diff
deleted file mode 100644
index 11dc25f..0000000
--- a/debian/patches/kspread_backport_fix_time_values_in_ods.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Marijn Kruisselbrink <m.kruisselbrink at student.tue.nl>
-Subject: Fix saving of time values in ods files
-Acked-By: Modestas Vainius <modax at debian.org>
-Bug: https://bugs.kde.org/show_bug.cgi?id=253042
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=604773
-Origin: backport, http://websvn.kde.org/?view=rev&revision=1183113
-Last-Update: 2010-11-28
-Applied-Upstream: 2.3
-
-This unfortunately got broken by a change in Qt4.1 and kspread relying on
-undocumented behavior of QTime::toString()
-
---- a/kspread/Cell.cpp
-+++ b/kspread/Cell.cpp
-@@ -1273,7 +1273,7 @@ void Cell::saveOdfValue(KoXmlWriter &xml
-         if (isTime()) {
-             xmlWriter.addAttribute("office:value-type", "time");
-             xmlWriter.addAttribute("office:time-value",
--                                   value().asTime(sheet()->map()->calculationSettings()).toString("PThhHmmMssS"));
-+                                   value().asTime(sheet()->map()->calculationSettings()).toString("'PT'hh'H'mm'M'ss'S'"));
-         } else {
-             xmlWriter.addAttribute("office:value-type", "date");
-             xmlWriter.addAttribute("office:date-value",
-@@ -1284,7 +1284,7 @@ void Cell::saveOdfValue(KoXmlWriter &xml
-     case Value::fmt_Time: {
-         xmlWriter.addAttribute("office:value-type", "time");
-         xmlWriter.addAttribute("office:time-value",
--                               value().asTime(sheet()->map()->calculationSettings()).toString("PThhHmmMssS"));
-+                               value().asTime(sheet()->map()->calculationSettings()).toString("'PT'hh'H'mm'M'ss'S'"));
-         break;
-     }
-     case Value::fmt_String: {

-- 
KOffice packaging