[SCM] KOffice packaging branch, master, updated. debian/2.2.1-4-5-gf57eea4

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 80f70cb7c7f7b76450ebb07fabe3dbf37bb393ec
Merge: a5d770de6c98b1ba60e35793043e0de9120afab9 c1936efe840bb8faf13319efc24553cb573c6b92
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Mon Nov 29 02:47:29 2010 +0200

    Merge branch 'squeeze'
    
    Conflicts:
    	debian/changelog

 debian/changelog                                   |   12 +++++++
 debian/control                                     |    2 +-
 .../kspread_backport_fix_time_values_in_ods.diff   |   32 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 4 files changed, 46 insertions(+), 1 deletions(-)

diff --cc debian/changelog
index 9dc4547,35ac295..93dd731
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,21 @@@
 +koffice (1:2.2.2-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Raúl Sánchez Siles <rasasi78 at gmail.com>  Tue, 24 Aug 2010 00:27:03 +0200
 +
+ koffice (1:2.2.1-4) unstable; urgency=low
+ 
+   [ Modestas Vainius ]
+   * Add patch kspread_backport_fix_time_values_in_ods.diff to fix saving of
+     time values in ods files in kspread. (Closes: #604773)
+   * Remove quilt from Build-Depends. The package is 3.0 (quilt) and quilt build
+     dependency makes debian-qt-kde.mk automatically (un)apply patches as if
+     source format was 1.0. This is definitely wrong and might lead to weird
+     FTBFSes sometimes.
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 29 Nov 2010 02:01:30 +0200
+ 
  koffice (1:2.2.1-3) unstable; urgency=low
  
    [ Ana Beatriz Guerrero Lopez ]

-- 
KOffice packaging