[SCM] KOffice packaging branch, master, updated. debian/2.2.1-4-64-g359a80b

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 359a80bc5dfb1134835b8d6489a72e691ec53678
Merge: f57eea471ef732b16d3475ec59b83593a301f5df 4d0bd6f11eb032cf62a7e04269268f5dde3a52a7
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Tue Jan 4 11:37:52 2011 +0200

    Merge remote branch 'origin/koffice2.3'
    
    Conflicts:
    	debian/changelog
    	debian/patches/series

 debian/changelog                      |   21 ++-
 debian/control                        |   61 ++++++-
 debian/karbon.install                 |   89 ++-------
 debian/karbon.lintian-overrides       |    2 +-
 debian/kchart.install                 |  127 ------------
 debian/kchart.lintian-overrides       |    1 -
 debian/kexi-plugin-kspread.install    |    2 +
 debian/kexi-plugin-mysql.install      |    2 +
 debian/kexi-plugin-postgresql.install |    2 +
 debian/kexi-plugin-xbase.install      |    2 +
 debian/kexi.install                   |  252 +++--------------------
 debian/kexi.lintian-overrides         |    2 +-
 debian/kformula.install               |   17 +-
 debian/koffice-data.install           |   16 ++-
 debian/koffice-dev.install            |  331 +-----------------------------
 debian/koffice-doc-html.install       |  251 +----------------------
 debian/koffice-libs.install           |   78 ++++---
 debian/koffice-libs.lintian-overrides |    2 +-
 debian/kplato.install                 |   85 ++------
 debian/kplato.lintian-overrides       |    2 +-
 debian/kpresenter.install             |   62 ++-----
 debian/kpresenter.lintian-overrides   |    2 +-
 debian/krita-data.install             |  358 +--------------------------------
 debian/krita.install                  |   89 ++++-----
 debian/krita.lintian-overrides        |    2 +-
 debian/kspread.install                |  253 +++--------------------
 debian/kspread.lintian-overrides      |    2 +-
 debian/kword-data.install             |   88 +--------
 debian/kword.install                  |   61 +++---
 debian/kword.lintian-overrides        |    2 +-
 debian/patches/10_nokcharpart         |   10 +
 debian/patches/16_kformula_kdeinit4   |   11 +
 debian/patches/fixes_arm.diff         |  363 ---------------------------------
 debian/patches/series                 |    4 +-
 debian/rules                          |    4 +
 35 files changed, 374 insertions(+), 2282 deletions(-)

diff --cc debian/changelog
index ea63da8,645cfcb..8ab4751
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,20 +1,32 @@@
- koffice (1:2.2.2-1) UNRELEASED; 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.84-1) UNRELEASED; urgency=low
+ 
+   * New upstream test-build.
+   	- Removed fixes_arm.diff patch. Included upstream.
+   * Not including KChart application but rather the chart shape plugin.
+   * Adding koreport desktop files.
+   * Added 10_nokcharpart to avoid installing unwanted desktop files.
+   * Adding kexi plugins packages.
+   * Replace and conflict koffice-lib with older kchart packages.
+   * Move menu icons to application binary package.
+   * Prevent building Google docs support.
+   * Added patch 16_kformula_kdeinit4 to make kformula kdeinit library 
+     name compliant.
+   * Make koffice-data and koffice-libs breaks and replaces old kchart versions.
+ 
+  -- Raúl Sánchez Siles <rasasi78 at gmail.com>  Thu, 25 Nov 2010 00:58:59 +0100
  
 +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