rpms/koffice/F-12 koffice-1.6.3-dejavu_fonts.patch, NONE, 1.1 koffice-1.6.3-gcc43.patch, 1.6, 1.7 koffice-1.6.3-glibc_strrchr.patch, 1.2, 1.3 koffice-1.6.3-magick_version.patch, NONE, 1.1 koffice-1.6.3-quint32.patch, 1.2, 1.3 koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff, 1.6, 1.7 koffice-20090306svn.patch, 1.2, 1.3 koffice-svn_checkout.sh, 1.2, 1.3 koffice-xpdf-CVE-2007-3387.diff, 1.6, 1.7 .cvsignore, 1.34, 1.35 koffice.spec, 1.120, 1.121 sources, 1.34, 1.35

Rex Dieter rdieter at fedoraproject.org
Sat Sep 26 18:19:03 UTC 2009


Author: rdieter

Update of /cvs/pkgs/rpms/koffice/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6436

Modified Files:
	.cvsignore koffice.spec sources 
Added Files:
	koffice-1.6.3-dejavu_fonts.patch koffice-1.6.3-gcc43.patch 
	koffice-1.6.3-glibc_strrchr.patch 
	koffice-1.6.3-magick_version.patch koffice-1.6.3-quint32.patch 
	koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff 
	koffice-20090306svn.patch koffice-svn_checkout.sh 
	koffice-xpdf-CVE-2007-3387.diff 
Log Message:
* Sat Sep 26 2009 Rex Dieter <rdieter at fedoraproject.org> 3:1.6.3-26.20090306svn
- Epoch++ (revert koffice2 -> koffice1)


koffice-1.6.3-dejavu_fonts.patch:
 Makefile.am     |    2 +-
 contextstyle.cc |    2 +-
 fontstyle.cc    |    8 +++++++-
 symboltable.cc  |    2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

--- NEW FILE koffice-1.6.3-dejavu_fonts.patch ---
diff -up koffice-1.6.3/lib/kformula/contextstyle.cc.dejavu koffice-1.6.3/lib/kformula/contextstyle.cc
--- koffice-1.6.3/lib/kformula/contextstyle.cc.dejavu	2007-05-30 16:38:26.000000000 -0500
+++ koffice-1.6.3/lib/kformula/contextstyle.cc	2009-07-28 15:29:06.420292073 -0500
@@ -106,7 +106,7 @@ void ContextStyle::readConfig( KConfig* 
     if ( ! FontStyle::missingFonts( init ).isEmpty() ) {
         kdWarning( DEBUGID) << "Not all basic fonts found\n";
     }
-    mathFont.fromString("Arev Sans");
+    mathFont.fromString("DejaVu Sans");
     bracketFont.fromString("cmex10");
 
 
diff -up koffice-1.6.3/lib/kformula/fontstyle.cc.dejavu koffice-1.6.3/lib/kformula/fontstyle.cc
--- koffice-1.6.3/lib/kformula/fontstyle.cc.dejavu	2007-05-30 16:38:26.000000000 -0500
+++ koffice-1.6.3/lib/kformula/fontstyle.cc	2009-07-28 15:35:51.457543630 -0500
@@ -102,7 +102,7 @@ QStringList FontStyle::missingFontsInter
     QStringList missing;
 
     testFont( missing, "cmex10" );
-    testFont( missing, "arev sans");
+    testFont( missing, "dejavu sans");
 
     return missing;
 }
@@ -111,9 +111,12 @@ void FontStyle::installFonts()
 {
     if (m_installed)
         return;
+
     QStringList missing = missingFontsInternal();
     if (!missing.isEmpty())
     {
+// don't install local copies of fonts -- Rex
+/*
         QStringList urlList;
         for (QStringList::iterator it = missing.begin(); it != missing.end(); ++it)
         {
@@ -135,6 +138,9 @@ void FontStyle::installFonts()
         KIO::copy(urlList, "fonts:/Personal/", false);
         KMessageBox::information(qApp->mainWidget(), 
                                  i18n("Some fonts have been installed to assure that symbols in formulas are properly visualized. You must restart the application in order so that changes take effect"));
+*/
+        KMessageBox::information(qApp->mainWidget(),
+                                 i18n("Some symbol fonts for formulas are missing")); 
     }
     m_installed = true;
 }
diff -up koffice-1.6.3/lib/kformula/Makefile.am.dejavu koffice-1.6.3/lib/kformula/Makefile.am
--- koffice-1.6.3/lib/kformula/Makefile.am.dejavu	2007-05-30 16:38:26.000000000 -0500
+++ koffice-1.6.3/lib/kformula/Makefile.am	2009-07-28 15:41:35.306393788 -0500
@@ -1,7 +1,7 @@
 
 INCLUDES= $(KOFFICE_INCLUDES) $(KOTEXT_INCLUDES) $(all_includes)
 
-SUBDIRS = pics fonts dtd
+SUBDIRS = pics dtd
 
 ####### 
 # We have to name it kformulalib, not just kformula, since that's the name of the kdeinit module for kformula.
diff -up koffice-1.6.3/lib/kformula/symboltable.cc.dejavu koffice-1.6.3/lib/kformula/symboltable.cc
--- koffice-1.6.3/lib/kformula/symboltable.cc.dejavu	2007-05-30 16:38:26.000000000 -0500
+++ koffice-1.6.3/lib/kformula/symboltable.cc	2009-07-28 15:29:06.421292200 -0500
@@ -101,7 +101,7 @@ QFont SymbolTable::font( QChar symbol, c
     if ( fm.inFont( symbol ) ) {
         return f;
     }
-    return QFont("Arev Sans");
+    return QFont("DejaVu Sans");
 }
 
 CharClass SymbolTable::charClass( QChar symbol ) const

koffice-1.6.3-gcc43.patch:
 krita/core/kis_perspective_math.cpp                |   24 ++++++++++-----------
 kspread/plugins/scripting/kspreadcore/krs_cell.cpp |    9 +------
 kspread/plugins/scripting/kspreadcore/krs_cell.h   |    7 ++----
 3 files changed, 17 insertions(+), 23 deletions(-)

Index: koffice-1.6.3-gcc43.patch
===================================================================
RCS file: koffice-1.6.3-gcc43.patch
diff -N koffice-1.6.3-gcc43.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ koffice-1.6.3-gcc43.patch	26 Sep 2009 18:19:01 -0000	1.7
@@ -0,0 +1,126 @@
+# svn diff -c 729276 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/
+# svn diff -c 738929 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/
+
+Index: koffice/krita/core/kis_perspective_math.cpp
+===================================================================
+--- koffice/krita/core/kis_perspective_math.cpp	(revision 738928)
++++ koffice/krita/core/kis_perspective_math.cpp	(revision 738929)
+@@ -24,7 +24,7 @@
+ 
+ #if 1
+ 
+-#include <iostream.h>
++#include <iostream>
+ #include <stdlib.h>
+ #include <math.h>
+ //#define NDEBUG // uncomment to remove checking of assert()
+@@ -57,9 +57,9 @@
+         void  rprint()const;  //print entries on a single line
+         void resize(int n);
+         int operator==(const vector<ElType>& v)const;
+-        friend   vector<ElType> operator*(ElType c,vector<ElType>& v );
+-        friend   vector<ElType> operator*(vector<ElType>& v,ElType c );
+-        friend ostream& operator<<(ostream& s,vector<ElType>& v);
++        friend vector<ElType> operator* (ElType c,vector<ElType>& v );
++        friend vector<ElType> operator*(vector<ElType>& v,ElType c );
++        friend std::ostream& operator<<(std::ostream& s,vector<ElType>& v);
+ };
+ template <class ElType>
+         void vector<ElType>::zero()
+@@ -129,10 +129,10 @@
+         void  vector<ElType>::rprint()const  //print entries on a single line
+ {
+     int i;
+-    cout << "VECTOR: ";
+-    cout << "(";
+-    for(i=0;i<len-1;i++) cout << data[i] << ",";
+-    cout << data[len-1] << ")" << endl;
++    std::cout << "VECTOR: ";
++    std::cout << "(";
++    for(i=0;i<len-1;i++) std::cout << data[i] << ",";
++    std::cout << data[len-1] << ")" << std::endl;
+     return;
+ }
+ template <class ElType>
+@@ -164,7 +164,7 @@
+     return ans;
+ }
+ template <class ElType>
+-        ostream& operator<<(ostream& s,vector<ElType>& v)
++        std::ostream& operator<<(std::ostream& s,vector<ElType>& v)
+ {
+     s << "(";
+     for(int i=0;i<v.len-1;i++) s << v.data[i] << ", ";
+@@ -192,7 +192,7 @@
+         matrix<ElType> operator-(const matrix<ElType>& a);
+         matrix<ElType> transpose();
+     //matrix<ElType> inverse();
+-        friend ostream& operator<<(ostream& s,matrix<ElType>& m);
++        friend std::ostream& operator<<(std::ostream& s,matrix<ElType>& m);
+         friend void ludcmp(matrix<ElType>& a,vector<int>& indx,double &d);
+         friend void lubksb(matrix<ElType>&a,vector<int>& indx,vector<ElType>&b);
+ };
+@@ -357,7 +357,7 @@
+     return ans;
+ }
+ template <class ElType>
+-        ostream& operator<<(ostream& s,matrix<ElType>& m)
++        std::ostream& operator<<(std::ostream& s,matrix<ElType>& m)
+ {
+     for(int i=0; i<m.rows;i++) s << m[i];
+     return s;
+@@ -381,7 +381,7 @@
+ //         kdDebug() << "new search" << endl;
+         for (j=0;j<n;j++) { if ((temp=fabs(a[i][j])) > big) big=temp;
+ /*            kdDebug() << temp << " " << fabs(a[i][j]) << " "<< big <<endl; */}
+-            if (big == 0.0) { cerr << "Singular matrix in routine LUDCMP" << endl; big = TINY;}
++            if (big == 0.0) { std::cerr << "Singular matrix in routine LUDCMP" << std::endl; big = TINY;}
+             vv[i]=1.0/big;
+     }
+     for (j=0;j<n;j++)
+Index: koffice/kspread/plugins/scripting/kspreadcore/krs_cell.cpp
+===================================================================
+--- koffice/kspread/plugins/scripting/kspreadcore/krs_cell.cpp	(revision 729275)
++++ koffice/kspread/plugins/scripting/kspreadcore/krs_cell.cpp	(revision 729276)
+@@ -174,12 +174,7 @@
+ 	return m_cell->text();
+ }
+ 
+-bool Cell::setText(const QString& text, bool asString) {
+-
+-	//FIXME: there is some problem with asString parameter, when it's set
+-	//to true KSpread says: ASSERT: "f" in Dependencies.cpp (621)
+-	//kspread: Cell at row 6, col 1 marked as formula, but formula is NULL
+-
++bool Cell::setText(const QString& text) {
+ 	KSpread::ProtectedCheck prot;
+ 	prot.setSheet (m_sheet);
+ 	prot.add (QPoint (m_col, m_row));
+@@ -189,7 +184,7 @@
+ 	KSpread::DataManipulator *dm = new KSpread::DataManipulator ();
+ 	dm->setSheet (m_sheet);
+ 	dm->setValue (text);
+-	dm->setParsing (!asString);
++	dm->setParsing (true);
+ 	dm->add (QPoint (m_col, m_row));
+ 	dm->execute ();
+ 
+Index: koffice/kspread/plugins/scripting/kspreadcore/krs_cell.h
+===================================================================
+--- koffice/kspread/plugins/scripting/kspreadcore/krs_cell.h	(revision 729275)
++++ koffice/kspread/plugins/scripting/kspreadcore/krs_cell.h	(revision 729276)
+@@ -131,11 +131,10 @@
+ 		*/
+ 		const QString text() const;
+ 		/**
+-		* Set the text of the cell. If asString is true, the text
+-		* will be handled as string else we try to parse the
+-		* string to the expected value.
++		* Set the text of the cell. the text
++		* will be handled as string
+ 		*/
+-		bool setText(const QString& text, bool asString = false);
++		bool setText(const QString& text);
+ 
+ 		/**
+ 		* Return the textcolor as RGB-value in the format "#RRGGBB".

koffice-1.6.3-glibc_strrchr.patch:
 gfile.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: koffice-1.6.3-glibc_strrchr.patch
===================================================================
RCS file: koffice-1.6.3-glibc_strrchr.patch
diff -N koffice-1.6.3-glibc_strrchr.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ koffice-1.6.3-glibc_strrchr.patch	26 Sep 2009 18:19:01 -0000	1.3
@@ -0,0 +1,12 @@
+diff -up koffice-1.6.3/filters/kword/pdf/xpdf/goo/gfile.cc.glibc koffice-1.6.3/filters/kword/pdf/xpdf/goo/gfile.cc
+--- koffice-1.6.3/filters/kword/pdf/xpdf/goo/gfile.cc.glibc	2007-05-30 16:39:18.000000000 -0500
++++ koffice-1.6.3/filters/kword/pdf/xpdf/goo/gfile.cc	2009-03-06 15:56:35.000000000 -0600
+@@ -315,7 +315,7 @@ GString *grabPath(const char *fileName) 
+ 
+ #else
+   //---------- Unix ----------
+-  char *p;
++  const char *p;
+ 
+   if ((p = strrchr(fileName, '/')))
+     return new GString(fileName, p - fileName);

koffice-1.6.3-magick_version.patch:
 kis_image_magick_converter.cc |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE koffice-1.6.3-magick_version.patch ---
diff -up koffice-1.6.3/filters/krita/magick/kis_image_magick_converter.cc.magick_version koffice-1.6.3/filters/krita/magick/kis_image_magick_converter.cc
--- koffice-1.6.3/filters/krita/magick/kis_image_magick_converter.cc.magick_version	2009-08-26 15:42:15.323637145 -0500
+++ koffice-1.6.3/filters/krita/magick/kis_image_magick_converter.cc	2009-08-26 15:47:18.470639483 -0500
@@ -457,7 +457,11 @@ KisImageBuilder_Result KisImageMagickCon
 
             for (Q_UINT32 y = 0; y < image->rows; y ++)
             {
+#if MagickLibVersion >  0x630 
                 const PixelPacket *pp = AcquireCacheViewPixels(vi, 0, y, image->columns, 1, &ei);
+#else 
+                const PixelPacket *pp = AcquireCacheView(vi, 0, y, image->columns, 1, &ei);
+#endif
 
                 if(!pp)
                 {

koffice-1.6.3-quint32.patch:
 kis_tiff_converter.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: koffice-1.6.3-quint32.patch
===================================================================
RCS file: koffice-1.6.3-quint32.patch
diff -N koffice-1.6.3-quint32.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ koffice-1.6.3-quint32.patch	26 Sep 2009 18:19:01 -0000	1.3
@@ -0,0 +1,12 @@
+diff -up koffice-1.6.3/filters/krita/tiff/kis_tiff_converter.cc.quint32 koffice-1.6.3/filters/krita/tiff/kis_tiff_converter.cc
+--- koffice-1.6.3/filters/krita/tiff/kis_tiff_converter.cc.quint32	2009-03-06 15:55:16.000000000 -0600
++++ koffice-1.6.3/filters/krita/tiff/kis_tiff_converter.cc	2009-03-07 13:42:40.000000000 -0600
+@@ -242,7 +242,7 @@ KisImageBuilder_Result KisTIFFConverter:
+     // Read image profile
+     kdDebug() << "Reading profile" << endl;
+     KisProfile* profile = 0;
+-    quint32 EmbedLen;
++    DWORD EmbedLen;
+     LPBYTE EmbedBuffer;
+ 
+     if (TIFFGetField(image, TIFFTAG_ICCPROFILE, &EmbedLen, &EmbedBuffer)) {

koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff:
 Stream.cc |  615 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Stream.h  |   12 -
 2 files changed, 623 insertions(+), 4 deletions(-)

Index: koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
===================================================================
RCS file: koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
diff -N koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff	26 Sep 2009 18:19:02 -0000	1.7
@@ -0,0 +1,669 @@
+--- filters/kword/pdf/xpdf/xpdf/Stream.cc
++++ filters/kword/pdf/xpdf/xpdf/Stream.cc
+@@ -1239,6 +1239,7 @@
+ // CCITTFaxStream
+ //------------------------------------------------------------------------
+ 
++#if 0
+ CCITTFaxStream::CCITTFaxStream(Stream *strA, int encodingA, GBool endOfLineA,
+ 			       GBool byteAlignA, int columnsA, int rowsA,
+ 			       GBool endOfBlockA, GBool blackA):
+@@ -1748,6 +1749,609 @@
+   }
+   return (inputBuf >> (inputBits - n)) & (0xffff >> (16 - n));
+ }
++#else // secfix
++CCITTFaxStream::CCITTFaxStream(Stream *strA, int encodingA, GBool endOfLineA,
++			       GBool byteAlignA, int columnsA, int rowsA,
++			       GBool endOfBlockA, GBool blackA):
++    FilterStream(strA) {
++  encoding = encodingA;
++  endOfLine = endOfLineA;
++  byteAlign = byteAlignA;
++  columns = columnsA;
++  if (columns < 1) {
++    columns = 1;
++  } else if (columns > (INT_MAX - 2)/sizeof(int)) {
++    columns = (INT_MAX - 2)/sizeof(int);
++  }
++  rows = rowsA;
++  endOfBlock = endOfBlockA;
++  black = blackA;
++  // 0 <= codingLine[0] < codingLine[1] < ... < codingLine[n] = columns
++  // ---> max codingLine size = columns + 1
++  // refLine has one extra guard entry at the end
++  // ---> max refLine size = columns + 2
++  codingLine = (int *)gmalloc((columns + 1) * sizeof(int));
++  refLine = (int *)gmalloc((columns + 2) * sizeof(int));
++
++  eof = gFalse;
++  row = 0;
++  nextLine2D = encoding < 0;
++  inputBits = 0;
++  codingLine[0] = columns;
++  a0i = 0;
++  outputBits = 0;
++
++  buf = EOF;
++}
++
++CCITTFaxStream::~CCITTFaxStream() {
++  delete str;
++  gfree(refLine);
++  gfree(codingLine);
++}
++
++void CCITTFaxStream::reset() {
++  short code1;
++
++  str->reset();
++  eof = gFalse;
++  row = 0;
++  nextLine2D = encoding < 0;
++  inputBits = 0;
++  codingLine[0] = columns;
++  a0i = 0;
++  outputBits = 0;
++  buf = EOF;
++
++  // skip any initial zero bits and end-of-line marker, and get the 2D
++  // encoding tag
++  while ((code1 = lookBits(12)) == 0) {
++    eatBits(1);
++  }
++  if (code1 == 0x001) {
++    eatBits(12);
++  }
++  if (encoding > 0) {
++    nextLine2D = !lookBits(1);
++    eatBits(1);
++  }
++}
++
++inline void CCITTFaxStream::addPixels(int a1, int blackPixels) {
++  if (a1 > codingLine[a0i]) {
++    if (a1 > columns) {
++      error(getPos(), "CCITTFax row is wrong length (%d)", a1);
++      err = gTrue;
++      a1 = columns;
++    }
++    if ((a0i & 1) ^ blackPixels) {
++      ++a0i;
++    }
++    codingLine[a0i] = a1;
++  }
++}
++
++inline void CCITTFaxStream::addPixelsNeg(int a1, int blackPixels) {
++  if (a1 > codingLine[a0i]) {
++    if (a1 > columns) {
++      error(getPos(), "CCITTFax row is wrong length (%d)", a1);
++      err = gTrue;
++      a1 = columns;
++    }
++    if ((a0i & 1) ^ blackPixels) {
++      ++a0i;
++    }
++    codingLine[a0i] = a1;
++  } else if (a1 < codingLine[a0i]) {
++    if (a1 < 0) {
++      error(getPos(), "Invalid CCITTFax code");
++      err = gTrue;
++      a1 = 0;
++    }
++    while (a0i > 0 && a1 <= codingLine[a0i - 1]) {
++      --a0i;
++    }
++    codingLine[a0i] = a1;
++  }
++}
++
++int CCITTFaxStream::lookChar() {
++  short code1, code2, code3;
++  int b1i, blackPixels, i, bits;
++  GBool gotEOL;
++
++  if (buf != EOF) {
++    return buf;
++  }
++
++  // read the next row
++  if (outputBits == 0) {
++
++    // if at eof just return EOF
++    if (eof) {
++      return EOF;
++    }
++
++    err = gFalse;
++
++    // 2-D encoding
++    if (nextLine2D) {
++      for (i = 0; codingLine[i] < columns; ++i) {
++	refLine[i] = codingLine[i];
++      }
++      refLine[i++] = columns;
++      refLine[i] = columns;
++      codingLine[0] = 0;
++      a0i = 0;
++      b1i = 0;
++      blackPixels = 0;
++      // invariant:
++      // refLine[b1i-1] <= codingLine[a0i] < refLine[b1i] < refLine[b1i+1]
++      //                                                             <= columns
++      // exception at left edge:
++      //   codingLine[a0i = 0] = refLine[b1i = 0] = 0 is possible
++      // exception at right edge:
++      //   refLine[b1i] = refLine[b1i+1] = columns is possible
++      while (codingLine[a0i] < columns) {
++	code1 = getTwoDimCode();
++	switch (code1) {
++	case twoDimPass:
++	  addPixels(refLine[b1i + 1], blackPixels);
++	  if (refLine[b1i + 1] < columns) {
++	    b1i += 2;
++	  }
++	  break;
++	case twoDimHoriz:
++	  code1 = code2 = 0;
++	  if (blackPixels) {
++	    do {
++	      code1 += code3 = getBlackCode();
++	    } while (code3 >= 64);
++	    do {
++	      code2 += code3 = getWhiteCode();
++	    } while (code3 >= 64);
++	  } else {
++	    do {
++	      code1 += code3 = getWhiteCode();
++	    } while (code3 >= 64);
++	    do {
++	      code2 += code3 = getBlackCode();
++	    } while (code3 >= 64);
++	  }
++	  addPixels(codingLine[a0i] + code1, blackPixels);
++	  if (codingLine[a0i] < columns) {
++	    addPixels(codingLine[a0i] + code2, blackPixels ^ 1);
++	  }
++	  while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
++	    b1i += 2;
++	  }
++	  break;
++	case twoDimVertR3:
++	  addPixels(refLine[b1i] + 3, blackPixels);
++	  blackPixels ^= 1;
++	  if (codingLine[a0i] < columns) {
++	    ++b1i;
++	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
++	      b1i += 2;
++	    }
++	  }
++	  break;
++	case twoDimVertR2:
++	  addPixels(refLine[b1i] + 2, blackPixels);
++	  blackPixels ^= 1;
++	  if (codingLine[a0i] < columns) {
++	    ++b1i;
++	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
++	      b1i += 2;
++	    }
++	  }
++	  break;
++	case twoDimVertR1:
++	  addPixels(refLine[b1i] + 1, blackPixels);
++	  blackPixels ^= 1;
++	  if (codingLine[a0i] < columns) {
++	    ++b1i;
++	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
++	      b1i += 2;
++	    }
++	  }
++	  break;
++	case twoDimVert0:
++	  addPixels(refLine[b1i], blackPixels);
++	  blackPixels ^= 1;
++	  if (codingLine[a0i] < columns) {
++	    ++b1i;
++	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
++	      b1i += 2;
++	    }
++	  }
++	  break;
++	case twoDimVertL3:
++	  addPixelsNeg(refLine[b1i] - 3, blackPixels);
++	  blackPixels ^= 1;
++	  if (codingLine[a0i] < columns) {
++	    if (b1i > 0) {
++	      --b1i;
++	    } else {
++	      ++b1i;
++	    }
++	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
++	      b1i += 2;
++	    }
++	  }
++	  break;
++	case twoDimVertL2:
++	  addPixelsNeg(refLine[b1i] - 2, blackPixels);
++	  blackPixels ^= 1;
++	  if (codingLine[a0i] < columns) {
++	    if (b1i > 0) {
++	      --b1i;
++	    } else {
++	      ++b1i;
++	    }
++	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
++	      b1i += 2;
++	    }
++	  }
++	  break;
++	case twoDimVertL1:
++	  addPixelsNeg(refLine[b1i] - 1, blackPixels);
++	  blackPixels ^= 1;
++	  if (codingLine[a0i] < columns) {
++	    if (b1i > 0) {
++	      --b1i;
++	    } else {
++	      ++b1i;
++	    }
++	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
++	      b1i += 2;
++	    }
++	  }
++	  break;
++	case EOF:
++	  addPixels(columns, 0);
++	  eof = gTrue;
++	  break;
++	default:
++	  error(getPos(), "Bad 2D code %04x in CCITTFax stream", code1);
++	  addPixels(columns, 0);
++	  err = gTrue;
++	  break;
++	}
++      }
++
++    // 1-D encoding
++    } else {
++      codingLine[0] = 0;
++      a0i = 0;
++      blackPixels = 0;
++      while (codingLine[a0i] < columns) {
++	code1 = 0;
++	if (blackPixels) {
++	  do {
++	    code1 += code3 = getBlackCode();
++	  } while (code3 >= 64);
++	} else {
++	  do {
++	    code1 += code3 = getWhiteCode();
++	  } while (code3 >= 64);
++	}
++	addPixels(codingLine[a0i] + code1, blackPixels);
++	blackPixels ^= 1;
++      }
++    }
++
++    // byte-align the row
++    if (byteAlign) {
++      inputBits &= ~7;
++    }
++
++    // check for end-of-line marker, skipping over any extra zero bits
++    gotEOL = gFalse;
++    if (!endOfBlock && row == rows - 1) {
++      eof = gTrue;
++    } else {
++      code1 = lookBits(12);
++      while (code1 == 0) {
++	eatBits(1);
++	code1 = lookBits(12);
++      }
++      if (code1 == 0x001) {
++	eatBits(12);
++	gotEOL = gTrue;
++      } else if (code1 == EOF) {
++	eof = gTrue;
++      }
++    }
++
++    // get 2D encoding tag
++    if (!eof && encoding > 0) {
++      nextLine2D = !lookBits(1);
++      eatBits(1);
++    }
++
++    // check for end-of-block marker
++    if (endOfBlock && gotEOL) {
++      code1 = lookBits(12);
++      if (code1 == 0x001) {
++	eatBits(12);
++	if (encoding > 0) {
++	  lookBits(1);
++	  eatBits(1);
++	}
++	if (encoding >= 0) {
++	  for (i = 0; i < 4; ++i) {
++	    code1 = lookBits(12);
++	    if (code1 != 0x001) {
++	      error(getPos(), "Bad RTC code in CCITTFax stream");
++	    }
++	    eatBits(12);
++	    if (encoding > 0) {
++	      lookBits(1);
++	      eatBits(1);
++	    }
++	  }
++	}
++	eof = gTrue;
++      }
++
++    // look for an end-of-line marker after an error -- we only do
++    // this if we know the stream contains end-of-line markers because
++    // the "just plow on" technique tends to work better otherwise
++    } else if (err && endOfLine) {
++      while (1) {
++	code1 = lookBits(13);
++	if (code1 == EOF) {
++	  eof = gTrue;
++	  return EOF;
++	}
++	if ((code1 >> 1) == 0x001) {
++	  break;
++	}
++	eatBits(1);
++      }
++      eatBits(12); 
++      if (encoding > 0) {
++	eatBits(1);
++	nextLine2D = !(code1 & 1);
++      }
++    }
++
++    // set up for output
++    if (codingLine[0] > 0) {
++      outputBits = codingLine[a0i = 0];
++    } else {
++      outputBits = codingLine[a0i = 1];
++    }
++
++    ++row;
++  }
++
++  // get a byte
++  if (outputBits >= 8) {
++    buf = (a0i & 1) ? 0x00 : 0xff;
++    outputBits -= 8;
++    if (outputBits == 0 && codingLine[a0i] < columns) {
++      ++a0i;
++      outputBits = codingLine[a0i] - codingLine[a0i - 1];
++    }
++  } else {
++    bits = 8;
++    buf = 0;
++    do {
++      if (outputBits > bits) {
++	buf <<= bits;
++	if (!(a0i & 1)) {
++	  buf |= 0xff >> (8 - bits);
++	}
++	outputBits -= bits;
++	bits = 0;
++      } else {
++	buf <<= outputBits;
++	if (!(a0i & 1)) {
++	  buf |= 0xff >> (8 - outputBits);
++	}
++	bits -= outputBits;
++	outputBits = 0;
++	if (codingLine[a0i] < columns) {
++	  ++a0i;
++	  outputBits = codingLine[a0i] - codingLine[a0i - 1];
++	} else if (bits > 0) {
++	  buf <<= bits;
++	  bits = 0;
++	}
++      }
++    } while (bits);
++  }
++  if (black) {
++    buf ^= 0xff;
++  }
++  return buf;
++}
++
++short CCITTFaxStream::getTwoDimCode() {
++  short code;
++  CCITTCode *p;
++  int n;
++
++  code = 0; // make gcc happy
++  if (endOfBlock) {
++    code = lookBits(7);
++    p = &twoDimTab1[code];
++    if (p->bits > 0) {
++      eatBits(p->bits);
++      return p->n;
++    }
++  } else {
++    for (n = 1; n <= 7; ++n) {
++      code = lookBits(n);
++      if (n < 7) {
++	code <<= 7 - n;
++      }
++      p = &twoDimTab1[code];
++      if (p->bits == n) {
++	eatBits(n);
++	return p->n;
++      }
++    }
++  }
++  error(getPos(), "Bad two dim code (%04x) in CCITTFax stream", code);
++  return EOF;
++}
++
++short CCITTFaxStream::getWhiteCode() {
++  short code;
++  CCITTCode *p;
++  int n;
++
++  code = 0; // make gcc happy
++  if (endOfBlock) {
++    code = lookBits(12);
++    if (code == EOF) {
++      return 1;
++    }
++    if ((code >> 5) == 0) {
++      p = &whiteTab1[code];
++    } else {
++      p = &whiteTab2[code >> 3];
++    }
++    if (p->bits > 0) {
++      eatBits(p->bits);
++      return p->n;
++    }
++  } else {
++    for (n = 1; n <= 9; ++n) {
++      code = lookBits(n);
++      if (code == EOF) {
++	return 1;
++      }
++      if (n < 9) {
++	code <<= 9 - n;
++      }
++      p = &whiteTab2[code];
++      if (p->bits == n) {
++	eatBits(n);
++	return p->n;
++      }
++    }
++    for (n = 11; n <= 12; ++n) {
++      code = lookBits(n);
++      if (code == EOF) {
++	return 1;
++      }
++      if (n < 12) {
++	code <<= 12 - n;
++      }
++      p = &whiteTab1[code];
++      if (p->bits == n) {
++	eatBits(n);
++	return p->n;
++      }
++    }
++  }
++  error(getPos(), "Bad white code (%04x) in CCITTFax stream", code);
++  // eat a bit and return a positive number so that the caller doesn't
++  // go into an infinite loop
++  eatBits(1);
++  return 1;
++}
++
++short CCITTFaxStream::getBlackCode() {
++  short code;
++  CCITTCode *p;
++  int n;
++
++  code = 0; // make gcc happy
++  if (endOfBlock) {
++    code = lookBits(13);
++    if (code == EOF) {
++      return 1;
++    }
++    if ((code >> 7) == 0) {
++      p = &blackTab1[code];
++    } else if ((code >> 9) == 0 && (code >> 7) != 0) {
++      p = &blackTab2[(code >> 1) - 64];
++    } else {
++      p = &blackTab3[code >> 7];
++    }
++    if (p->bits > 0) {
++      eatBits(p->bits);
++      return p->n;
++    }
++  } else {
++    for (n = 2; n <= 6; ++n) {
++      code = lookBits(n);
++      if (code == EOF) {
++	return 1;
++      }
++      if (n < 6) {
++	code <<= 6 - n;
++      }
++      p = &blackTab3[code];
++      if (p->bits == n) {
++	eatBits(n);
++	return p->n;
++      }
++    }
++    for (n = 7; n <= 12; ++n) {
++      code = lookBits(n);
++      if (code == EOF) {
++	return 1;
++      }
++      if (n < 12) {
++	code <<= 12 - n;
++      }
++      if (code >= 64) {
++	p = &blackTab2[code - 64];
++	if (p->bits == n) {
++	  eatBits(n);
++	  return p->n;
++	}
++      }
++    }
++    for (n = 10; n <= 13; ++n) {
++      code = lookBits(n);
++      if (code == EOF) {
++	return 1;
++      }
++      if (n < 13) {
++	code <<= 13 - n;
++      }
++      p = &blackTab1[code];
++      if (p->bits == n) {
++	eatBits(n);
++	return p->n;
++      }
++    }
++  }
++  error(getPos(), "Bad black code (%04x) in CCITTFax stream", code);
++  // eat a bit and return a positive number so that the caller doesn't
++  // go into an infinite loop
++  eatBits(1);
++  return 1;
++}
++
++short CCITTFaxStream::lookBits(int n) {
++  int c;
++
++  while (inputBits < n) {
++    if ((c = str->getChar()) == EOF) {
++      if (inputBits == 0) {
++	return EOF;
++      }
++      // near the end of the stream, the caller may ask for more bits
++      // than are available, but there may still be a valid code in
++      // however many bits are available -- we need to return correct
++      // data in this case
++      return (inputBuf << (n - inputBits)) & (0xffff >> (16 - n));
++    }
++    inputBuf = (inputBuf << 8) + c;
++    inputBits += 8;
++  }
++  return (inputBuf >> (inputBits - n)) & (0xffff >> (16 - n));
++}
++
++#endif
+ 
+ GString *CCITTFaxStream::getPSFilter(const char *indent) {
+   GString *s;
+@@ -1929,6 +2533,12 @@
+     // allocate a buffer for the whole image
+     bufWidth = ((width + mcuWidth - 1) / mcuWidth) * mcuWidth;
+     bufHeight = ((height + mcuHeight - 1) / mcuHeight) * mcuHeight;
++    if (bufWidth <= 0 || bufHeight <= 0 ||
++	bufWidth > INT_MAX / bufWidth / (int)sizeof(int)) {
++      error(getPos(), "Invalid image size in DCT stream");
++      y = height;
++      return;
++    }
+     for (i = 0; i < numComps; ++i) {
+       frameBuf[i] = (int *)gmalloc(bufWidth * bufHeight * sizeof(int));
+       memset(frameBuf[i], 0, bufWidth * bufHeight * sizeof(int));
+@@ -2975,6 +3585,11 @@
+   }
+   scanInfo.firstCoeff = str->getChar();
+   scanInfo.lastCoeff = str->getChar();
++  if (scanInfo.firstCoeff < 0 || scanInfo.lastCoeff > 63 ||
++      scanInfo.firstCoeff > scanInfo.lastCoeff) {
++    error(getPos(), "Bad DCT coefficient numbers in scan info block");
++    return gFalse;
++  }
+   c = str->getChar();
+   scanInfo.ah = (c >> 4) & 0x0f;
+   scanInfo.al = c & 0x0f;
+--- filters/kword/pdf/xpdf/xpdf/Stream.h
++++ filters/kword/pdf/xpdf/xpdf/Stream.h
+@@ -513,13 +513,17 @@
+   int row;			// current row
+   int inputBuf;			// input buffer
+   int inputBits;		// number of bits in input buffer
+-  short *refLine;		// reference line changing elements
+-  int b1;			// index into refLine
+-  short *codingLine;		// coding line changing elements
+-  int a0;			// index into codingLine
++  int *codingLine;             // coding line changing elements
++  int *refLine;                        // reference line changing elements
++  int a0i;                     // index into codingLine
++  GBool err;                   // error on current line
++
+   int outputBits;		// remaining output bits
+   int buf;			// character buffer
+ 
++  void addPixels(int a1, int black);
++  void addPixelsNeg(int a1, int black);
++
+   short getTwoDimCode();
+   short getWhiteCode();
+   short getBlackCode();

koffice-20090306svn.patch:
 koffice-1.6-branch/admin/Doxyfile.am                                                                   |    4 
 koffice-1.6-branch/admin/acinclude.m4.in                                                               |   39 
 koffice-1.6-branch/admin/cvs.sh                                                                        |    2 
 koffice-1.6-branch/admin/detect-autoconf.pl                                                            |  107 +
 koffice-1.6-branch/configure.in.in                                                                     |    4 
 koffice-1.6-branch/doc/Makefile.am                                                                     |    4 
 koffice-1.6-branch/doc/koffice.desktop                                                                 |    1 
 koffice-1.6-branch/doc/krita/dialogs-imagerestoration.png                                              |binary
 koffice-1.6-branch/doc/krita/tutorial-select-layer.docbook                                             |    6 
 koffice-1.6-branch/example/example.desktop                                                             |    6 
 koffice-1.6-branch/example/examplepart.desktop                                                         |    3 
 koffice-1.6-branch/example/x-vnd.kde.example.desktop                                                   |    1 
 koffice-1.6-branch/filters/generic_wrapper/generic_filter.desktop                                      |    9 
 koffice-1.6-branch/filters/karbon/ai/karbon_ai_import.desktop                                          |    6 
 koffice-1.6-branch/filters/karbon/applixgraphics/kontour_applixgraphic_import.desktop                  |    7 
 koffice-1.6-branch/filters/karbon/eps/karbon_eps_export.desktop                                        |    6 
 koffice-1.6-branch/filters/karbon/eps/karbon_eps_import.desktop                                        |    6 
 koffice-1.6-branch/filters/karbon/eps/karbon_ps_import.desktop                                         |    6 
 koffice-1.6-branch/filters/karbon/kontour/karbon_kontour_import.desktop                                |    8 
 koffice-1.6-branch/filters/karbon/msod/karbon_msod_import.desktop                                      |    7 
 koffice-1.6-branch/filters/karbon/oodraw/karbon_oodraw_import.desktop                                  |    7 
 koffice-1.6-branch/filters/karbon/png/karbon_png_export.desktop                                        |    6 
 koffice-1.6-branch/filters/karbon/svg/karbon_svg_export.desktop                                        |    6 
 koffice-1.6-branch/filters/karbon/svg/karbon_svg_import.desktop                                        |    7 
 koffice-1.6-branch/filters/karbon/wmf/karbon_wmf_export.desktop                                        |    7 
 koffice-1.6-branch/filters/karbon/wmf/karbon_wmf_import.desktop                                        |    6 
 koffice-1.6-branch/filters/karbon/xaml/karbon_xaml_export.desktop                                      |    8 
 koffice-1.6-branch/filters/karbon/xaml/karbon_xaml_import.desktop                                      |    8 
 koffice-1.6-branch/filters/karbon/xcf/karbon_xcf_export.desktop                                        |    6 
 koffice-1.6-branch/filters/karbon/xfig/karbon_xfig_import.desktop                                      |    7 
 koffice-1.6-branch/filters/kchart/bmp/kchart_bmp_export.desktop                                        |    8 
 koffice-1.6-branch/filters/kchart/jpeg/kchart_jpeg_export.desktop                                      |    8 
 koffice-1.6-branch/filters/kchart/mng/kchart_mng_export.desktop                                        |    8 
 koffice-1.6-branch/filters/kchart/png/kchart_png_export.desktop                                        |    9 
 koffice-1.6-branch/filters/kchart/svg/kchart_svg_export.desktop                                        |    9 
 koffice-1.6-branch/filters/kchart/xbm/kchart_xbm_export.desktop                                        |    8 
 koffice-1.6-branch/filters/kchart/xpm/kchart_xpm_export.desktop                                        |    8 
 koffice-1.6-branch/filters/kformula/latex/kformula_latex_export.desktop                                |    7 
 koffice-1.6-branch/filters/kformula/mathml/kformula_mathml_export.desktop                              |    7 
 koffice-1.6-branch/filters/kformula/mathml/kformula_mathml_import.desktop                              |    7 
 koffice-1.6-branch/filters/kformula/png/kformula_png_export.desktop                                    |    7 
 koffice-1.6-branch/filters/kformula/svg/kformula_svg_export.desktop                                    |    8 
 koffice-1.6-branch/filters/kivio/imageexport/kivio_image_export.desktop                                |    8 
 koffice-1.6-branch/filters/kpresenter/bmp/kpresenter_bmp_export.desktop                                |    8 
 koffice-1.6-branch/filters/kpresenter/jpeg/kpresenter_jpeg_export.desktop                              |    8 
 koffice-1.6-branch/filters/kpresenter/kword/kprkword.desktop                                           |    7 
 koffice-1.6-branch/filters/kpresenter/magicpoint/kpresenter_magicpoint_import.desktop                  |    7 
 koffice-1.6-branch/filters/kpresenter/mng/kpresenter_mng_export.desktop                                |    8 
 koffice-1.6-branch/filters/kpresenter/ooimpress/kpresenter_ooimpress_export.desktop                    |    6 
 koffice-1.6-branch/filters/kpresenter/ooimpress/kpresenter_ooimpress_import.desktop                    |    6 
 koffice-1.6-branch/filters/kpresenter/png/kpresenter_png_export.desktop                                |    8 
 koffice-1.6-branch/filters/kpresenter/powerpoint/import/kpresenter_powerpoint_import.desktop           |    7 
 koffice-1.6-branch/filters/kpresenter/svg/kpresenter_svg_export.desktop                                |    8 
 koffice-1.6-branch/filters/kpresenter/xbm/kpresenter_xbm_export.desktop                                |    8 
 koffice-1.6-branch/filters/kpresenter/xpm/kpresenter_xpm_export.desktop                                |    8 
 koffice-1.6-branch/filters/krita/gmagick/kis_image_magick_converter.cc                                 |   52 
 koffice-1.6-branch/filters/krita/gmagick/krita_magick.desktop                                          |    7 
 koffice-1.6-branch/filters/krita/gmagick/krita_magick_export.desktop                                   |   11 
 koffice-1.6-branch/filters/krita/gmagick/krita_magick_import.desktop                                   |    9 
 koffice-1.6-branch/filters/krita/jpeg/krita_jpeg.desktop                                               |    8 
 koffice-1.6-branch/filters/krita/jpeg/krita_jpeg_export.desktop                                        |    8 
 koffice-1.6-branch/filters/krita/jpeg/krita_jpeg_import.desktop                                        |    8 
 koffice-1.6-branch/filters/krita/magick/Makefile.am                                                    |    2 
 koffice-1.6-branch/filters/krita/magick/kis_image_magick_converter.cc                                  |    2 
 koffice-1.6-branch/filters/krita/magick/krita_magick.desktop                                           |    7 
 koffice-1.6-branch/filters/krita/magick/krita_magick_export.desktop                                    |    9 
 koffice-1.6-branch/filters/krita/magick/krita_magick_import.desktop                                    |    9 
 koffice-1.6-branch/filters/krita/openexr/krita_openexr.desktop                                         |    7 
 koffice-1.6-branch/filters/krita/openexr/krita_openexr_export.desktop                                  |    8 
 koffice-1.6-branch/filters/krita/openexr/krita_openexr_import.desktop                                  |    8 
 koffice-1.6-branch/filters/krita/pdf/krita_pdf.desktop                                                 |    7 
 koffice-1.6-branch/filters/krita/pdf/krita_pdf_import.desktop                                          |   11 
 koffice-1.6-branch/filters/krita/png/krita_png.desktop                                                 |    7 
 koffice-1.6-branch/filters/krita/png/krita_png_export.desktop                                          |    8 
 koffice-1.6-branch/filters/krita/png/krita_png_import.desktop                                          |    8 
 koffice-1.6-branch/filters/krita/raw/krita_raw.desktop                                                 |    7 
 koffice-1.6-branch/filters/krita/raw/krita_raw_import.desktop                                          |    8 
 koffice-1.6-branch/filters/krita/tiff/kis_tiff_converter.cc                                            |    8 
 koffice-1.6-branch/filters/krita/tiff/krita_tiff.desktop                                               |    7 
 koffice-1.6-branch/filters/krita/tiff/krita_tiff_export.desktop                                        |    8 
 koffice-1.6-branch/filters/krita/tiff/krita_tiff_import.desktop                                        |    8 
 koffice-1.6-branch/filters/krita/xcf/krita_xcf_export.desktop                                          |    8 
 koffice-1.6-branch/filters/krita/xcf/krita_xcf_import.desktop                                          |    8 
 koffice-1.6-branch/filters/kspread/applixspread/kspread_applixspread_import.desktop                    |    9 
 koffice-1.6-branch/filters/kspread/csv/kspread_csv_export.desktop                                      |    9 
 koffice-1.6-branch/filters/kspread/csv/kspread_csv_import.desktop                                      |    9 
 koffice-1.6-branch/filters/kspread/dbase/kspread_dbase_import.desktop                                  |   12 
 koffice-1.6-branch/filters/kspread/excel/import/kspread_excel_import.desktop                           |    9 
 koffice-1.6-branch/filters/kspread/excel/kspread_excel_export.desktop                                  |    9 
 koffice-1.6-branch/filters/kspread/gnumeric/gnumericimport.cc                                          |  118 -
 koffice-1.6-branch/filters/kspread/gnumeric/kspread_gnumeric_export.desktop                            |    9 
 koffice-1.6-branch/filters/kspread/gnumeric/kspread_gnumeric_import.desktop                            |    9 
 koffice-1.6-branch/filters/kspread/html/kspread_html_export.desktop                                    |    9 
 koffice-1.6-branch/filters/kspread/kexi/kspread_kexi_import.desktop                                    |   10 
 koffice-1.6-branch/filters/kspread/latex/export/kspread_latex_export.desktop                           |    9 
 koffice-1.6-branch/filters/kspread/opencalc/kspread_opencalc_export.desktop                            |   11 
 koffice-1.6-branch/filters/kspread/opencalc/kspread_opencalc_import.desktop                            |   11 
 koffice-1.6-branch/filters/kspread/qpro/kspread_qpro_import.desktop                                    |    9 
 koffice-1.6-branch/filters/kugar/kugarnop/kugar_kugar_import.desktop                                   |    7 
 koffice-1.6-branch/filters/kword/abiword/kword_abiword_export.desktop                                  |    7 
 koffice-1.6-branch/filters/kword/abiword/kword_abiword_import.desktop                                  |    7 
 koffice-1.6-branch/filters/kword/amipro/kword_amipro_export.desktop                                    |    7 
 koffice-1.6-branch/filters/kword/amipro/kword_amipro_import.desktop                                    |    7 
 koffice-1.6-branch/filters/kword/applixword/kword_applixword_import.desktop                            |    7 
 koffice-1.6-branch/filters/kword/ascii/kword_ascii_export.desktop                                      |    9 
 koffice-1.6-branch/filters/kword/ascii/kword_ascii_import.desktop                                      |    7 
 koffice-1.6-branch/filters/kword/docbook/kword_docbook_export.desktop                                  |    7 
 koffice-1.6-branch/filters/kword/hancomword/kword_hancomword_import.desktop                            |    8 
 koffice-1.6-branch/filters/kword/html/export/kword_html_export.desktop                                 |    7 
 koffice-1.6-branch/filters/kword/html/import/kword_html_import.desktop                                 |    7 
 koffice-1.6-branch/filters/kword/kword1.3/import/kword_kword1dot3_import.desktop                       |    7 
 koffice-1.6-branch/filters/kword/kword1.3/import/uninstall.desktop                                     |    1 
 koffice-1.6-branch/filters/kword/latex/export/kword_latex_export.desktop                               |    7 
 koffice-1.6-branch/filters/kword/latex/import/kword_latex_import.desktop                               |   11 
 koffice-1.6-branch/filters/kword/msword/kword_msword_import.desktop                                    |    9 
 koffice-1.6-branch/filters/kword/mswrite/IMPERFECT                                                     |    2 
 koffice-1.6-branch/filters/kword/mswrite/ROADMAP                                                       |    5 
 koffice-1.6-branch/filters/kword/mswrite/config.libmswrite.h                                           |   35 
 koffice-1.6-branch/filters/kword/mswrite/kword_mswrite_export.desktop                                  |    9 
 koffice-1.6-branch/filters/kword/mswrite/kword_mswrite_import.desktop                                  |    9 
 koffice-1.6-branch/filters/kword/mswrite/libmswrite.cpp                                                |   90 +
 koffice-1.6-branch/filters/kword/mswrite/libmswrite.h                                                  |   44 
 koffice-1.6-branch/filters/kword/mswrite/libmswrite_defs.cpp                                           |   37 
 koffice-1.6-branch/filters/kword/mswrite/libmswrite_defs.h                                             |   99 -
 koffice-1.6-branch/filters/kword/mswrite/list.h                                                        |   45 
 koffice-1.6-branch/filters/kword/mswrite/mswriteexport.cc                                              |   36 
 koffice-1.6-branch/filters/kword/mswrite/mswriteexport.h                                               |   32 
 koffice-1.6-branch/filters/kword/mswrite/mswriteimport.cc                                              |   36 
 koffice-1.6-branch/filters/kword/mswrite/mswriteimport.h                                               |   32 
 koffice-1.6-branch/filters/kword/mswrite/status.html                                                   |   25 
 koffice-1.6-branch/filters/kword/mswrite/structures.cpp                                                |  149 +-
 koffice-1.6-branch/filters/kword/mswrite/structures.h                                                  |   61 
 koffice-1.6-branch/filters/kword/mswrite/structures_generated.cpp                                      |   89 -
 koffice-1.6-branch/filters/kword/mswrite/structures_generated.h                                        |  100 -
 koffice-1.6-branch/filters/kword/mswrite/structures_private.cpp                                        |   47 
 koffice-1.6-branch/filters/kword/mswrite/structures_private.h                                          |   45 
 koffice-1.6-branch/filters/kword/oowriter/kword_oowriter_export.desktop                                |    7 
 koffice-1.6-branch/filters/kword/oowriter/kword_oowriter_import.desktop                                |    7 
 koffice-1.6-branch/filters/kword/palmdoc/kword_palmdoc_export.desktop                                  |    7 
 koffice-1.6-branch/filters/kword/palmdoc/kword_palmdoc_import.desktop                                  |    7 
 koffice-1.6-branch/filters/kword/pdf/kword_pdf_import.desktop                                          |    7 
 koffice-1.6-branch/filters/kword/pdf/pdfimport.cpp                                                     |   11 
 koffice-1.6-branch/filters/kword/pdf/xpdf/goo/gmem.c                                                   |   19 
 koffice-1.6-branch/filters/kword/pdf/xpdf/goo/gmem.h                                                   |    1 
 koffice-1.6-branch/filters/kword/pdf/xpdf/xpdf/Stream.cc                                               |  634 +++++++++-
 koffice-1.6-branch/filters/kword/pdf/xpdf/xpdf/Stream.h                                                |   12 
 koffice-1.6-branch/filters/kword/rtf/export/kword_rtf_export.desktop                                   |    7 
 koffice-1.6-branch/filters/kword/rtf/import/kword_rtf_import.desktop                                   |    7 
 koffice-1.6-branch/filters/kword/starwriter/kword_starwriter_import.desktop                            |    7 
 koffice-1.6-branch/filters/kword/wml/kword_wml_export.desktop                                          |    7 
 koffice-1.6-branch/filters/kword/wml/kword_wml_import.desktop                                          |    7 
 koffice-1.6-branch/filters/kword/wordperfect/export/kword_wp_export.desktop                            |    7 
 koffice-1.6-branch/filters/kword/wordperfect/import/TableStyle.cxx                                     |    2 
 koffice-1.6-branch/filters/kword/wordperfect/import/TextRunStyle.cxx                                   |    2 
 koffice-1.6-branch/filters/kword/wordperfect/import/kword_wp_import.desktop                            |    7 
 koffice-1.6-branch/filters/olefilters/powerpoint97/ole_powerpoint97_import.desktop                     |    8 
 koffice-1.6-branch/filters/xsltfilter/export/xslt_export.desktop                                       |    9 
 koffice-1.6-branch/filters/xsltfilter/import/xslt_import.desktop                                       |    9 
 koffice-1.6-branch/karbon/data/karbon.desktop                                                          |   11 
 koffice-1.6-branch/karbon/data/karbon_module.desktop                                                   |    5 
 koffice-1.6-branch/karbon/data/karbonpart.desktop                                                      |   16 
 koffice-1.6-branch/karbon/plugins/imagetool/karbonimagetool.desktop                                    |    7 
 koffice-1.6-branch/karbon/plugins/zoomtool/karbonzoomtool.desktop                                      |    8 
 koffice-1.6-branch/karbon/templates/basic/.directory                                                   |    6 
 koffice-1.6-branch/karbon/templates/basic/empty.desktop                                                |   14 
 koffice-1.6-branch/karbon/tools/karbondefaulttools.desktop                                             |    7 
 koffice-1.6-branch/kchart/kchart.desktop                                                               |   15 
 koffice-1.6-branch/kchart/kchartpart.desktop                                                           |   12 
 koffice-1.6-branch/kchart/templates/.directory                                                         |    7 
 koffice-1.6-branch/kchart/templates/BarChart.desktop                                                   |   14 
 koffice-1.6-branch/kchart/templates/Empty.desktop                                                      |    5 
 koffice-1.6-branch/kdgantt/KDGanttView.cpp                                                             |   35 
 koffice-1.6-branch/kdgantt/KDGanttView.h                                                               |   24 
 koffice-1.6-branch/kdgantt/KDGanttViewItem.cpp                                                         |   26 
 koffice-1.6-branch/kdgantt/KDGanttViewItem.h                                                           |   13 
 koffice-1.6-branch/kdgantt/KDGanttViewSubwidgets.cpp                                                   |  280 +++-
 koffice-1.6-branch/kdgantt/KDGanttViewSubwidgets.h                                                     |   59 
 koffice-1.6-branch/kdgantt/KDGanttViewTaskItem.h                                                       |    6 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/alter.c                                                  |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/analyze.c                                                |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/attach.c                                                 |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/auth.c                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/btree.c                                                  |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/btree.h                                                  |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/build.c                                                  |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/callback.c                                               |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/complete.c                                               |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/date.c                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/delete.c                                                 |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/expr.c                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/func.c                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/hash.c                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/hash.h                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/insert.c                                                 |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/legacy.c                                                 |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/main.c                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/pager.c                                                  |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/pager.h                                                  |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/patches/kexisql-3.2.8.patch                              |  469 ++++++-
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/patches/mk_patch.sh                                      |    3 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/pragma.c                                                 |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/prepare.c                                                |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/random.c                                                 |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/select.c                                                 |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/shell.c                                                  |    3 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/sqlite3.h                                                |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/sqliteInt.h                                              |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/tclsqlite.c                                              |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/tokenize.c                                               |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/update.c                                                 |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/utf.c                                                    |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/util.c                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/vacuum.c                                                 |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/vdbe.c                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/vdbe.h                                                   |    1 
 koffice-1.6-branch/kexi/3rdparty/kexisql3/src/where.c                                                  |    1 
 koffice-1.6-branch/kexi/Makefile.global                                                                |    2 
 koffice-1.6-branch/kexi/core/kexidbconnectionset.cpp                                                   |    2 
 koffice-1.6-branch/kexi/data/kde34compat/x-sqlite2.desktop                                             |    6 
 koffice-1.6-branch/kexi/data/kde34compat/x-sqlite3.desktop                                             |    6 
 koffice-1.6-branch/kexi/data/kexihandler.desktop                                                       |    3 
 koffice-1.6-branch/kexi/data/x-kexi-connectiondata.desktop                                             |    6 
 koffice-1.6-branch/kexi/data/x-kexiproject-shortcut.desktop                                            |    6 
 koffice-1.6-branch/kexi/data/x-kexiproject-sqlite.desktop                                              |    5 
 koffice-1.6-branch/kexi/data/x-kexiproject-sqlite2.desktop                                             |    5 
 koffice-1.6-branch/kexi/data/x-kexiproject-sqlite3.desktop                                             |    5 
 koffice-1.6-branch/kexi/doc/dev/CHANGELOG-Kexi-js                                                      |   83 +
 koffice-1.6-branch/kexi/doc/dev/TODO-Kexi-js                                                           |    4 
 koffice-1.6-branch/kexi/formeditor/factories/kformdesigner_containers.desktop                          |    3 
 koffice-1.6-branch/kexi/formeditor/factories/kformdesigner_stdwidgets.desktop                          |    6 
 koffice-1.6-branch/kexi/formeditor/kdevelop_plugin/kformdesigner_kdev_part.desktop                     |    9 
 koffice-1.6-branch/kexi/formeditor/test/kformdesigner.desktop                                          |    5 
 koffice-1.6-branch/kexi/formeditor/test/kformdesigner_part.desktop                                     |    5 
 koffice-1.6-branch/kexi/formeditor/widgetfactory.desktop                                               |    2 
 koffice-1.6-branch/kexi/formeditor/widgetlibrary.cpp                                                   |    2 
 koffice-1.6-branch/kexi/kexi.desktop                                                                   |   13 
 koffice-1.6-branch/kexi/kexidb/alter.cpp                                                               |    2 
 koffice-1.6-branch/kexi/kexidb/connection.cpp                                                          |   10 
 koffice-1.6-branch/kexi/kexidb/drivers/mySQL/kexidb_mysqldriver.desktop                                |    1 
 koffice-1.6-branch/kexi/kexidb/drivers/odbc/kexidb_odbcdriver.desktop                                  |    3 
 koffice-1.6-branch/kexi/kexidb/drivers/pqxx/kexidb_pqxxsqldriver.desktop                               |    1 
 koffice-1.6-branch/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp                                             |    9 
 koffice-1.6-branch/kexi/kexidb/drivers/sqlite/kexidb_sqlite3driver.desktop                             |    2 
 koffice-1.6-branch/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp                                     |    3 
 koffice-1.6-branch/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp                                         |    8 
 koffice-1.6-branch/kexi/kexidb/drivers/sqlite2/kexidb_sqlite2driver.desktop                            |    2 
 koffice-1.6-branch/kexi/kexidb/expression.cpp                                                          |    8 
 koffice-1.6-branch/kexi/kexidb/field.cpp                                                               |    4 
 koffice-1.6-branch/kexi/kexidb/field.h                                                                 |    2 
 koffice-1.6-branch/kexi/kexidb/fieldlist.cpp                                                           |    2 
 koffice-1.6-branch/kexi/kexidb/fieldvalidator.cpp                                                      |    2 
 koffice-1.6-branch/kexi/kexidb/kexidb_driver.desktop                                                   |   11 
 koffice-1.6-branch/kexi/kexidb/queryschema.cpp                                                         |    7 
 koffice-1.6-branch/kexi/kexidb/queryschema.h                                                           |    3 
 koffice-1.6-branch/kexi/kexidb/relationship.cpp                                                        |    6 
 koffice-1.6-branch/kexi/kexidb/tableschema.cpp                                                         |    2 
 koffice-1.6-branch/kexi/kexiutils/utils.cpp                                                            |    3 
 koffice-1.6-branch/kexi/main/keximainwindowimpl.cpp                                                    |    9 
 koffice-1.6-branch/kexi/main/printing/kexisimpleprintingengine.cpp                                     |  236 +++
 koffice-1.6-branch/kexi/main/printing/kexisimpleprintingengine.h                                       |   39 
 koffice-1.6-branch/kexi/migration/keximigrate.cpp                                                      |    3 
 koffice-1.6-branch/kexi/migration/keximigration_driver.desktop                                         |    6 
 koffice-1.6-branch/kexi/migration/mysql/keximigrate_mysql.desktop                                      |    6 
 koffice-1.6-branch/kexi/migration/mysql/mysqlmigrate.cpp                                               |    5 
 koffice-1.6-branch/kexi/migration/pqxx/keximigrate_pqxx.desktop                                        |    6 
 koffice-1.6-branch/kexi/migration/pqxx/pqxxmigrate.cpp                                                 |    8 
 koffice-1.6-branch/kexi/plugins/forms/kexidataprovider.cpp                                             |    4 
 koffice-1.6-branch/kexi/plugins/forms/kexiformhandler.desktop                                          |   12 
 koffice-1.6-branch/kexi/plugins/forms/kformdesigner_kexidbfactory.desktop                              |    6 
 koffice-1.6-branch/kexi/plugins/forms/widgets/kexidblabel.cpp                                          |    2 
 koffice-1.6-branch/kexi/plugins/forms/widgets/kexiframe.cpp                                            |    2 
 koffice-1.6-branch/kexi/plugins/importexport/csv/kexicsv_importexporthandler.desktop                   |   13 
 koffice-1.6-branch/kexi/plugins/importexport/csv/kexicsvexport.cpp                                     |    2 
 koffice-1.6-branch/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp                               |  168 +-
 koffice-1.6-branch/kexi/plugins/importexport/csv/kexicsvimportdialog.h                                 |   15 
 koffice-1.6-branch/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp                           |   97 +
 koffice-1.6-branch/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.h                             |   17 
 koffice-1.6-branch/kexi/plugins/macros/kexipart/keximacrohandler.desktop                               |   13 
 koffice-1.6-branch/kexi/plugins/migration/keximigrationhandler.desktop                                 |   23 
 koffice-1.6-branch/kexi/plugins/queries/kexiquerydesignerguieditor.cpp                                 |    9 
 koffice-1.6-branch/kexi/plugins/queries/kexiqueryhandler.desktop                                       |   11 
 koffice-1.6-branch/kexi/plugins/relations/kexirelationhandler.desktop                                  |   11 
 koffice-1.6-branch/kexi/plugins/reports/kexireporthandler.desktop                                      |   13 
 koffice-1.6-branch/kexi/plugins/reports/kformdesigner_kexireportfactory.desktop                        |    6 
 koffice-1.6-branch/kexi/plugins/scripting/kexiscripting/kexiscripthandler.desktop                      |   13 
 koffice-1.6-branch/kexi/plugins/tables/kexitabledesignerview.cpp                                       |    2 
 koffice-1.6-branch/kexi/plugins/tables/kexitablehandler.desktop                                        |   13 
 koffice-1.6-branch/kexi/widget/relations/kexirelationviewconnection.cpp                                |    2 
 koffice-1.6-branch/kexi/widget/tableview/kexidataawarepropertyset.cpp                                  |    2 
 koffice-1.6-branch/kexi/widget/tableview/kexitableviewdata.cpp                                         |    2 
 koffice-1.6-branch/kexi/widget/utils/kexicomboboxdropdownbutton.cpp                                    |    1 
 koffice-1.6-branch/kexi/widget/utils/kexisharedactionclient.cpp                                        |    2 
 koffice-1.6-branch/kformula/kformula.desktop                                                           |    7 
 koffice-1.6-branch/kformula/kformulapart.desktop                                                       |   13 
 koffice-1.6-branch/kivio/kiviopart/kivio.desktop                                                       |    6 
 koffice-1.6-branch/kivio/kiviopart/kiviopart.desktop                                                   |   11 
 koffice-1.6-branch/kivio/plugins/kivioconnectortool/kivioconnectortool.desktop                         |    2 
 koffice-1.6-branch/kivio/plugins/kivioselecttool/kivioselecttool.desktop                               |    2 
 koffice-1.6-branch/kivio/plugins/kiviosmlconnector/kiviosmlconnector.desktop                           |    3 
 koffice-1.6-branch/kivio/plugins/kiviotargettool/kiviotargettool.desktop                               |    3 
 koffice-1.6-branch/kivio/plugins/kiviotexttool/kiviotexttool.desktop                                   |    5 
 koffice-1.6-branch/kivio/plugins/kiviozoomtool/kiviozoomtool.desktop                                   |    5 
 koffice-1.6-branch/kivio/templates/basic/.directory                                                    |    6 
 koffice-1.6-branch/kivio/templates/basic/basicflow.desktop                                             |    3 
 koffice-1.6-branch/kivio/templates/basic/empty.desktop                                                 |   10 
 koffice-1.6-branch/koshell/koshell.desktop                                                             |   11 
 koffice-1.6-branch/kounavail/kounavail.desktop                                                         |    7 
 koffice-1.6-branch/kplato/kplato.desktop                                                               |   11 
 koffice-1.6-branch/kplato/kplatopart.desktop                                                           |   15 
 koffice-1.6-branch/kplato/reports/resourcelist.desktop                                                 |    7 
 koffice-1.6-branch/kplato/reports/tasklist.desktop                                                     |    8 
 koffice-1.6-branch/kplato/templates/Simple/.directory                                                  |    5 
 koffice-1.6-branch/kplato/templates/Simple/8HourDay-40HourWeek.desktop                                 |    7 
 koffice-1.6-branch/kplato/templates/Simple/Plain.desktop                                               |    7 
 koffice-1.6-branch/kpresenter/autoforms/Arrows/.directory                                              |   20 
 koffice-1.6-branch/kpresenter/autoforms/Arrows/ArrowDown.desktop                                       |    6 
 koffice-1.6-branch/kpresenter/autoforms/Arrows/ArrowLeft.desktop                                       |    6 
 koffice-1.6-branch/kpresenter/autoforms/Arrows/ArrowLeftDown.desktop                                   |    6 
 koffice-1.6-branch/kpresenter/autoforms/Arrows/ArrowLeftUp.desktop                                     |    6 
 koffice-1.6-branch/kpresenter/autoforms/Arrows/ArrowRight.desktop                                      |    6 
 koffice-1.6-branch/kpresenter/autoforms/Arrows/ArrowRightDown.desktop                                  |    6 
 koffice-1.6-branch/kpresenter/autoforms/Arrows/ArrowRightUp.desktop                                    |    6 
 koffice-1.6-branch/kpresenter/autoforms/Arrows/ArrowUp.desktop                                         |    6 
 koffice-1.6-branch/kpresenter/autoforms/Connections/.directory                                         |   20 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection1.desktop                                |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection10.desktop                               |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection11.desktop                               |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection12.desktop                               |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection2.desktop                                |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection3.desktop                                |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection4.desktop                                |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection5.desktop                                |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection6.desktop                                |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection7.desktop                                |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection8.desktop                                |    5 
 koffice-1.6-branch/kpresenter/autoforms/Connections/Connection9.desktop                                |    5 
 koffice-1.6-branch/kpresenter/kpresenter.desktop                                                       |    7 
 koffice-1.6-branch/kpresenter/kpresenterpart.desktop                                                   |    7 
 koffice-1.6-branch/kpresenter/templates/Screen/.directory                                              |    5 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/.directory                                 |    6 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/BlueBreezeDouble.desktop                   |    6 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/BlueBreezePicture.desktop                  |    6 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/BlueBreezeSingle.desktop                   |    6 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/CopperPlain.desktop                        |    3 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/GradientBlueRed.desktop                    |    6 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/SnowyMountains.desktop                     |    6 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/TotallyNewProduct.desktop                  |    7 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/classroom.desktop                          |   12 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/kde.desktop                                |    5 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/kde2.desktop                               |    6 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/kde3.desktop                               |    6 
 koffice-1.6-branch/kpresenter/templates/Screenpresentations/savannah.desktop                           |    9 
 koffice-1.6-branch/kpresenter/templates/common_desktop/OneColumnLandscape.desktop                      |    8 
 koffice-1.6-branch/kpresenter/templates/common_desktop/OneColumnPortrait.desktop                       |    8 
 koffice-1.6-branch/kpresenter/templates/common_desktop/TitleLandscape.desktop                          |    8 
 koffice-1.6-branch/kpresenter/templates/common_desktop/TitlePortrait.desktop                           |    8 
 koffice-1.6-branch/kpresenter/templates/common_desktop/TwoColumnLandscape.desktop                      |   10 
 koffice-1.6-branch/kpresenter/templates/common_desktop/TwoColumnPortrait.desktop                       |   10 
 koffice-1.6-branch/kpresenter/templates/common_desktop/emptyLandscape.desktop                          |   13 
 koffice-1.6-branch/kpresenter/templates/common_desktop/emptyPortrait.desktop                           |    9 
 koffice-1.6-branch/kpresenter/templates/letter/.directory                                              |    5 
 koffice-1.6-branch/krita/colorspaces/cmyk_u16/krita_cmyk_u16_plugin.desktop                            |   12 
 koffice-1.6-branch/krita/colorspaces/cmyk_u8/kritacmykplugin.desktop                                   |    9 
 koffice-1.6-branch/krita/colorspaces/cmyk_u8/templates/white_2000x800.desktop                          |   12 
 koffice-1.6-branch/krita/colorspaces/gray_u16/krita_gray_u16_plugin.desktop                            |   10 
 koffice-1.6-branch/krita/colorspaces/gray_u8/kritagrayplugin.desktop                                   |    8 
 koffice-1.6-branch/krita/colorspaces/gray_u8/templates/.directory                                      |    7 
 koffice-1.6-branch/krita/colorspaces/gray_u8/templates/white_640x480.desktop                           |   11 
 koffice-1.6-branch/krita/colorspaces/lms_f32/krita_lms_f32_plugin.desktop                              |    9 
 koffice-1.6-branch/krita/colorspaces/rgb_f16half/krita_rgb_f16half_plugin.desktop                      |    7 
 koffice-1.6-branch/krita/colorspaces/rgb_f32/krita_rgb_f32_plugin.desktop                              |    7 
 koffice-1.6-branch/krita/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc                                 |    4 
 koffice-1.6-branch/krita/colorspaces/rgb_u16/krita_rgb_u16_plugin.desktop                              |    8 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/kis_rgb_colorspace.cc                                      |    4 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/kritargbplugin.desktop                                     |    8 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/templates/transparent_1024x768.desktop                     |   12 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/templates/transparent_1280x1024.desktop                    |   13 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/templates/transparent_1600x1200.desktop                    |   11 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/templates/transparent_640x480.desktop                      |   13 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/templates/white_1024x768.desktop                           |   15 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/templates/white_1280x1024.desktop                          |   15 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/templates/white_1600x1200.desktop                          |   15 
 koffice-1.6-branch/krita/colorspaces/rgb_u8/templates/white_640x480.desktop                            |   15 
 koffice-1.6-branch/krita/colorspaces/wet/kritawetplugin.desktop                                        |   10 
 koffice-1.6-branch/krita/colorspaces/wetsticky/brushop/kritawsbrushpaintop.desktop                     |    5 
 koffice-1.6-branch/krita/colorspaces/wetsticky/kritawsplugin.desktop                                   |    3 
 koffice-1.6-branch/krita/colorspaces/ycbcr_u16/krita_ycbcr_u16_plugin.desktop                          |    8 
 koffice-1.6-branch/krita/colorspaces/ycbcr_u8/krita_ycbcr_u8_plugin.desktop                            |    8 
 koffice-1.6-branch/krita/core/kis_paint_layer.cc                                                       |    4 
 koffice-1.6-branch/krita/core/kis_perspective_math.cpp                                                 |   22 
 koffice-1.6-branch/krita/data/brushes/Makefile.am                                                      |    2 
 koffice-1.6-branch/krita/data/krita_filter.desktop                                                     |   12 
 koffice-1.6-branch/krita/data/krita_paintop.desktop                                                    |    9 
 koffice-1.6-branch/krita/data/krita_plugin.desktop                                                     |    5 
 koffice-1.6-branch/krita/data/krita_tool.desktop                                                       |   14 
 koffice-1.6-branch/krita/data/palettes/Makefile.am                                                     |    2 
 koffice-1.6-branch/krita/data/templates/.directory                                                     |    6 
 koffice-1.6-branch/krita/krita.desktop                                                                 |   14 
 koffice-1.6-branch/krita/kritacolor/kis_abstract_colorspace.cc                                         |    4 
 koffice-1.6-branch/krita/kritacolor/krita_colorspace.desktop                                           |    2 
 koffice-1.6-branch/krita/kritapart.desktop                                                             |   12 
 koffice-1.6-branch/krita/plugins/filters/blur/kritablurfilter.desktop                                  |    2 
 koffice-1.6-branch/krita/plugins/filters/bumpmap/kritabumpmapfilter.desktop                            |    3 
 koffice-1.6-branch/krita/plugins/filters/cimg/kritacimg.desktop                                        |    3 
 koffice-1.6-branch/krita/plugins/filters/colorify/kritacolorifyfilter.desktop                          |    7 
 koffice-1.6-branch/krita/plugins/filters/colors/kritaextensioncolorsfilters.desktop                    |    7 
 koffice-1.6-branch/krita/plugins/filters/colorsfilters/kritacolorsfilter.desktop                       |   15 
 koffice-1.6-branch/krita/plugins/filters/convolutionfilters/kritaconvolutionfilters.desktop            |    9 
 koffice-1.6-branch/krita/plugins/filters/cubismfilter/kritacubismfilter.desktop                        |   15 
 koffice-1.6-branch/krita/plugins/filters/embossfilter/kritaembossfilter.desktop                        |    5 
 koffice-1.6-branch/krita/plugins/filters/example/kritaexample.desktop                                  |   12 
 koffice-1.6-branch/krita/plugins/filters/fastcolortransfer/kritafastcolortransfer.desktop              |   10 
 koffice-1.6-branch/krita/plugins/filters/imageenhancement/kritaimageenhancement.desktop                |   15 
 koffice-1.6-branch/krita/plugins/filters/lenscorrectionfilter/kritalenscorrectionfilter.desktop        |    7 
 koffice-1.6-branch/krita/plugins/filters/levelfilter/kritalevelfilter.desktop                          |    9 
 koffice-1.6-branch/krita/plugins/filters/noisefilter/kritanoisefilter.desktop                          |   13 
 koffice-1.6-branch/krita/plugins/filters/oilpaintfilter/kritaoilpaintfilter.desktop                    |    5 
 koffice-1.6-branch/krita/plugins/filters/pixelizefilter/kritapixelizefilter.desktop                    |   11 
 koffice-1.6-branch/krita/plugins/filters/raindropsfilter/kritaraindropsfilter.desktop                  |   13 
 koffice-1.6-branch/krita/plugins/filters/randompickfilter/kritarandompickfilter.desktop                |    3 
 koffice-1.6-branch/krita/plugins/filters/roundcorners/kis_round_corners_filter.cc                      |    5 
 koffice-1.6-branch/krita/plugins/filters/roundcorners/kritaroundcornersfilter.desktop                  |    3 
 koffice-1.6-branch/krita/plugins/filters/smalltilesfilter/kritasmalltilesfilter.desktop                |    2 
 koffice-1.6-branch/krita/plugins/filters/sobelfilter/kritasobelfilter.desktop                          |    3 
 koffice-1.6-branch/krita/plugins/filters/threadtest/kritathreadtest.desktop                            |    2 
 koffice-1.6-branch/krita/plugins/filters/unsharp/kritaunsharpfilter.desktop                            |    6 
 koffice-1.6-branch/krita/plugins/filters/wavefilter/kritawavefilter.desktop                            |    8 
 koffice-1.6-branch/krita/plugins/paintops/defaultpaintops/kis_smudgeop.cc                              |   15 
 koffice-1.6-branch/krita/plugins/paintops/defaultpaintops/kritadefaultpaintops.desktop                 |   11 
 koffice-1.6-branch/krita/plugins/tools/defaulttools/kritadefaulttools.desktop                          |    7 
 koffice-1.6-branch/krita/plugins/tools/selectiontools/kritaselectiontools.desktop                      |    7 
 koffice-1.6-branch/krita/plugins/tools/tool_crop/kritatoolcrop.desktop                                 |    7 
 koffice-1.6-branch/krita/plugins/tools/tool_curves/kritatoolcurves.desktop                             |    4 
 koffice-1.6-branch/krita/plugins/tools/tool_filter/kritatoolfilter.desktop                             |    8 
 koffice-1.6-branch/krita/plugins/tools/tool_perspectivegrid/kritatoolperspectivegrid.desktop           |    3 
 koffice-1.6-branch/krita/plugins/tools/tool_perspectivetransform/kritatoolperspectivetransform.desktop |    3 
 koffice-1.6-branch/krita/plugins/tools/tool_polygon/kritatoolpolygon.desktop                           |    7 
 koffice-1.6-branch/krita/plugins/tools/tool_polyline/kritatoolpolyline.desktop                         |    6 
 koffice-1.6-branch/krita/plugins/tools/tool_selectsimilar/kritatoolselectsimilar.desktop               |    4 
 koffice-1.6-branch/krita/plugins/tools/tool_star/kritatoolstar.desktop                                 |    7 
 koffice-1.6-branch/krita/plugins/tools/tool_transform/kritatooltransform.desktop                       |    7 
 koffice-1.6-branch/krita/plugins/viewplugins/colorrange/kritacolorrange.desktop                        |    4 
 koffice-1.6-branch/krita/plugins/viewplugins/colorspaceconversion/kritacolorspaceconversion.desktop    |    4 
 koffice-1.6-branch/krita/plugins/viewplugins/dropshadow/kritadropshadow.desktop                        |    8 
 koffice-1.6-branch/krita/plugins/viewplugins/filtersgallery/kritafiltersgallery.desktop                |    7 
 koffice-1.6-branch/krita/plugins/viewplugins/histogram/kritahistogram.desktop                          |   14 
 koffice-1.6-branch/krita/plugins/viewplugins/histogram_docker/kritahistogramdocker.desktop             |    6 
 koffice-1.6-branch/krita/plugins/viewplugins/history_docker/kritahistorydocker.desktop                 |    7 
 koffice-1.6-branch/krita/plugins/viewplugins/imagesize/kritaimagesize.desktop                          |    9 
 koffice-1.6-branch/krita/plugins/viewplugins/modify_selection/kritamodifyselection.desktop             |    3 
 koffice-1.6-branch/krita/plugins/viewplugins/performancetest/kritaperftest.desktop                     |    5 
 koffice-1.6-branch/krita/plugins/viewplugins/rotateimage/kritarotateimage.desktop                      |   11 
 koffice-1.6-branch/krita/plugins/viewplugins/screenshot/kritascreenshot.desktop                        |    7 
 koffice-1.6-branch/krita/plugins/viewplugins/scripting/kritascripting.desktop                          |   17 
 koffice-1.6-branch/krita/plugins/viewplugins/selectopaque/kritaselectopaque.desktop                    |    2 
 koffice-1.6-branch/krita/plugins/viewplugins/separate_channels/kritaseparatechannels.desktop           |   12 
 koffice-1.6-branch/krita/plugins/viewplugins/shearimage/kritashearimage.desktop                        |    8 
 koffice-1.6-branch/krita/plugins/viewplugins/substrate/kritasubstrate.desktop                          |    2 
 koffice-1.6-branch/krita/plugins/viewplugins/variations/kritavariations.desktop                        |   12 
 koffice-1.6-branch/krita/ui/squeezedcombobox.cpp                                                       |    3 
 koffice-1.6-branch/kspread/Makefile.am                                                                 |    2 
 koffice-1.6-branch/kspread/digest.cc                                                                   |    2 
 koffice-1.6-branch/kspread/digest.h                                                                    |    2 
 koffice-1.6-branch/kspread/kspread.desktop                                                             |   11 
 koffice-1.6-branch/kspread/kspreadpart.desktop                                                         |   15 
 koffice-1.6-branch/kspread/plugins/calculator/uninstall.desktop                                        |    1 
 koffice-1.6-branch/kspread/plugins/scripting/kspreadcore/krs_cell.cpp                                  |    9 
 koffice-1.6-branch/kspread/plugins/scripting/kspreadcore/krs_cell.h                                    |    7 
 koffice-1.6-branch/kspread/plugins/scripting/kspreadscripting.desktop                                  |   17 
 koffice-1.6-branch/kspread/templates/Business/.directory                                               |    4 
 koffice-1.6-branch/kspread/templates/Business/BalanceSheet.desktop                                     |    7 
 koffice-1.6-branch/kspread/templates/Business/ExpenseReport.desktop                                    |    5 
 koffice-1.6-branch/kspread/templates/Business/Invoice.desktop                                          |    2 
 koffice-1.6-branch/kspread/templates/Business/PackingSlip.desktop                                      |    7 
 koffice-1.6-branch/kspread/templates/Business/PriceQuotation.desktop                                   |    2 
 koffice-1.6-branch/kspread/templates/General/.directory                                                |    7 
 koffice-1.6-branch/kspread/templates/General/StudentIDCard.desktop                                     |    5 
 koffice-1.6-branch/kspread/templates/General/Worksheet.desktop                                         |    5 
 koffice-1.6-branch/kspread/templates/HomeFamily/.directory                                             |    9 
 koffice-1.6-branch/kspread/templates/HomeFamily/BMI.desktop                                            |    5 
 koffice-1.6-branch/kspread/templates/HomeFamily/CreditCardTracker.desktop                              |    3 
 koffice-1.6-branch/kspread/templates/HomeFamily/MenuPlan.desktop                                       |    9 
 koffice-1.6-branch/kspread/templates/HomeFamily/VacationChecklist.desktop                              |    6 
 koffice-1.6-branch/kugar/kudesigner/kudesigner.desktop                                                 |   17 
 koffice-1.6-branch/kugar/kudesigner/templates/General/.directory                                       |    7 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A0.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A1.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A2.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A3.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A4.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A5.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A6.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A7.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A8.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/A9.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B0.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B1.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B10.desktop                                      |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B2.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B3.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B4.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B5.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B6.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B7.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B8.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/B9.desktop                                       |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/C5E.desktop                                      |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/Comm10E.desktop                                  |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/DLE.desktop                                      |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/Executive.desktop                                |    3 
 koffice-1.6-branch/kugar/kudesigner/templates/General/Folio.desktop                                    |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/Ledger.desktop                                   |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/Legal.desktop                                    |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/Letter.desktop                                   |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/NPageSize.desktop                                |    1 
 koffice-1.6-branch/kugar/kudesigner/templates/General/Tabloid.desktop                                  |    1 
 koffice-1.6-branch/kugar/part/kugar.desktop                                                            |    6 
 koffice-1.6-branch/kugar/part/kugarpart.desktop                                                        |   10 
 koffice-1.6-branch/kword/KWAnchor.cpp                                                                  |    4 
 koffice-1.6-branch/kword/KWDocument.cpp                                                                |   20 
 koffice-1.6-branch/kword/kwmailmerge.desktop                                                           |    6 
 koffice-1.6-branch/kword/kword.desktop                                                                 |    7 
 koffice-1.6-branch/kword/kwordpart.desktop                                                             |   14 
 koffice-1.6-branch/kword/mailmerge/kabc/kwmailmerge_kabc.desktop                                       |   11 
 koffice-1.6-branch/kword/mailmerge/kspread/kwmailmerge_kspread.desktop                                 |   13 
 koffice-1.6-branch/kword/mailmerge/kwserialletter_classic.desktop                                      |    8 
 koffice-1.6-branch/kword/mailmerge/sql/kwserialletter_qtsqldb.desktop                                  |   11 
 koffice-1.6-branch/kword/mailmerge/sql/kwserialletter_qtsqldb_power.desktop                            |    6 
 koffice-1.6-branch/kword/templates/CardsAndLabels/.directory                                           |    6 
 koffice-1.6-branch/kword/templates/CardsAndLabels/BusinessCards10.desktop                              |    6 
 koffice-1.6-branch/kword/templates/CardsAndLabels/LabelsL16.desktop                                    |    5 
 koffice-1.6-branch/kword/templates/Envelopes/.directory                                                |    7 
 koffice-1.6-branch/kword/templates/Envelopes/EnvelopeC6.desktop                                        |    7 
 koffice-1.6-branch/kword/templates/Envelopes/EnvelopeDL.desktop                                        |    7 
 koffice-1.6-branch/kword/templates/Wordprocessing/.directory                                           |    7 
 koffice-1.6-branch/kword/templates/Wordprocessing/A4.desktop                                           |   17 
 koffice-1.6-branch/kword/templates/Wordprocessing/ColorfulA4.desktop                                   |   10 
 koffice-1.6-branch/kword/templates/Wordprocessing/ColorfulLetter.desktop                               |   10 
 koffice-1.6-branch/kword/templates/Wordprocessing/FaxA4.desktop                                        |    8 
 koffice-1.6-branch/kword/templates/Wordprocessing/FaxLetter.desktop                                    |    8 
 koffice-1.6-branch/kword/templates/Wordprocessing/Letter.desktop                                       |   14 
 koffice-1.6-branch/kword/templates/Wordprocessing/Memo.desktop                                         |    7 
 koffice-1.6-branch/kword/templates/Wordprocessing/ProfessionalA4.desktop                               |   14 
 koffice-1.6-branch/kword/templates/Wordprocessing/ProfessionalLetter.desktop                           |   14 
 koffice-1.6-branch/kword/templates/Wordprocessing/TwoColumns.desktop                                   |   15 
 koffice-1.6-branch/kword/templates/Wordprocessing/TwoColumnsLetter.desktop                             |   15 
 koffice-1.6-branch/lib/kofficecore/kodocinfopropspage.desktop                                          |    5 
 koffice-1.6-branch/lib/kotext/KoTextDocument.cpp                                                       |   10 
 koffice-1.6-branch/lib/kotext/KoTextObject.cpp                                                         |    5 
 koffice-1.6-branch/lib/kross/python/cxx/Objects.hxx                                                    |    9 
 koffice-1.6-branch/lib/kross/python/pythonconfig.h                                                     |    9 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.chart.desktop                                |    5 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.formula.desktop                              |    6 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.graphics-template.desktop                    |    6 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.graphics.desktop                             |    5 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.image.desktop                                |    6 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.presentation-template.desktop                |    6 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.presentation.desktop                         |    5 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.spreadsheet-template.desktop                 |    8 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.spreadsheet.desktop                          |    8 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.text-template.desktop                        |    6 
 koffice-1.6-branch/mimetypes/kde33/vnd.oasis.opendocument.text.desktop                                 |    6 
 koffice-1.6-branch/mimetypes/kde351/x-raw.desktop                                                      |    4 
 koffice-1.6-branch/servicetypes/kochart.desktop                                                        |    1 
 koffice-1.6-branch/servicetypes/kofficepart.desktop                                                    |    7 
 koffice-1.6-branch/servicetypes/kofilter.desktop                                                       |    7 
 koffice-1.6-branch/servicetypes/kofilterwrapper.desktop                                                |    3 
 koffice-1.6-branch/servicetypes/koplugin.desktop                                                       |    9 
 koffice-1.6-branch/templates/Illustration.desktop                                                      |   15 
 koffice-1.6-branch/templates/Presentation.desktop                                                      |   18 
 koffice-1.6-branch/templates/SpreadSheet.desktop                                                       |   21 
 koffice-1.6-branch/templates/TextDocument.desktop                                                      |   20 
 koffice-1.6-branch/tools/kfile-plugins/abiword/kfile_abiword.desktop                                   |    8 
 koffice-1.6-branch/tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop                                 |   10 
 koffice-1.6-branch/tools/kfile-plugins/koffice/kfile_koffice.desktop                                   |    8 
 koffice-1.6-branch/tools/kfile-plugins/ooo/kfile_ooo.desktop                                           |    7 
 koffice-1.6-branch/tools/kthesaurus/KThesaurus.desktop                                                 |   10 
 koffice-1.6-branch/tools/quickprint/karbon_konqi.desktop                                               |   10 
 koffice-1.6-branch/tools/quickprint/kchart_konqi.desktop                                               |   10 
 koffice-1.6-branch/tools/quickprint/kexi_konqi.desktop                                                 |   10 
 koffice-1.6-branch/tools/quickprint/kformula_konqi.desktop                                             |   10 
 koffice-1.6-branch/tools/quickprint/kivio_konqi.desktop                                                |   10 
 koffice-1.6-branch/tools/quickprint/kpresenter_konqi.desktop                                           |   10 
 koffice-1.6-branch/tools/quickprint/krita_konqi.desktop                                                |   10 
 koffice-1.6-branch/tools/quickprint/kspread_konqi.desktop                                              |   10 
 koffice-1.6-branch/tools/quickprint/kword_konqi.desktop                                                |   10 
 koffice-1.6-branch/tools/spell/kspelltool.desktop                                                      |   10 
 koffice-1.6-branch/tools/spell/uninstall.desktop                                                       |    1 
 koffice-1.6-branch/tools/thesaurus/thesaurustool.desktop                                               |   18 
 koffice-1.6-branch/tools/thumbnail/clipartthumbnail.desktop                                            |    4 
 koffice-1.6-branch/tools/thumbnail/kofficethumbnail.desktop                                            |    7 
 koffice-1.6-branch/tools/thumbnail/otherofficethumbnail.desktop                                        |    7 
 koffice-1.6.3//Makefile.am                                                                             |only
 koffice-1.6.3//Makefile.in                                                                             |only
 koffice-1.6.3//acinclude.m4                                                                            |only
 koffice-1.6.3//aclocal.m4                                                                              |only
 koffice-1.6.3//config.h.in                                                                             |only
 koffice-1.6.3//configure                                                                               |only
 koffice-1.6.3//configure.files                                                                         |only
 koffice-1.6.3//configure.in                                                                            |only
 koffice-1.6.3//stamp-h.in                                                                              |only
 koffice-1.6.3//subdirs                                                                                 |only
 koffice-1.6.3/autocorrect/Makefile.in                                                                  |only
 koffice-1.6.3/doc/Makefile.in                                                                          |only
 koffice-1.6.3/doc/karbon/Makefile.in                                                                   |only
 koffice-1.6.3/doc/karbon/index.cache.bz2                                                               |only
 koffice-1.6.3/doc/kchart/Makefile.in                                                                   |only
 koffice-1.6.3/doc/kchart/index.cache.bz2                                                               |only
 koffice-1.6.3/doc/kexi/Makefile.in                                                                     |only
 koffice-1.6.3/doc/kexi/index.cache.bz2                                                                 |only
 koffice-1.6.3/doc/kformula/Makefile.in                                                                 |only
 koffice-1.6.3/doc/kformula/index.cache.bz2                                                             |only
 koffice-1.6.3/doc/kivio/Makefile.in                                                                    |only
 koffice-1.6.3/doc/kivio/index.cache.bz2                                                                |only
 koffice-1.6.3/doc/koffice/Makefile.in                                                                  |only
 koffice-1.6.3/doc/koffice/index.cache.bz2                                                              |only
 koffice-1.6.3/doc/koshell/Makefile.in                                                                  |only
 koffice-1.6.3/doc/koshell/index.cache.bz2                                                              |only
 koffice-1.6.3/doc/kplato/Makefile.in                                                                   |only
 koffice-1.6.3/doc/kplato/index.cache.bz2                                                               |only
 koffice-1.6.3/doc/kpresenter/Makefile.in                                                               |only
 koffice-1.6.3/doc/kpresenter/index.cache.bz2                                                           |only
 koffice-1.6.3/doc/krita/Makefile.in                                                                    |only
 koffice-1.6.3/doc/krita/index.cache.bz2                                                                |only
 koffice-1.6.3/doc/kspread/Makefile.in                                                                  |only
 koffice-1.6.3/doc/kspread/index.cache.bz2                                                              |only
 koffice-1.6.3/doc/kugar/Makefile.in                                                                    |only
 koffice-1.6.3/doc/kugar/index.cache.bz2                                                                |only
 koffice-1.6.3/doc/kword/Makefile.in                                                                    |only
 koffice-1.6.3/doc/kword/index.cache.bz2                                                                |only
 koffice-1.6.3/doc/thesaurus/Makefile.in                                                                |only
 koffice-1.6.3/doc/thesaurus/index.cache.bz2                                                            |only
 koffice-1.6.3/example/Makefile.in                                                                      |only
 koffice-1.6.3/filters/Makefile.in                                                                      |only
 koffice-1.6.3/filters/generic_wrapper/Makefile.in                                                      |only
 koffice-1.6.3/filters/karbon/Makefile.in                                                               |only
 koffice-1.6.3/filters/karbon/ai/Makefile.in                                                            |only
 koffice-1.6.3/filters/karbon/applixgraphics/Makefile.in                                                |only
 koffice-1.6.3/filters/karbon/eps/Makefile.in                                                           |only
 koffice-1.6.3/filters/karbon/kontour/Makefile.in                                                       |only
 koffice-1.6.3/filters/karbon/msod/Makefile.in                                                          |only
 koffice-1.6.3/filters/karbon/oodraw/Makefile.in                                                        |only
 koffice-1.6.3/filters/karbon/png/Makefile.in                                                           |only
 koffice-1.6.3/filters/karbon/svg/Makefile.in                                                           |only
 koffice-1.6.3/filters/karbon/wmf/Makefile.in                                                           |only
 koffice-1.6.3/filters/karbon/xaml/Makefile.in                                                          |only
 koffice-1.6.3/filters/karbon/xcf/Makefile.in                                                           |only
 koffice-1.6.3/filters/kchart/Makefile.in                                                               |only
 koffice-1.6.3/filters/kchart/bmp/Makefile.in                                                           |only
 koffice-1.6.3/filters/kchart/jpeg/Makefile.in                                                          |only
 koffice-1.6.3/filters/kchart/libimageexport/Makefile.in                                                |only
 koffice-1.6.3/filters/kchart/mng/Makefile.in                                                           |only
 koffice-1.6.3/filters/kchart/png/Makefile.in                                                           |only
 koffice-1.6.3/filters/kchart/svg/Makefile.in                                                           |only
 koffice-1.6.3/filters/kchart/xbm/Makefile.in                                                           |only
 koffice-1.6.3/filters/kchart/xpm/Makefile.in                                                           |only
 koffice-1.6.3/filters/kformula/Makefile.in                                                             |only
 koffice-1.6.3/filters/kformula/latex/Makefile.in                                                       |only
 koffice-1.6.3/filters/kformula/mathml/Makefile.in                                                      |only
 koffice-1.6.3/filters/kformula/png/Makefile.in                                                         |only
 koffice-1.6.3/filters/kformula/svg/Makefile.in                                                         |only
 koffice-1.6.3/filters/kivio/Makefile.in                                                                |only
 koffice-1.6.3/filters/kivio/imageexport/Makefile.in                                                    |only
 koffice-1.6.3/filters/kpresenter/Makefile.in                                                           |only
 koffice-1.6.3/filters/kpresenter/bmp/Makefile.in                                                       |only
 koffice-1.6.3/filters/kpresenter/jpeg/Makefile.in                                                      |only
 koffice-1.6.3/filters/kpresenter/kword/Makefile.in                                                     |only
 koffice-1.6.3/filters/kpresenter/libimageexport/Makefile.in                                            |only
 koffice-1.6.3/filters/kpresenter/magicpoint/Makefile.in                                                |only
 koffice-1.6.3/filters/kpresenter/mng/Makefile.in                                                       |only
 koffice-1.6.3/filters/kpresenter/ooimpress/Makefile.in                                                 |only
 koffice-1.6.3/filters/kpresenter/png/Makefile.in                                                       |only
 koffice-1.6.3/filters/kpresenter/powerpoint/Makefile.in                                                |only
 koffice-1.6.3/filters/kpresenter/powerpoint/import/Makefile.in                                         |only
 koffice-1.6.3/filters/kpresenter/powerpoint/libppt/Makefile.in                                         |only
 koffice-1.6.3/filters/kpresenter/svg/Makefile.in                                                       |only
 koffice-1.6.3/filters/kpresenter/xbm/Makefile.in                                                       |only
 koffice-1.6.3/filters/kpresenter/xpm/Makefile.in                                                       |only
 koffice-1.6.3/filters/krita/Makefile.in                                                                |only
 koffice-1.6.3/filters/krita/gmagick/Makefile.in                                                        |only
 koffice-1.6.3/filters/krita/jpeg/Makefile.in                                                           |only
 koffice-1.6.3/filters/krita/libkisexif/Makefile.in                                                     |only
 koffice-1.6.3/filters/krita/magick/Makefile.in                                                         |only
 koffice-1.6.3/filters/krita/openexr/Makefile.in                                                        |only
 koffice-1.6.3/filters/krita/pdf/Makefile.in                                                            |only
 koffice-1.6.3/filters/krita/png/Makefile.in                                                            |only
 koffice-1.6.3/filters/krita/raw/Makefile.in                                                            |only
 koffice-1.6.3/filters/krita/tiff/Makefile.in                                                           |only
 koffice-1.6.3/filters/krita/xcf/Makefile.in                                                            |only
 koffice-1.6.3/filters/kspread/Makefile.in                                                              |only
 koffice-1.6.3/filters/kspread/applixspread/Makefile.in                                                 |only
 koffice-1.6.3/filters/kspread/csv/Makefile.in                                                          |only
 koffice-1.6.3/filters/kspread/dbase/Makefile.in                                                        |only
 koffice-1.6.3/filters/kspread/excel/Makefile.in                                                        |only
 koffice-1.6.3/filters/kspread/excel/import/Makefile.in                                                 |only
 koffice-1.6.3/filters/kspread/excel/sidewinder/Makefile.in                                             |only
 koffice-1.6.3/filters/kspread/gnumeric/Makefile.in                                                     |only
 koffice-1.6.3/filters/kspread/html/Makefile.in                                                         |only
 koffice-1.6.3/filters/kspread/kexi/Makefile.in                                                         |only
 koffice-1.6.3/filters/kspread/latex/Makefile.in                                                        |only
 koffice-1.6.3/filters/kspread/latex/export/Makefile.in                                                 |only
 koffice-1.6.3/filters/kspread/libkspreadexport/Makefile.in                                             |only
 koffice-1.6.3/filters/kspread/opencalc/Makefile.in                                                     |only
 koffice-1.6.3/filters/kspread/qpro/Makefile.in                                                         |only
 koffice-1.6.3/filters/kspread/qpro/libqpro/Makefile.in                                                 |only
 koffice-1.6.3/filters/kspread/qpro/libqpro/qpro/Makefile.in                                            |only
 koffice-1.6.3/filters/kspread/qpro/libqpro/src/Makefile.in                                             |only
 koffice-1.6.3/filters/kugar/Makefile.in                                                                |only
 koffice-1.6.3/filters/kugar/kugarnop/Makefile.in                                                       |only
 koffice-1.6.3/filters/kword/Makefile.in                                                                |only
 koffice-1.6.3/filters/kword/abiword/Makefile.in                                                        |only
 koffice-1.6.3/filters/kword/amipro/Makefile.in                                                         |only
 koffice-1.6.3/filters/kword/applixword/Makefile.in                                                     |only
 koffice-1.6.3/filters/kword/ascii/Makefile.in                                                          |only
 koffice-1.6.3/filters/kword/docbook/Makefile.in                                                        |only
 koffice-1.6.3/filters/kword/hancomword/Makefile.in                                                     |only
 koffice-1.6.3/filters/kword/html/Makefile.in                                                           |only
 koffice-1.6.3/filters/kword/html/export/Makefile.in                                                    |only
 koffice-1.6.3/filters/kword/html/import/Makefile.in                                                    |only
 koffice-1.6.3/filters/kword/kword1.3/Makefile.in                                                       |only
 koffice-1.6.3/filters/kword/kword1.3/import/Makefile.in                                                |only
 koffice-1.6.3/filters/kword/latex/Makefile.in                                                          |only
 koffice-1.6.3/filters/kword/latex/export/Makefile.in                                                   |only
 koffice-1.6.3/filters/kword/latex/import/Makefile.in                                                   |only
 koffice-1.6.3/filters/kword/latex/import/generator/Makefile.in                                         |only
 koffice-1.6.3/filters/kword/latex/import/parser/Makefile.in                                            |only
 koffice-1.6.3/filters/kword/libexport/Makefile.in                                                      |only
 koffice-1.6.3/filters/kword/msword/Makefile.in                                                         |only
 koffice-1.6.3/filters/kword/mswrite/Makefile.in                                                        |only
 koffice-1.6.3/filters/kword/oowriter/Makefile.in                                                       |only
 koffice-1.6.3/filters/kword/palmdoc/Makefile.in                                                        |only
 koffice-1.6.3/filters/kword/pdf/Makefile.in                                                            |only
 koffice-1.6.3/filters/kword/pdf/xpdf/Makefile.in                                                       |only
 koffice-1.6.3/filters/kword/pdf/xpdf/goo/Makefile.in                                                   |only
 koffice-1.6.3/filters/kword/pdf/xpdf/xpdf/Makefile.in                                                  |only
 koffice-1.6.3/filters/kword/pdf/xpdf/xpdf/pdftops.cc                                                   |only
 koffice-1.6.3/filters/kword/rtf/Makefile.in                                                            |only
 koffice-1.6.3/filters/kword/rtf/export/Makefile.in                                                     |only
 koffice-1.6.3/filters/kword/rtf/import/Makefile.in                                                     |only
 koffice-1.6.3/filters/kword/starwriter/Makefile.in                                                     |only
 koffice-1.6.3/filters/kword/wml/Makefile.in                                                            |only
 koffice-1.6.3/filters/kword/wordperfect/Makefile.in                                                    |only
 koffice-1.6.3/filters/kword/wordperfect/export/Makefile.in                                             |only
 koffice-1.6.3/filters/kword/wordperfect/import/Makefile.in                                             |only
 koffice-1.6.3/filters/libdialogfilter/Makefile.in                                                      |only
 koffice-1.6.3/filters/liboofilter/Makefile.in                                                          |only
 koffice-1.6.3/filters/olefilters/Makefile.in                                                           |only
 koffice-1.6.3/filters/olefilters/lib/Makefile.in                                                       |only
 koffice-1.6.3/filters/olefilters/powerpoint97/Makefile.in                                              |only
 koffice-1.6.3/filters/xsltfilter/Makefile.in                                                           |only
 koffice-1.6.3/filters/xsltfilter/export/Makefile.in                                                    |only
 koffice-1.6.3/filters/xsltfilter/export/xsl/Makefile.in                                                |only
 koffice-1.6.3/filters/xsltfilter/export/xsl/kword/Makefile.in                                          |only
 koffice-1.6.3/filters/xsltfilter/export/xsl/kword/xslfo/Makefile.in                                    |only
 koffice-1.6.3/filters/xsltfilter/import/Makefile.in                                                    |only
 koffice-1.6.3/interfaces/Makefile.in                                                                   |only
 koffice-1.6.3/karbon/Makefile.in                                                                       |only
 koffice-1.6.3/karbon/commands/Makefile.in                                                              |only
 koffice-1.6.3/karbon/core/Makefile.in                                                                  |only
 koffice-1.6.3/karbon/data/Makefile.in                                                                  |only
 koffice-1.6.3/karbon/dialogs/Makefile.in                                                               |only
 koffice-1.6.3/karbon/dockers/Makefile.in                                                               |only
 koffice-1.6.3/karbon/pics/Makefile.in                                                                  |only
 koffice-1.6.3/karbon/plugins/Makefile.in                                                               |only
 koffice-1.6.3/karbon/plugins/flattenpath/Makefile.in                                                   |only
 koffice-1.6.3/karbon/plugins/imagetool/Makefile.in                                                     |only
 koffice-1.6.3/karbon/plugins/insertknots/Makefile.in                                                   |only
 koffice-1.6.3/karbon/plugins/roundcorners/Makefile.in                                                  |only
 koffice-1.6.3/karbon/plugins/shadoweffect/Makefile.in                                                  |only
 koffice-1.6.3/karbon/plugins/whirlpinch/Makefile.in                                                    |only
 koffice-1.6.3/karbon/plugins/zoomtool/Makefile.in                                                      |only
 koffice-1.6.3/karbon/render/Makefile.in                                                                |only
 koffice-1.6.3/karbon/render/xrgbrender/Makefile.in                                                     |only
 koffice-1.6.3/karbon/shapes/Makefile.in                                                                |only
 koffice-1.6.3/karbon/templates/Makefile.in                                                             |only
 koffice-1.6.3/karbon/templates/basic/Makefile.in                                                       |only
 koffice-1.6.3/karbon/tools/Makefile.in                                                                 |only
 koffice-1.6.3/karbon/visitors/Makefile.in                                                              |only
 koffice-1.6.3/karbon/widgets/Makefile.in                                                               |only
 koffice-1.6.3/kchart/Makefile.in                                                                       |only
 koffice-1.6.3/kchart/kdchart/Makefile.in                                                               |only
 koffice-1.6.3/kchart/pics/Makefile.in                                                                  |only
 koffice-1.6.3/kchart/templates/Makefile.in                                                             |only
 koffice-1.6.3/kchart/toolbar/Makefile.in                                                               |only
 koffice-1.6.3/kchart/toolbar/crystalsvg/Makefile.in                                                    |only
 koffice-1.6.3/kchart/toolbar/locolor/Makefile.in                                                       |only
 koffice-1.6.3/kdgantt/Makefile.in                                                                      |only
 koffice-1.6.3/kexi/3rdparty/Makefile.in                                                                |only
 koffice-1.6.3/kexi/3rdparty/kexisql/Makefile.in                                                        |only
 koffice-1.6.3/kexi/3rdparty/kexisql/src/Makefile.in                                                    |only
 koffice-1.6.3/kexi/3rdparty/kexisql/tool/Makefile.in                                                   |only
 koffice-1.6.3/kexi/3rdparty/kexisql3/Makefile.in                                                       |only
 koffice-1.6.3/kexi/3rdparty/kexisql3/src/Makefile.in                                                   |only
 koffice-1.6.3/kexi/3rdparty/kolibs/Makefile.in                                                         |only
 koffice-1.6.3/kexi/3rdparty/uuid/Makefile.in                                                           |only
 koffice-1.6.3/kexi/Makefile.in                                                                         |only
 koffice-1.6.3/kexi/core/Makefile.in                                                                    |only
 koffice-1.6.3/kexi/data/Makefile.in                                                                    |only
 koffice-1.6.3/kexi/data/kde34compat/Makefile.in                                                        |only
 koffice-1.6.3/kexi/examples/Makefile.in                                                                |only
 koffice-1.6.3/kexi/formeditor/Makefile.in                                                              |only
 koffice-1.6.3/kexi/formeditor/factories/Makefile.in                                                    |only
 koffice-1.6.3/kexi/formeditor/kdevelop_plugin/Makefile.in                                              |only
 koffice-1.6.3/kexi/formeditor/scripting/Makefile.in                                                    |only
 koffice-1.6.3/kexi/formeditor/test/Makefile.in                                                         |only
 koffice-1.6.3/kexi/kexidb/Makefile.in                                                                  |only
 koffice-1.6.3/kexi/kexidb/drivers/Makefile.in                                                          |only
 koffice-1.6.3/kexi/kexidb/drivers/mySQL/Makefile.in                                                    |only
 koffice-1.6.3/kexi/kexidb/drivers/odbc/Makefile.in                                                     |only
 koffice-1.6.3/kexi/kexidb/drivers/pqxx/Makefile.in                                                     |only
 koffice-1.6.3/kexi/kexidb/drivers/sqlite/Makefile.in                                                   |only
 koffice-1.6.3/kexi/kexidb/drivers/sqlite2/Makefile.in                                                  |only
 koffice-1.6.3/kexi/kexidb/parser/Makefile.in                                                           |only
 koffice-1.6.3/kexi/kexiutils/Makefile.in                                                               |only
 koffice-1.6.3/kexi/main/Makefile.in                                                                    |only
 koffice-1.6.3/kexi/main/printing/Makefile.in                                                           |only
 koffice-1.6.3/kexi/main/startup/Makefile.in                                                            |only
 koffice-1.6.3/kexi/migration/Makefile.in                                                               |only
 koffice-1.6.3/kexi/migration/mysql/Makefile.in                                                         |only
 koffice-1.6.3/kexi/migration/pqxx/Makefile.in                                                          |only
 koffice-1.6.3/kexi/migration/txt/Makefile.in                                                           |only
 koffice-1.6.3/kexi/pics/Makefile.in                                                                    |only
 koffice-1.6.3/kexi/plugins/Makefile.in                                                                 |only
 koffice-1.6.3/kexi/plugins/forms/Makefile.in                                                           |only
 koffice-1.6.3/kexi/plugins/forms/widgets/Makefile.in                                                   |only
 koffice-1.6.3/kexi/plugins/importexport/Makefile.in                                                    |only
 koffice-1.6.3/kexi/plugins/importexport/csv/Makefile.in                                                |only
 koffice-1.6.3/kexi/plugins/macros/Makefile.in                                                          |only
 koffice-1.6.3/kexi/plugins/macros/kexiactions/Makefile.in                                              |only
 koffice-1.6.3/kexi/plugins/macros/kexipart/Makefile.in                                                 |only
 koffice-1.6.3/kexi/plugins/macros/lib/Makefile.in                                                      |only
 koffice-1.6.3/kexi/plugins/macros/tests/Makefile.in                                                    |only
 koffice-1.6.3/kexi/plugins/migration/Makefile.in                                                       |only
 koffice-1.6.3/kexi/plugins/queries/Makefile.in                                                         |only
 koffice-1.6.3/kexi/plugins/relations/Makefile.in                                                       |only
 koffice-1.6.3/kexi/plugins/reports/Makefile.in                                                         |only
 koffice-1.6.3/kexi/plugins/scripting/Makefile.in                                                       |only
 koffice-1.6.3/kexi/plugins/scripting/kexiapp/Makefile.in                                               |only
 koffice-1.6.3/kexi/plugins/scripting/kexidb/Makefile.in                                                |only
 koffice-1.6.3/kexi/plugins/scripting/kexiscripting/Makefile.in                                         |only
 koffice-1.6.3/kexi/plugins/scripting/scripts/Makefile.in                                               |only
 koffice-1.6.3/kexi/plugins/scripting/scripts/copycenter/Makefile.in                                    |only
 koffice-1.6.3/kexi/plugins/scripting/scripts/exportxhtml/Makefile.in                                   |only
 koffice-1.6.3/kexi/plugins/scripting/scripts/importxhtml/Makefile.in                                   |only
 koffice-1.6.3/kexi/plugins/scripting/scripts/projectdocumentor/Makefile.in                             |only
 koffice-1.6.3/kexi/plugins/scripting/scripts/python/Makefile.in                                        |only
 koffice-1.6.3/kexi/plugins/scripting/scripts/python/kexiapp/Makefile.in                                |only
 koffice-1.6.3/kexi/plugins/tables/Makefile.in                                                          |only
 koffice-1.6.3/kexi/tests/Makefile.in                                                                   |only
 koffice-1.6.3/kexi/tests/altertable/Makefile.in                                                        |only
 koffice-1.6.3/kexi/tests/newapi/Makefile.in                                                            |only
 koffice-1.6.3/kexi/tests/parser/Makefile.in                                                            |only
 koffice-1.6.3/kexi/tests/startup/Makefile.in                                                           |only
 koffice-1.6.3/kexi/tests/tableview/Makefile.in                                                         |only
 koffice-1.6.3/kexi/tests/widgets/Makefile.in                                                           |only
 koffice-1.6.3/kexi/tools/Makefile.in                                                                   |only
 koffice-1.6.3/kexi/tools/add_column/Makefile.in                                                        |only
 koffice-1.6.3/kexi/tools/delete_column/Makefile.in                                                     |only
 koffice-1.6.3/kexi/widget/Makefile.in                                                                  |only
 koffice-1.6.3/kexi/widget/relations/Makefile.in                                                        |only
 koffice-1.6.3/kexi/widget/tableview/Makefile.in                                                        |only
 koffice-1.6.3/kexi/widget/utils/Makefile.in                                                            |only
 koffice-1.6.3/kformula/Makefile.in                                                                     |only
 koffice-1.6.3/kformula/pics/Makefile.in                                                                |only
 koffice-1.6.3/kivio/Makefile.in                                                                        |only
 koffice-1.6.3/kivio/kiviopart/Makefile.in                                                              |only
 koffice-1.6.3/kivio/kiviopart/config/Makefile.in                                                       |only
 koffice-1.6.3/kivio/kiviopart/kiviosdk/Makefile.in                                                     |only
 koffice-1.6.3/kivio/kiviopart/pics/Makefile.in                                                         |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Assorted/Makefile.in                                        |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Circuit/Makefile.in                                         |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Cisco/Makefile.in                                           |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Civil/Makefile.in                                           |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Contact/Makefile.in                                         |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Electric/Makefile.in                                        |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Jigsaw/Makefile.in                                          |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/MSE/Makefile.in                                             |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Makefile.in                                                 |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Network/Makefile.in                                         |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Pneumatic/Makefile.in                                       |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/SDL/Makefile.in                                             |only
 koffice-1.6.3/kivio/kiviopart/stencils/Dia/Sybase/Makefile.in                                          |only
 koffice-1.6.3/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile.in                      |only
 koffice-1.6.3/kivio/kiviopart/stencils/Flowcharting/Extended/Makefile.in                               |only
 koffice-1.6.3/kivio/kiviopart/stencils/Flowcharting/Logic/Makefile.in                                  |only
 koffice-1.6.3/kivio/kiviopart/stencils/Flowcharting/Makefile.in                                        |only
 koffice-1.6.3/kivio/kiviopart/stencils/Geographic/Flags/Makefile.in                                    |only
 koffice-1.6.3/kivio/kiviopart/stencils/Geographic/Makefile.in                                          |only
 koffice-1.6.3/kivio/kiviopart/stencils/Geographic/Maps/Makefile.in                                     |only
 koffice-1.6.3/kivio/kiviopart/stencils/Hardware/Computer/Makefile.in                                   |only
 koffice-1.6.3/kivio/kiviopart/stencils/Hardware/Makefile.in                                            |only
 koffice-1.6.3/kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile.in                              |only
 koffice-1.6.3/kivio/kiviopart/stencils/Makefile.in                                                     |only
 koffice-1.6.3/kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile.in                                |only
 koffice-1.6.3/kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile.in                             |only
 koffice-1.6.3/kivio/kiviopart/stencils/Miscellaneous/ER/Makefile.in                                    |only
 koffice-1.6.3/kivio/kiviopart/stencils/Miscellaneous/Makefile.in                                       |only
 koffice-1.6.3/kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile.in                      |only
 koffice-1.6.3/kivio/kiviopart/stencils/Miscellaneous/People/Makefile.in                                |only
 koffice-1.6.3/kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile.in                             |only
 koffice-1.6.3/kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile.in                                |only
 koffice-1.6.3/kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile.in                                   |only
 koffice-1.6.3/kivio/kiviopart/stencils/UML/Makefile.in                                                 |only
 koffice-1.6.3/kivio/kiviopart/tiles/Makefile.in                                                        |only
 koffice-1.6.3/kivio/kiviopart/tools/Makefile.in                                                        |only
 koffice-1.6.3/kivio/kiviopart/ui/Makefile.in                                                           |only
 koffice-1.6.3/kivio/plugins/Makefile.in                                                                |only
 koffice-1.6.3/kivio/plugins/kivioconnectortool/Makefile.in                                             |only
 koffice-1.6.3/kivio/plugins/kivioconnectortool/straight_connector/Makefile.in                          |only
 koffice-1.6.3/kivio/plugins/kivioselecttool/Makefile.in                                                |only
 koffice-1.6.3/kivio/plugins/kivioselecttool/select_pics/Makefile.in                                    |only
 koffice-1.6.3/kivio/plugins/kiviosmlconnector/Makefile.in                                              |only
 koffice-1.6.3/kivio/plugins/kiviosmlconnector/sml_connector/Makefile.in                                |only
 koffice-1.6.3/kivio/plugins/kiviotargettool/Makefile.in                                                |only
 koffice-1.6.3/kivio/plugins/kiviotexttool/Makefile.in                                                  |only
 koffice-1.6.3/kivio/plugins/kiviozoomtool/Makefile.in                                                  |only
 koffice-1.6.3/kivio/plugins/kiviozoomtool/zoom_pics/Makefile.in                                        |only
 koffice-1.6.3/kivio/templates/Makefile.in                                                              |only
 koffice-1.6.3/kivio/templates/basic/Makefile.in                                                        |only
 koffice-1.6.3/koshell/Makefile.in                                                                      |only
 koffice-1.6.3/kounavail/Makefile.in                                                                    |only
 koffice-1.6.3/kplato/Makefile.in                                                                       |only
 koffice-1.6.3/kplato/pics/Makefile.in                                                                  |only
 koffice-1.6.3/kplato/reports/Makefile.in                                                               |only
 koffice-1.6.3/kplato/templates/Makefile.in                                                             |only
 koffice-1.6.3/kplato/templates/Simple/Makefile.in                                                      |only
 koffice-1.6.3/kplato/tests/Makefile.in                                                                 |only
 koffice-1.6.3/kplato/toolbar/Makefile.in                                                               |only
 koffice-1.6.3/kpresenter/Makefile.in                                                                   |only
 koffice-1.6.3/kpresenter/autoformEdit/Makefile.in                                                      |only
 koffice-1.6.3/kpresenter/autoforms/Arrows/Makefile.in                                                  |only
 koffice-1.6.3/kpresenter/autoforms/Connections/Makefile.in                                             |only
 koffice-1.6.3/kpresenter/autoforms/Makefile.in                                                         |only
 koffice-1.6.3/kpresenter/dtd/Makefile.in                                                               |only
 koffice-1.6.3/kpresenter/pics/Makefile.in                                                              |only
 koffice-1.6.3/kpresenter/pics/rotate/Makefile.in                                                       |only
 koffice-1.6.3/kpresenter/slideshow/Makefile.in                                                         |only
 koffice-1.6.3/kpresenter/templates/A4/Makefile.in                                                      |only
 koffice-1.6.3/kpresenter/templates/Makefile.in                                                         |only
 koffice-1.6.3/kpresenter/templates/Screen/Makefile.in                                                  |only
 koffice-1.6.3/kpresenter/templates/Screenpresentations/Makefile.in                                     |only
 koffice-1.6.3/kpresenter/templates/common_icon/Makefile.in                                             |only
 koffice-1.6.3/kpresenter/templates/legal/Makefile.in                                                   |only
 koffice-1.6.3/kpresenter/templates/letter/Makefile.in                                                  |only
 koffice-1.6.3/kpresenter/toolbar/Makefile.in                                                           |only
 koffice-1.6.3/krita/Makefile.in                                                                        |only
 koffice-1.6.3/krita/colorspaces/Makefile.in                                                            |only
 koffice-1.6.3/krita/colorspaces/cmyk_u16/Makefile.in                                                   |only
 koffice-1.6.3/krita/colorspaces/cmyk_u8/Makefile.in                                                    |only
 koffice-1.6.3/krita/colorspaces/cmyk_u8/templates/Makefile.in                                          |only
 koffice-1.6.3/krita/colorspaces/gray_u16/Makefile.in                                                   |only
 koffice-1.6.3/krita/colorspaces/gray_u8/Makefile.in                                                    |only
 koffice-1.6.3/krita/colorspaces/gray_u8/templates/Makefile.in                                          |only
 koffice-1.6.3/krita/colorspaces/gray_u8/tests/Makefile.in                                              |only
 koffice-1.6.3/krita/colorspaces/lms_f32/Makefile.in                                                    |only
 koffice-1.6.3/krita/colorspaces/rgb_f16half/Makefile.in                                                |only
 koffice-1.6.3/krita/colorspaces/rgb_f16half/tests/Makefile.in                                          |only
 koffice-1.6.3/krita/colorspaces/rgb_f32/Makefile.in                                                    |only
 koffice-1.6.3/krita/colorspaces/rgb_f32/tests/Makefile.in                                              |only
 koffice-1.6.3/krita/colorspaces/rgb_u16/Makefile.in                                                    |only
 koffice-1.6.3/krita/colorspaces/rgb_u16/tests/Makefile.in                                              |only
 koffice-1.6.3/krita/colorspaces/rgb_u8/Makefile.in                                                     |only
 koffice-1.6.3/krita/colorspaces/rgb_u8/templates/Makefile.in                                           |only
 koffice-1.6.3/krita/colorspaces/rgb_u8/tests/Makefile.in                                               |only
 koffice-1.6.3/krita/colorspaces/wet/Makefile.in                                                        |only
 koffice-1.6.3/krita/colorspaces/wetsticky/Makefile.in                                                  |only
 koffice-1.6.3/krita/colorspaces/wetsticky/brushop/Makefile.in                                          |only
 koffice-1.6.3/krita/colorspaces/ycbcr_u16/Makefile.in                                                  |only
 koffice-1.6.3/krita/colorspaces/ycbcr_u8/Makefile.in                                                   |only
 koffice-1.6.3/krita/core/Makefile.in                                                                   |only
 koffice-1.6.3/krita/core/tests/Makefile.in                                                             |only
 koffice-1.6.3/krita/core/tiles/Makefile.in                                                             |only
 koffice-1.6.3/krita/core/tiles/tests/Makefile.in                                                       |only
 koffice-1.6.3/krita/data/Makefile.in                                                                   |only
 koffice-1.6.3/krita/data/brushes/Makefile.in                                                           |only
 koffice-1.6.3/krita/data/gradients/Makefile.in                                                         |only
 koffice-1.6.3/krita/data/images/Makefile.in                                                            |only
 koffice-1.6.3/krita/data/palettes/Makefile.in                                                          |only
 koffice-1.6.3/krita/data/patterns/Makefile.in                                                          |only
 koffice-1.6.3/krita/data/profiles/Makefile.in                                                          |only
 koffice-1.6.3/krita/dtd/Makefile.in                                                                    |only
 koffice-1.6.3/krita/kritacolor/Makefile.in                                                             |only
 koffice-1.6.3/krita/kritacolor/colorspaces/Makefile.in                                                 |only
 koffice-1.6.3/krita/kritacolor/tests/Makefile.in                                                       |only
 koffice-1.6.3/krita/pics/Makefile.in                                                                   |only
 koffice-1.6.3/krita/plugins/Makefile.in                                                                |only
 koffice-1.6.3/krita/plugins/filters/Makefile.in                                                        |only
 koffice-1.6.3/krita/plugins/filters/blur/Makefile.in                                                   |only
 koffice-1.6.3/krita/plugins/filters/bumpmap/Makefile.in                                                |only
 koffice-1.6.3/krita/plugins/filters/cimg/Makefile.in                                                   |only
 koffice-1.6.3/krita/plugins/filters/colorify/Makefile.in                                               |only
 koffice-1.6.3/krita/plugins/filters/colors/Makefile.in                                                 |only
 koffice-1.6.3/krita/plugins/filters/colorsfilters/Makefile.in                                          |only
 koffice-1.6.3/krita/plugins/filters/convolutionfilters/Makefile.in                                     |only
 koffice-1.6.3/krita/plugins/filters/cubismfilter/Makefile.in                                           |only
 koffice-1.6.3/krita/plugins/filters/embossfilter/Makefile.in                                           |only
 koffice-1.6.3/krita/plugins/filters/example/Makefile.in                                                |only
 koffice-1.6.3/krita/plugins/filters/fastcolortransfer/Makefile.in                                      |only
 koffice-1.6.3/krita/plugins/filters/imageenhancement/Makefile.in                                       |only
 koffice-1.6.3/krita/plugins/filters/lenscorrectionfilter/Makefile.in                                   |only
 koffice-1.6.3/krita/plugins/filters/levelfilter/Makefile.in                                            |only
 koffice-1.6.3/krita/plugins/filters/noisefilter/Makefile.in                                            |only
 koffice-1.6.3/krita/plugins/filters/oilpaintfilter/Makefile.in                                         |only
 koffice-1.6.3/krita/plugins/filters/pixelizefilter/Makefile.in                                         |only
 koffice-1.6.3/krita/plugins/filters/raindropsfilter/Makefile.in                                        |only
 koffice-1.6.3/krita/plugins/filters/randompickfilter/Makefile.in                                       |only
 koffice-1.6.3/krita/plugins/filters/roundcorners/Makefile.in                                           |only
 koffice-1.6.3/krita/plugins/filters/smalltilesfilter/Makefile.in                                       |only
 koffice-1.6.3/krita/plugins/filters/sobelfilter/Makefile.in                                            |only
 koffice-1.6.3/krita/plugins/filters/threadtest/Makefile.in                                             |only
 koffice-1.6.3/krita/plugins/filters/unsharp/Makefile.in                                                |only
 koffice-1.6.3/krita/plugins/filters/wavefilter/Makefile.in                                             |only
 koffice-1.6.3/krita/plugins/paintops/Makefile.in                                                       |only
 koffice-1.6.3/krita/plugins/paintops/defaultpaintops/Makefile.in                                       |only
 koffice-1.6.3/krita/plugins/tools/Makefile.in                                                          |only
 koffice-1.6.3/krita/plugins/tools/defaulttools/Makefile.in                                             |only
 koffice-1.6.3/krita/plugins/tools/selectiontools/Makefile.in                                           |only
 koffice-1.6.3/krita/plugins/tools/tool_crop/Makefile.in                                                |only
 koffice-1.6.3/krita/plugins/tools/tool_curves/Makefile.in                                              |only
 koffice-1.6.3/krita/plugins/tools/tool_filter/Makefile.in                                              |only
 koffice-1.6.3/krita/plugins/tools/tool_perspectivegrid/Makefile.in                                     |only
 koffice-1.6.3/krita/plugins/tools/tool_perspectivetransform/Makefile.in                                |only
 koffice-1.6.3/krita/plugins/tools/tool_polygon/Makefile.in                                             |only
 koffice-1.6.3/krita/plugins/tools/tool_polyline/Makefile.in                                            |only
 koffice-1.6.3/krita/plugins/tools/tool_selectsimilar/Makefile.in                                       |only
 koffice-1.6.3/krita/plugins/tools/tool_star/Makefile.in                                                |only
 koffice-1.6.3/krita/plugins/tools/tool_transform/Makefile.in                                           |only
 koffice-1.6.3/krita/plugins/viewplugins/Makefile.in                                                    |only
 koffice-1.6.3/krita/plugins/viewplugins/colorrange/Makefile.in                                         |only
 koffice-1.6.3/krita/plugins/viewplugins/colorspaceconversion/Makefile.in                               |only
 koffice-1.6.3/krita/plugins/viewplugins/dropshadow/Makefile.in                                         |only
 koffice-1.6.3/krita/plugins/viewplugins/filtersgallery/Makefile.in                                     |only
 koffice-1.6.3/krita/plugins/viewplugins/histogram/Makefile.in                                          |only
 koffice-1.6.3/krita/plugins/viewplugins/histogram_docker/Makefile.in                                   |only
 koffice-1.6.3/krita/plugins/viewplugins/history_docker/Makefile.in                                     |only
 koffice-1.6.3/krita/plugins/viewplugins/imagesize/Makefile.in                                          |only
 koffice-1.6.3/krita/plugins/viewplugins/modify_selection/Makefile.in                                   |only
 koffice-1.6.3/krita/plugins/viewplugins/performancetest/Makefile.in                                    |only
 koffice-1.6.3/krita/plugins/viewplugins/rotateimage/Makefile.in                                        |only
 koffice-1.6.3/krita/plugins/viewplugins/screenshot/Makefile.in                                         |only
 koffice-1.6.3/krita/plugins/viewplugins/scripting/Makefile.in                                          |only
 koffice-1.6.3/krita/plugins/viewplugins/scripting/kritacore/Makefile.in                                |only
 koffice-1.6.3/krita/plugins/viewplugins/scripting/kritascripting/Makefile.in                           |only
 koffice-1.6.3/krita/plugins/viewplugins/scripting/samples/Makefile.in                                  |only
 koffice-1.6.3/krita/plugins/viewplugins/scripting/samples/python/Makefile.in                           |only
 koffice-1.6.3/krita/plugins/viewplugins/scripting/samples/ruby/Makefile.in                             |only
 koffice-1.6.3/krita/plugins/viewplugins/selectopaque/Makefile.in                                       |only
 koffice-1.6.3/krita/plugins/viewplugins/separate_channels/Makefile.in                                  |only
 koffice-1.6.3/krita/plugins/viewplugins/shearimage/Makefile.in                                         |only
 koffice-1.6.3/krita/plugins/viewplugins/substrate/Makefile.in                                          |only
 koffice-1.6.3/krita/plugins/viewplugins/variations/Makefile.in                                         |only
 koffice-1.6.3/krita/sdk/Makefile.in                                                                    |only
 koffice-1.6.3/krita/ui/Makefile.in                                                                     |only
 koffice-1.6.3/kspread/Makefile.in                                                                      |only
 koffice-1.6.3/kspread/dialogs/Makefile.in                                                              |only
 koffice-1.6.3/kspread/dtd/Makefile.in                                                                  |only
 koffice-1.6.3/kspread/extensions/Makefile.in                                                           |only
 koffice-1.6.3/kspread/pics/Makefile.in                                                                 |only
 koffice-1.6.3/kspread/plugins/Makefile.in                                                              |only
 koffice-1.6.3/kspread/plugins/calculator/Makefile.in                                                   |only
 koffice-1.6.3/kspread/plugins/calculator/pics/Makefile.in                                              |only
 koffice-1.6.3/kspread/plugins/insertcalendar/Makefile.in                                               |only
 koffice-1.6.3/kspread/plugins/scripting/Makefile.in                                                    |only
 koffice-1.6.3/kspread/plugins/scripting/kspreadcore/Makefile.in                                        |only
 koffice-1.6.3/kspread/plugins/scripting/scripts/Makefile.in                                            |only
 koffice-1.6.3/kspread/plugins/scripting/scripts/exporthtml/Makefile.in                                 |only
 koffice-1.6.3/kspread/plugins/scripting/scripts/scripteditor/Makefile.in                               |only
 koffice-1.6.3/kspread/sheetstyles/Makefile.in                                                          |only
 koffice-1.6.3/kspread/templates/Business/Makefile.in                                                   |only
 koffice-1.6.3/kspread/templates/General/Makefile.in                                                    |only
 koffice-1.6.3/kspread/templates/HomeFamily/Makefile.in                                                 |only
 koffice-1.6.3/kspread/templates/Makefile.in                                                            |only
 koffice-1.6.3/kspread/tests/Makefile.in                                                                |only
 koffice-1.6.3/kspread/toolbar/Makefile.in                                                              |only
 koffice-1.6.3/kspread/toolbar/crystalsvg/Makefile.in                                                   |only
 koffice-1.6.3/kugar/Makefile.in                                                                        |only
 koffice-1.6.3/kugar/kudesigner/Makefile.in                                                             |only
 koffice-1.6.3/kugar/kudesigner/pics/Makefile.in                                                        |only
 koffice-1.6.3/kugar/kudesigner/templates/General/Makefile.in                                           |only
 koffice-1.6.3/kugar/kudesigner/templates/Makefile.in                                                   |only
 koffice-1.6.3/kugar/kudesigner/toolbar/Makefile.in                                                     |only
 koffice-1.6.3/kugar/kudesigner_lib/Makefile.in                                                         |only
 koffice-1.6.3/kugar/lib/Makefile.in                                                                    |only
 koffice-1.6.3/kugar/part/Makefile.in                                                                   |only
 koffice-1.6.3/kugar/samples/Makefile.in                                                                |only
 koffice-1.6.3/kword/Makefile.in                                                                        |only
 koffice-1.6.3/kword/data/Makefile.in                                                                   |only
 koffice-1.6.3/kword/dtd/Makefile.in                                                                    |only
 koffice-1.6.3/kword/expression/Makefile.in                                                             |only
 koffice-1.6.3/kword/horizontalline/Makefile.in                                                         |only
 koffice-1.6.3/kword/mailmerge/Makefile.in                                                              |only
 koffice-1.6.3/kword/mailmerge/kabc/Makefile.in                                                         |only
 koffice-1.6.3/kword/mailmerge/kspread/Makefile.in                                                      |only
 koffice-1.6.3/kword/mailmerge/sql/Makefile.in                                                          |only
 koffice-1.6.3/kword/pics/Makefile.in                                                                   |only
 koffice-1.6.3/kword/templates/CardsAndLabels/Makefile.in                                               |only
 koffice-1.6.3/kword/templates/Envelopes/Makefile.in                                                    |only
 koffice-1.6.3/kword/templates/Makefile.in                                                              |only
 koffice-1.6.3/kword/templates/Wordprocessing/Makefile.in                                               |only
 koffice-1.6.3/kword/tests/Makefile.in                                                                  |only
 koffice-1.6.3/kword/toolbar/Makefile.in                                                                |only
 koffice-1.6.3/lib/Makefile.in                                                                          |only
 koffice-1.6.3/lib/kformula/Makefile.in                                                                 |only
 koffice-1.6.3/lib/kformula/config/Makefile.in                                                          |only
 koffice-1.6.3/lib/kformula/dtd/Makefile.in                                                             |only
 koffice-1.6.3/lib/kformula/fonts/Makefile.in                                                           |only
 koffice-1.6.3/lib/kformula/pics/Makefile.in                                                            |only
 koffice-1.6.3/lib/kformula/pics/crystalsvg/Makefile.in                                                 |only
 koffice-1.6.3/lib/kofficecore/Makefile.in                                                              |only
 koffice-1.6.3/lib/kofficecore/tests/Makefile.in                                                        |only
 koffice-1.6.3/lib/kofficeui/Makefile.in                                                                |only
 koffice-1.6.3/lib/kofficeui/pics/Makefile.in                                                           |only
 koffice-1.6.3/lib/kofficeui/tests/Makefile.in                                                          |only
 koffice-1.6.3/lib/kopainter/Makefile.in                                                                |only
 koffice-1.6.3/lib/kopalette/Makefile.in                                                                |only
 koffice-1.6.3/lib/koproperty/Makefile.in                                                               |only
 koffice-1.6.3/lib/koproperty/editors/Makefile.in                                                       |only
 koffice-1.6.3/lib/koproperty/test/Makefile.in                                                          |only
 koffice-1.6.3/lib/kotext/Makefile.in                                                                   |only
 koffice-1.6.3/lib/kotext/kohyphen/Makefile.in                                                          |only
 koffice-1.6.3/lib/kotext/kohyphen/hyphdicts/Makefile.in                                                |only
 koffice-1.6.3/lib/kotext/tests/Makefile.in                                                             |only
 koffice-1.6.3/lib/kross/Makefile.in                                                                    |only
 koffice-1.6.3/lib/kross/api/Makefile.in                                                                |only
 koffice-1.6.3/lib/kross/main/Makefile.in                                                               |only
 koffice-1.6.3/lib/kross/python/Makefile.in                                                             |only
 koffice-1.6.3/lib/kross/python/cxx/Makefile.in                                                         |only
 koffice-1.6.3/lib/kross/python/scripts/Makefile.in                                                     |only
 koffice-1.6.3/lib/kross/python/scripts/RestrictedPython/Makefile.in                                    |only
 koffice-1.6.3/lib/kross/ruby/Makefile.in                                                               |only
 koffice-1.6.3/lib/kross/runner/Makefile.in                                                             |only
 koffice-1.6.3/lib/kross/test/Makefile.in                                                               |only
 koffice-1.6.3/lib/kwmf/Makefile.in                                                                     |only
 koffice-1.6.3/lib/store/Makefile.in                                                                    |only
 koffice-1.6.3/lib/store/tests/Makefile.in                                                              |only
 koffice-1.6.3/mimetypes/Makefile.in                                                                    |only
 koffice-1.6.3/mimetypes/kde33/Makefile.in                                                              |only
 koffice-1.6.3/mimetypes/kde351/Makefile.in                                                             |only
 koffice-1.6.3/pics/Makefile.in                                                                         |only
 koffice-1.6.3/pics/crystalsvg/Makefile.in                                                              |only
 koffice-1.6.3/plugins/Makefile.in                                                                      |only
 koffice-1.6.3/plugins/scan/Makefile.in                                                                 |only
 koffice-1.6.3/servicetypes/Makefile.in                                                                 |only
 koffice-1.6.3/templates/Makefile.in                                                                    |only
 koffice-1.6.3/tools/Makefile.in                                                                        |only
 koffice-1.6.3/tools/converter/Makefile.in                                                              |only
 koffice-1.6.3/tools/kfile-plugins/Makefile.in                                                          |only
 koffice-1.6.3/tools/kfile-plugins/abiword/Makefile.in                                                  |only
 koffice-1.6.3/tools/kfile-plugins/gnumeric/Makefile.in                                                 |only
 koffice-1.6.3/tools/kfile-plugins/koffice/Makefile.in                                                  |only
 koffice-1.6.3/tools/kfile-plugins/ooo/Makefile.in                                                      |only
 koffice-1.6.3/tools/kthesaurus/Makefile.in                                                             |only
 koffice-1.6.3/tools/quickprint/Makefile.in                                                             |only
 koffice-1.6.3/tools/spell/Makefile.in                                                                  |only
 koffice-1.6.3/tools/thesaurus/Makefile.in                                                              |only
 koffice-1.6.3/tools/thumbnail/Makefile.in                                                              |only
 1156 files changed, 5215 insertions(+), 2017 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.2 -r 1.3 koffice-20090306svn.patchIndex: koffice-20090306svn.patch
===================================================================
RCS file: koffice-20090306svn.patch
diff -N koffice-20090306svn.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ koffice-20090306svn.patch	26 Sep 2009 18:19:02 -0000	1.3
@@ -0,0 +1,26063 @@
+Only in koffice-1.6.3/: acinclude.m4
+Only in koffice-1.6.3/: aclocal.m4
+diff -urbB --minimal --exclude=.svn koffice-1.6.3/admin/acinclude.m4.in koffice-1.6-branch/admin/acinclude.m4.in
+--- koffice-1.6.3/admin/acinclude.m4.in	2007-05-30 16:50:22.000000000 -0500
++++ koffice-1.6-branch/admin/acinclude.m4.in	2008-11-03 12:17:22.000000000 -0600
+@@ -1226,7 +1226,15 @@
+   kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
+ fi
+ if test $kde_qtver = 3; then
+-  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
++  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3"
++  if test -z "$PKG_CONFIG"; then
++      AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++  fi
++  if test "$PKG_CONFIG" != "no" ; then
++    if $PKG_CONFIG --exists qt-mt ; then
++       kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`"
++    fi
++  fi
+ fi
+ if test $kde_qtver = 2; then
+    kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
+@@ -1443,6 +1451,14 @@
+ for dir in $kde_qt_dirs; do
+    qt_incdirs="$qt_incdirs $dir/include $dir"
+ done
++if test -z "$PKG_CONFIG"; then
++    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++fi
++if test "$PKG_CONFIG" != "no" ; then
++  if $PKG_CONFIG --exists qt-mt ; then
++      qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`"
++  fi
++fi
+ qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
+ if test ! "$ac_qt_includes" = "NO"; then
+    qt_incdirs="$ac_qt_includes $qt_incdirs"
+@@ -1459,8 +1475,16 @@
+ 
+ qt_libdirs=""
+ for dir in $kde_qt_dirs; do
+-   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
++   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir"
+ done
++if test -z "$PKG_CONFIG"; then
++    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++fi
++if test "$PKG_CONFIG" != "no" ; then
++  if $PKG_CONFIG --exists qt-mt ; then
++      qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`"
++  fi
++fi
+ qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
+ if test ! "$ac_qt_libraries" = "NO"; then
+   qt_libdir=$ac_qt_libraries
+@@ -2631,6 +2655,7 @@
+ AC_TRY_LINK(dnl
+ [
+ #include<zlib.h>
++#include<string.h>
+ ],
+ [
+   char buf[42];
+@@ -2638,7 +2663,7 @@
+   /* this would segfault.. but we only link, don't run */
+   (void) gzgets(f, buf, sizeof(buf));
+ 
+-  return (zlibVersion() == ZLIB_VERSION); 
++  return (strcmp(zlibVersion(), ZLIB_VERSION) == 0);
+ ],
+             eval "ac_cv_lib_z='-lz'",
+             eval "ac_cv_lib_z=no")
+@@ -2738,11 +2763,11 @@
+      echo "*** to the full path to pkg-config."
+      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+   else
+-     if !(`$PKG_CONFIG --exists OpenEXR`) ; then
++     if ! $PKG_CONFIG --exists OpenEXR ; then
+         AC_MSG_RESULT(no)
+         EXRSTATUS=no
+      else
+-        if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then
++        if ! $PKG_CONFIG --atleast-version="1.1.1" OpenEXR ; then
+            AC_MSG_RESULT(no)
+            EXRSTATUS=old
+         else
+@@ -4624,7 +4649,8 @@
+ 
+ AC_DEFUN([KDE_CHECK_PYTHON],
+ [
+-  KDE_CHECK_PYTHON_INTERN("2.5",
++  KDE_CHECK_PYTHON_INTERN("2.6",
++    [KDE_CHECK_PYTHON_INTERN("2.5",
+     [KDE_CHECK_PYTHON_INTERN("2.4",
+      [KDE_CHECK_PYTHON_INTERN("2.3", 
+        [KDE_CHECK_PYTHON_INTERN("2.2", 
+@@ -4636,6 +4662,7 @@
+        ])
+      ])
+   ])
++    ])
+ ])
+ 
+ AC_DEFUN([KDE_CHECK_STL],
+diff -urbB --minimal --exclude=.svn koffice-1.6.3/admin/cvs.sh koffice-1.6-branch/admin/cvs.sh
+--- koffice-1.6.3/admin/cvs.sh	2007-05-30 16:50:22.000000000 -0500
++++ koffice-1.6-branch/admin/cvs.sh	2008-11-03 12:17:22.000000000 -0600
+@@ -316,7 +316,7 @@
+    fi
+ fi
+ if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
+-     VERSION="\"3.5.7\""
++     VERSION="\"3.5.10\""
+ fi
+ if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
+    modulename=`pwd`; 
+diff -urbB --minimal --exclude=.svn koffice-1.6.3/admin/detect-autoconf.pl koffice-1.6-branch/admin/detect-autoconf.pl
+--- koffice-1.6.3/admin/detect-autoconf.pl	2007-05-30 16:50:22.000000000 -0500
++++ koffice-1.6-branch/admin/detect-autoconf.pl	2008-11-03 12:17:22.000000000 -0600
+@@ -21,6 +21,73 @@
+     return "";
+ }
+ 
++# Subroutine to lexicographically compare two version strings, a and b.
++# If a > b, 1 is returned.
++# If a == b, 0 is returned.
++# If a < b, -1 is returned.
++#
++# If the strings are of uneven number length then the shorter string is
++# prepended by enough zeroes to make the two string lengths equal in order to
++# allow an accurate comparison.  Note that the zero-padding only occurs in
++# between version separators (i.e. 1.6 and 1.10, results in 1.06 vs. 1.10).
++# Parts of the version ending in -foo (or any other text) are not considered
++# when doing the compare. (i.e. 2.53a vs 2.53 doesn't end up in 2.53a vs.
++# 2.053)
++sub compareVersions
++{
++    my ($a, $b) = @_;
++
++    # Split the strings up by '.' (version separator) and start comparing digit
++    # length.
++
++    my @aParts = split(/\./, $a);
++    my @bParts = split(/\./, $b);
++
++    # Make the arrays equal in length by adding missing zeroes to the end of the
++    # version.
++    push @aParts, '0' while scalar @aParts < scalar @bParts;
++    push @bParts, '0' while scalar @bParts < scalar @aParts;
++
++    # Now compare each individual portion.
++    for (my $i = 0; $i < scalar @aParts; ++$i)
++    {
++	# Make sure that any portion that has numbers is contiguous.  I'm sure
++	# there's a technique for saving stuff like 2.52a2 but I don't feel
++	# like implementing it.
++	if ($aParts[$i] !~ /^[^\d]*\d+[^\d]*$/ or
++	    $bParts[$i] !~ /^[^\d]*\d+[^\d]*$/)
++	{
++	    die "Not able to compare $a to $b!\n";
++	}
++
++	my ($aDigits) = ($aParts[$i] =~ /(\d+)/);
++	my ($bDigits) = ($bParts[$i] =~ /(\d+)/);
++
++	# Perl is $MODERATELY_INSULTING_TERM, don't remove the parentheses in
++	# the delta calculation below.
++	my $delta = (length $aDigits) - (length $bDigits);
++	if ($delta < 0) # b is longer
++	{
++	    my $replacement = ('0' x (-$delta)) . $aDigits;
++	    $aParts[$i] =~ s/$aDigits/$replacement/;
++	}
++	elsif ($delta > 0) # a is longer
++	{
++	    my $replacement = ('0' x $delta) . $bDigits;
++	    $bParts[$i] =~ s/$bDigits/$replacement/;
++	}
++    }
++
++    # Arrays now have standardized version components, let's re-merge them
++    # to strings to do the compare.
++    my $newA = join('.', @aParts);
++    my $newB = join('.', @bParts);
++
++    return 1 if ($newA gt $newB);
++    return -1 if ($newA lt $newB);
++    return 0;
++}
++
+ # Subroutine to determine the highest installed version of the given program,
+ # searching from the given paths.
+ sub findBest
[...25670 lines suppressed...]
++Comment[lt]=Patikrinti šio žodžio rašybą
+ Comment[lv]=Pārbaudīt šī vārda pareizrakstību
+ Comment[ms]=Semak Ejaan Kata ini
+ Comment[mt]=Iċċekkja kif tispelli dil-kelma
+@@ -119,7 +122,8 @@
+ Comment[th]=ตรวจสอบคำสะกดของคำนี้
+ Comment[tr]=Bu Kelimenin İmla Denetimini Yap
+ Comment[uk]=Перевірити правопис цього слова
+-Comment[uz]=Шу сўзнинг имлосини текшириш
++Comment[uz]=Shu soʻzning imlosini tekshirish
++Comment[uz at cyrillic]=Шу сўзнинг имлосини текшириш
+ Comment[wa]=Coridjî l' ortografeye di ç' mot ci...
+ Comment[xh]=Khangela olu Pelo Magama
+ Comment[zh_CN]=检查该词拼写
+Only in koffice-1.6.3/tools/spell: Makefile.in
+diff -urbB --minimal --exclude=.svn koffice-1.6.3/tools/spell/uninstall.desktop koffice-1.6-branch/tools/spell/uninstall.desktop
+--- koffice-1.6.3/tools/spell/uninstall.desktop	2007-05-30 16:36:09.000000000 -0500
++++ koffice-1.6-branch/tools/spell/uninstall.desktop	2008-11-03 11:55:08.000000000 -0600
+@@ -1,3 +1,2 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Hidden=true
+Only in koffice-1.6.3/tools/thesaurus: Makefile.in
+diff -urbB --minimal --exclude=.svn koffice-1.6.3/tools/thesaurus/thesaurustool.desktop koffice-1.6-branch/tools/thesaurus/thesaurustool.desktop
+--- koffice-1.6.3/tools/thesaurus/thesaurustool.desktop	2007-05-30 16:36:11.000000000 -0500
++++ koffice-1.6-branch/tools/thesaurus/thesaurustool.desktop	2008-11-03 11:55:11.000000000 -0600
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Icon=
+ Name=Thesaurus Tool
+ Name[af]=Thesaurus Program
+@@ -14,13 +13,14 @@
+ Name[da]=Thesaurusværktøj
+ Name[de]=Thesaurus-Werkzeug
+ Name[el]=Εργαλείο συνωνύμων
+-Name[eo]=Tezaŭro
++Name[eo]=Tezaŭrilo
+ Name[es]=Herramienta de Thesaurus
+ Name[et]=Tesaurus
+ Name[eu]=Thesaurus tresna
+ Name[fa]=ابزار Thesaurus
+ Name[fi]=Synonyymisanakirja
+ Name[fr]=Outil Thésaurus
++Name[fy]=Thesaurus ark
+ Name[gl]=Ferramenta de Sinónimos
+ Name[he]=כלי אגרון
+ Name[hi]=समांतर शब्दकोश का औजार
+@@ -40,7 +40,7 @@
+ Name[ne]=पर्यायकोश उपकरण
+ Name[nl]=Thesaurus hulpprogramma
+ Name[nn]=Synonymordbok
+-Name[pl]=Thesaurus
++Name[pl]=Tezaurus
+ Name[pt]=Ferramenta de Sinónimos
+ Name[pt_BR]=Ferramenta Thesaurus
+ Name[ru]=Тезаурус
+@@ -55,7 +55,8 @@
+ Name[th]=เครื่องมือคำพ้อง
+ Name[tr]=Thesaurus Aracı
+ Name[uk]=Засіб синонімів
+-Name[uz]=Тезаурус воситаси
++Name[uz]=Tezaurus vositasi
++Name[uz at cyrillic]=Тезаурус воситаси
+ Name[xh]=Isixhobo se Thesaurus
+ Name[zh_CN]=词典工具
+ Name[zh_TW]=同義字工具
+@@ -65,7 +66,7 @@
+ Comment=Show Related Words
+ Comment[af]=Vertoon Verwanter Woorde
+ Comment[ar]=إظهار الكلمات ذات العلاقة
+-Comment[bg]=Търсене за синоними на думата
++Comment[bg]=Търсене на синоними
+ Comment[bs]=Prikaži srodne riječi
+ Comment[ca]=Mostra paraules relacionades
+ Comment[cs]=Zobrazit podobná slova
+@@ -80,6 +81,7 @@
+ Comment[fa]=نمایش واژه‌های مربوط
+ Comment[fi]=Näytä samankaltaiset sanat
+ Comment[fr]=Afficher les mots liés
++Comment[fy]=Ferlykbere wurden sjen litte
+ Comment[gl]=Mostrar as Palabras Relacionadas
+ Comment[he]=הצג מילים קשורות
+ Comment[hi]=सम्बन्धित शब्द दिखाएँ
+@@ -90,11 +92,12 @@
+ Comment[ja]=類義語を表示
+ Comment[km]=បង្ហាញ​ពាក្យ​ដែល​ទាក់ទង
+ Comment[lo]=ສະແດງຄໍາທີ່ສໍາພັນກັນ
++Comment[lt]=Parodyti susijusius žodžius
+ Comment[lv]=Rādīt saistītos vārdus
+ Comment[ms]=Tayang Kata Berkaitan
+ Comment[mt]=Uri kliem relatati
+ Comment[nb]=Vis ord som ligner
+-Comment[nds]=Tohören Wöör wiesen
++Comment[nds]=Lieke Wöör wiesen
+ Comment[ne]=सम्बन्धित शब्दहरू देखाउनुहोस्
+ Comment[nl]=Toon gerelateerde woorden
+ Comment[nn]=Vis nærskylde ord
+@@ -112,7 +115,8 @@
+ Comment[th]=แสดงคำที่สัมพันธ์กัน
+ Comment[tr]=İlgili Kelimeleri Göster
+ Comment[uk]=Показати пов'язані слова
+-Comment[uz]=Боғлиқ бўлган сўзларни кўрсатиш
++Comment[uz]=Bogʻliq boʻlgan soʻzlarni koʻrsatish
++Comment[uz at cyrillic]=Боғлиқ бўлган сўзларни кўрсатиш
+ Comment[wa]=Mostrer les mots k' ont-st a vey avou
+ Comment[xh]=Bonisa Amagama Ahlobeneyo
+ Comment[zh_CN]=显示相关单词
+diff -urbB --minimal --exclude=.svn koffice-1.6.3/tools/thumbnail/clipartthumbnail.desktop koffice-1.6-branch/tools/thumbnail/clipartthumbnail.desktop
+--- koffice-1.6.3/tools/thumbnail/clipartthumbnail.desktop	2007-05-30 16:36:12.000000000 -0500
++++ koffice-1.6-branch/tools/thumbnail/clipartthumbnail.desktop	2008-11-03 11:55:13.000000000 -0600
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Service
+ Name=Clipart
+ Name[af]=Kitskuns
+@@ -36,7 +35,8 @@
+ Name[sr at Latn]=Isečci
+ Name[th]=คลิปอาร์ต
+ Name[uk]=Ілюстрації
+-Name[uz]=Клипарт
++Name[uz]=Klipart
++Name[uz at cyrillic]=Клипарт
+ Name[zh_CN]=剪贴画
+ Name[zh_TW]=剪貼板
+ ServiceTypes=ThumbCreator
+diff -urbB --minimal --exclude=.svn koffice-1.6.3/tools/thumbnail/kofficethumbnail.desktop koffice-1.6-branch/tools/thumbnail/kofficethumbnail.desktop
+--- koffice-1.6.3/tools/thumbnail/kofficethumbnail.desktop	2007-05-30 16:36:12.000000000 -0500
++++ koffice-1.6-branch/tools/thumbnail/kofficethumbnail.desktop	2008-11-03 11:55:13.000000000 -0600
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Service
+ Name=KOffice Files
+ Name[af]=Koffice Lêers
+@@ -13,7 +12,7 @@
+ Name[da]=KOffice-filer
+ Name[de]=KOffice-Dateien
+ Name[el]=Αρχεία KOffice
+-Name[eo]=KOficejo-dosieroj
++Name[eo]=KOffice-dosieroj
+ Name[es]=Archivos de KOffice
+ Name[et]=KOffice'i failid
+ Name[eu]=KOffice-en fitxategiak
+@@ -21,6 +20,7 @@
+ Name[fi]=KOffice-tiedostot
+ Name[fo]=KSkrivstovu-fílir
+ Name[fr]=Fichiers KOffice
++Name[fy]=KOffice-triemmen
+ Name[ga]=Comhaid KOffice
+ Name[gl]=Ficheiros de KOffice
+ Name[he]=קבצי KOffice
+@@ -58,7 +58,8 @@
+ Name[th]=แฟ้มของโปรแกรมชุดสำนักงาน K
+ Name[tr]=KOffice Dosyaları
+ Name[uk]=Файли KOffice
+-Name[uz]=KOffice файллари
++Name[uz]=KOffice fayllari
++Name[uz at cyrillic]=KOffice файллари
+ Name[wa]=Fitchîs KOffice
+ Name[xh]=Iifayile ze KOffice
+ Name[zh_CN]=KOffice 文件
+Only in koffice-1.6.3/tools/thumbnail: Makefile.in
+diff -urbB --minimal --exclude=.svn koffice-1.6.3/tools/thumbnail/otherofficethumbnail.desktop koffice-1.6-branch/tools/thumbnail/otherofficethumbnail.desktop
+--- koffice-1.6.3/tools/thumbnail/otherofficethumbnail.desktop	2007-05-30 16:36:12.000000000 -0500
++++ koffice-1.6-branch/tools/thumbnail/otherofficethumbnail.desktop	2009-03-06 14:55:19.000000000 -0600
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Service
+ Name=Other Office Files
+ Name[af]=Ander Kantoor Lêers
+@@ -21,6 +20,7 @@
+ Name[fi]=Muut toimistotiedostot
+ Name[fo]=Aðrar skrivstovufílir
+ Name[fr]=Autres documents bureautiques
++Name[fy]=Oare office triemmen
+ Name[gl]=Outros Ficheiros de KOffice
+ Name[he]=קבצי Office אחרים
+ Name[hi]=अन्य ऑफ़िस फ़ाइलें
+@@ -43,7 +43,7 @@
+ Name[pa]=ਹੋਰ ਦਫਤਰੀ ਫਾਇਲਾਂ
+ Name[pl]=Inne pliki biurowe
+ Name[pt]=Outros Ficheiros de Escritório
+-Name[pt_BR]=Outros Arquivos Office
++Name[pt_BR]=Outros arquivos Office
+ Name[ro]=Alte fişiere KOffice
+ Name[ru]=Другие файлы Office
+ Name[se]=Eará Office-fiillat
+@@ -57,7 +57,8 @@
+ Name[th]=แฟ้มโปรแกรมสำนักงานตัวอื่น
+ Name[tr]=Diğer Ofis Dosyaları
+ Name[uk]=Інші файли KOffice
+-Name[uz]=Идора учун бошқа файллар
++Name[uz]=Idora uchun boshqa fayllar
++Name[uz at cyrillic]=Идора учун бошқа файллар
+ Name[wa]=Ôtes fitchîs di buro
+ Name[xh]=Ezinye Iifayile ze Office
+ Name[zh_CN]=其它 Office 文件


Index: koffice-svn_checkout.sh
===================================================================
RCS file: koffice-svn_checkout.sh
diff -N koffice-svn_checkout.sh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ koffice-svn_checkout.sh	26 Sep 2009 18:19:02 -0000	1.3
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+DATE=$(date +%Y%m%d)
+EXPORT_DIR=koffice
+
+set -x
+rm -rf $EXPORT_DIR
+
+# app
+svn export svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/koffice/ $EXPORT_DIR/
+
+tar cjf $EXPORT_DIR-${DATE}svn.tar.bz2 $EXPORT_DIR
+
+# cleanup
+rm -rf $EXPORT_DIR
+

koffice-xpdf-CVE-2007-3387.diff:
 Stream.cc |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

Index: koffice-xpdf-CVE-2007-3387.diff
===================================================================
RCS file: koffice-xpdf-CVE-2007-3387.diff
diff -N koffice-xpdf-CVE-2007-3387.diff
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ koffice-xpdf-CVE-2007-3387.diff	26 Sep 2009 18:19:02 -0000	1.7
@@ -0,0 +1,20 @@
+--- filters/kword/pdf/xpdf/xpdf/Stream.cc
++++ filters/kword/pdf/xpdf/xpdf/Stream.cc
+@@ -413,13 +413,11 @@ StreamPredictor::StreamPredictor(Stream 
+   predLine = NULL;
+   ok = gFalse;
+ 
+-  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
+-     nComps >= INT_MAX / nBits ||
+-      width >= INT_MAX / nComps / nBits)
+-    return;
+-
+   nVals = width * nComps;
+-  if (nVals * nBits + 7 <= 0)
++  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
++     nComps >= 4 || nBits > 16 ||
++      width >= INT_MAX / nComps ||
++      nVals >= (INT_MAX - 7) / nBits)
+     return;
+ 
+   pixBytes = (nComps * nBits + 7) >> 3;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-12/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	24 Sep 2009 13:33:41 -0000	1.34
+++ .cvsignore	26 Sep 2009 18:19:01 -0000	1.35
@@ -1 +1,5 @@
-koffice-2.0.82.tar.bz2
+koffice-1.6.0.tar.bz2
+koffice-1.6.1.tar.bz2
+koshell.png
+koffice-1.6.2.tar.bz2
+koffice-1.6.3.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-12/koffice.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- koffice.spec	11 Sep 2009 15:57:23 -0000	1.120
+++ koffice.spec	26 Sep 2009 18:19:02 -0000	1.121
@@ -1,72 +1,101 @@
 
-#define kchart 1
-#define kexi 1
-#define kformula 1
-#define kivio 1
-#define kugar 1
-
-%if 0%{?fedora} > 10
-%define external_lilypond_fonts 1
+%if 0%{?fedora} > 6
+%define kdelibs3 kdelibs3
+%else
+%define kdelibs3 kdelibs
+BuildRequires: libutempter-devel
 %endif
 
+%define svn 20090306
+
 Name:           koffice
-Epoch:          2 
-Version:        2.0.82
-Release:        1%{?dist}
+Epoch:          3
+Version:        1.6.3
+Release:        26.%{svn}svn%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
-# apps GPLv2+, libs LGPLv2+
 License:        GPLv2+
 URL:            http://www.koffice.org/
-Source0:        http://download.kde.org/stable/koffice-%{version}/src/koffice-%{version}.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#-- The following OPTIONAL packages could NOT be located on your system.
-#-- Consider installing them to enable more features from this software.
-#+ OpenCTL, 0.9.2 or higher: OpenCTL is needed for some color spaces (High Dynamic Range Color Spaces, YCbCr and LMS) <http://www.openctl.org>
-#+ Spnav: Spnav is the library which is required by the space navigator device plugin <http://spacenav.sourceforge.net/>
-
-BuildRequires: boost-devel
-BuildRequires: bzip2-devel
-BuildRequires: cmake
-BuildRequires: desktop-file-utils
-BuildRequires: doxygen
-BuildRequires: eigen2-devel
-BuildRequires: exiv2-devel
-BuildRequires: fontconfig-devel
-BuildRequires: freeglut-devel
-BuildRequires: freetype-devel
-BuildRequires: gettext-devel
-BuildRequires: glew-devel
-BuildRequires: gmm-devel
-BuildRequires: GraphicsMagick-devel
-BuildRequires: gsl-devel
-BuildRequires: kdelibs4-devel
-BuildRequires: kdepimlibs-devel
-BuildRequires: lcms-devel
-BuildRequires: libGL-devel libGLU-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libkdcraw-devel >= 0.2.0
-BuildRequires: libpng-devel
-BuildRequires: libtiff-devel
+Source100:      koshell.png
+
+Patch50: koffice-1.6.3-glibc_strrchr.patch
+
+## hand-crafted patch, pretty close to:
+# LANG=en_US.UTF-8 svn diff \
+#  svn://anonsvn.kde.org/home/kde/tags/koffice/1.6.3/koffice \
+#  svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/koffice \
+#  > koffice-%{svn}svn.patch
+Patch100: koffice-%{svn}svn.patch
+# Revert backport from  https://bugs.kde.org/show_bug.cgi?id=168548
+Patch101: koffice-1.6.3-quint32.patch
+# fix for older ImageMagick
+Patch102: koffice-1.6.3-magick_version.patch
+
+# http://www.kde.org/info/security/advisory-20070730-1.txt
+Patch1: ftp://ftp.kde.org/pub/kde/security_patches/koffice-xpdf-CVE-2007-3387.diff
+
+# http://www.kde.org/info/security/advisory-20071107-1.txt
+Patch2: ftp://ftp.kde.org/pub/kde/security_patches/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
+
+# upstream patch pulled via: svn diff -c 738929 
+# svn diff -c 729276 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/
+# svn diff -c 738929 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/
+Patch3: koffice-1.6.3-gcc43.patch
+
+# drop need/use of local fonts, use dejavu instead of arev
+Patch4: koffice-1.6.3-dejavu_fonts.patch
+
+# BuildRequires: world-devel ;)
+BuildRequires:  %{kdelibs3}-devel
+# See http://bugzilla.redhat.com/244091
+%global kdelibs3_ver %((kde-config --version 2>/dev/null || echo KDE 3.5.10) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
+BuildRequires: automake libtool
+BuildRequires:  freetype-devel
+BuildRequires:  fontconfig-devel
+BuildRequires:  GraphicsMagick-devel
+BuildRequires:  libart_lgpl-devel
+BuildRequires:  libpng-devel
+BuildRequires:  libtiff-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  ImageMagick-devel
+BuildRequires:  bzip2-devel
+BuildRequires:  zlib-devel
+BuildRequires:  openssl-devel
+BuildRequires:  python-devel
+BuildRequires:  pcre-devel
+BuildRequires:  lcms-devel
+BuildRequires:  gettext-devel
+BuildRequires:  mysql-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  perl
+BuildRequires:  wv2-devel
+BuildRequires:  libpqxx-devel
+BuildRequires:  doxygen
+BuildRequires:  aspell-devel
+BuildRequires:  libxslt-devel
+BuildRequires:  OpenEXR-devel
+BuildRequires:  libexif-devel
+BuildRequires:  libGL-devel libGLU-devel
+BuildRequires:  readline-devel
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+%define ruby 1
+BuildRequires:  ruby ruby-devel >= 1.8.2
+%endif
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+BuildRequires:  libpaper-devel
+BuildRequires:  libXi-devel
+%endif
+# FIXME: work to get these into EPEL
+%if 0%{?fedora} > 6
 BuildRequires: libwpd-devel
-BuildRequires: libwpg-devel
-BuildRequires: libxslt-devel
-%if 0%{?kexi}
-BuildRequires: mysql-devel
-BuildRequires: libpqxx-devel
+%define libwpd 1
+BuildRequires: poppler-qt-devel
 %endif
-## when OpenCTL/OpenGTL is ready
-#BuildRequires: OpenGTL-devel
-BuildRequires: OpenEXR-devel
-BuildRequires: perl
-BuildRequires: poppler-qt4-devel
-BuildRequires: pstoedit
-BuildRequires: qca2-devel
-BuildRequires: qimageblitz-devel
-BuildRequires: readline-devel
-BuildRequires: wv2-devel >= 0.4.0
+
 
 %description
 KOffice is an integrated office suite.
@@ -76,176 +105,135 @@ Summary:        An integrated office sui
 Group:          Applications/Productivity
 Obsoletes:      koffice <= 4:%{version}-%{release}
 Obsoletes:      koffice-i18n < 4:%{version}
-Requires:       %{name}-core = %{epoch}:%{version}-%{release} 
-Requires:       %{name}-kword = %{epoch}:%{version}-%{release} 
-Requires:       %{name}-kspread = %{epoch}:%{version}-%{release} 
-Requires:       %{name}-kpresenter = %{epoch}:%{version}-%{release}
-%if 0%{?kivio}
-Requires:       %{name}-kivio = %{epoch}:%{version}-%{release}
-%endif
-Requires:       %{name}-karbon = %{epoch}:%{version}-%{release}
-Requires:       %{name}-krita = %{epoch}:%{version}-%{release}
-%if 0%{?kugar}
-Requires:       %{name}-kugar = %{epoch}:%{version}-%{release}
-%endif
-%if 0%{?kexi}
-Requires:       %{name}-kexi = %{epoch}:%{version}-%{release}
-Requires:       %{name}-kexi-driver-mysql = %{epoch}:%{version}-%{release}
-Requires:       %{name}-kexi-driver-pgsql = %{epoch}:%{version}-%{release}
-%endif
-%if 0%{?kchart}
-Requires:       %{name}-kchart = %{epoch}:%{version}-%{release}
-%endif
-%if 0%{?kformula}
-Requires:       %{name}-kformula = %{epoch}:%{version}-%{release}
-%endif
-Requires:       %{name}-filters = %{epoch}:%{version}-%{release}
-Requires:       %{name}-kplato = %{epoch}:%{version}-%{release}
+Requires:       koffice-core = %{epoch}:%{version}-%{release} 
+Requires:       koffice-kword = %{epoch}:%{version}-%{release} 
+Requires:       koffice-kspread = %{epoch}:%{version}-%{release} 
+Requires:       koffice-kpresenter = %{epoch}:%{version}-%{release}
+Requires:       koffice-kivio = %{epoch}:%{version}-%{release}
+Requires:       koffice-karbon = %{epoch}:%{version}-%{release}
+Requires:       koffice-krita = %{epoch}:%{version}-%{release}
+Requires:       koffice-kugar = %{epoch}:%{version}-%{release}
+Requires:       koffice-kexi = %{epoch}:%{version}-%{release}
+Requires:       koffice-kexi-driver-mysql = %{epoch}:%{version}-%{release}
+Requires:       koffice-kexi-driver-pgsql = %{epoch}:%{version}-%{release}
+Requires:       koffice-kchart = %{epoch}:%{version}-%{release}
+Requires:       koffice-kformula = %{epoch}:%{version}-%{release}
+Requires:       koffice-filters = %{epoch}:%{version}-%{release}
+Requires:       koffice-kplato = %{epoch}:%{version}-%{release}
 
 %description suite
 KOffice is an integrated office suite.
 
 %package core
-Summary:        Core support files for koffice
+Summary:        Core support files for %{name} 
 Group:          Applications/Productivity
-%if 0%{?external_lilypond_fonts}
-Requires:       lilypond-emmentaler-fonts
-%endif
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-%if ! 0%{?kchart}
-Obsoletes: koffice-kchart < %{epoch}:%{version}-%{release}
-%endif
-%if ! 0%{?kexi}
-Obsoletes: koffice-kexi < %{epoch}:%{version}-%{release}
-Obsoletes: koffice-kexi-driver-mysql < %{epoch}:%{version}-%{release}
-Obsoletes: koffice-kexi-driver-pgsql < %{epoch}:%{version}-%{release}
-%endif
-%if ! 0%{?kivio}
-Obsoletes: koffice-kivio < %{epoch}:%{version}-%{release}
-%endif
-%if ! 0%{?kformula}
-Obsoletes: koffice-kformula < %{epoch}:%{version}-%{release}
-%endif
-%if ! 0%{?kukar}
-Obsoletes: koffice-kugar < %{epoch}:%{version}-%{release}
-%endif
-
+Requires:       perl
+Conflicts:      koffice-i18n < 4:%{version}
 %description core
 %{summary}.
 
 %package libs
-Summary:        Runtime libraries for koffice
+Summary:        Runtime libraries for %{name} 
 Group:          System Environment/Libraries
+Conflicts:      koffice <= 4:%{version}-%{release}
+Requires:       %{kdelibs3} >= %{kdelibs3_ver}
+License:        LGPLv2+
 %description libs
 %{summary}.
-
 %package devel
-Summary:        Libraries needed for koffice development
+Summary:        Development files for %{name} 
 Group:          Development/Libraries
 Requires:       %{name}-libs = %{epoch}:%{version}-%{release}
-Requires:       kdelibs4-devel
-
+License:        LGPLv2+
 %description devel
-%{summary}
+%{summary}.
 
 %package kword
-Summary:A frame-based word processor capable of professional standard documents
+Summary:	A frame-based word processor capable of professional standard documents
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
-
 %description kword
-%{summary}
+%{summary}.
 
 %package kspread
 Summary:        A powerful spreadsheet application
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
-
 %description kspread
-%{summary}
+%{summary}.
 
 %package kpresenter
 Summary:        A full-featured presentation program
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
-
 %description kpresenter
-%{summary}
+%{summary}.
 
 %package kivio
 Summary:        A flowcharting application
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes:      kivio < %{version}-%{release}
-
 %description kivio
-%{summary}
+%{summary}.
 
 %package karbon
 Summary:        A vector drawing application
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
-
 %description karbon
-%{summary}
+%{summary}.
 
 %package krita
 Summary:        A pixel-based image manipulation program 
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
-Requires:	%{name}-filters
-
+Requires:       %{name}-filters
 %description krita
-%{summary}
+%{summary}.
 
 %package kugar
 Summary:        A tool for generating business quality reports
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
-
 %description kugar
-%{summary}
+%{summary}.
 
 %package kexi
 Summary:        An integrated environment for managing data
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
-
 %description kexi
-%{summary}
+%{summary}.
 For additional database drivers take a look at %{name}-kexi-driver-*
 
 %package kexi-driver-mysql
-Summary:        mysql-driver for kexi
+Summary:        Mysql-driver for kexi
 Group:          Applications/Productivity
 Requires:       %{name}-kexi = %{epoch}:%{version}-%{release}
-
 %description kexi-driver-mysql
-%{summary}
+%{summary}.
 
 %package kexi-driver-pgsql
-Summary:        pgsql-driver for kexi
+Summary:        Postgresql driver for kexi
 Group:          Applications/Productivity
 Requires:       %{name}-kexi = %{epoch}:%{version}-%{release}
-
 %description kexi-driver-pgsql
-%{summary}
+%{summary}.
 
-%if 0%{?kchart}
 %package kchart
 Summary:        An integrated graph and chart drawing tool
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
-
 %description kchart
-%{summary}
-%endif
+%{summary}.
 
 %package kformula
 Summary:        A powerful formula editor
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
-#if 0%{?fedora} > 9
+#if 0%{?fedora} > 9 
 Requires:       lyx-cmex10-fonts
 #else
 #Requires:       mathml-fonts
@@ -253,174 +241,182 @@ Requires:       lyx-cmex10-fonts
 %if 0%{?fedora} > 10
 Requires:       dejavu-lgc-sans-fonts
 %else
-Requires:       dejavu-lgc-fonts
+Requires:       dejavu-lgc-fonts 
 %endif
 %description kformula
-%{summary}
+%{summary}.
 
 %package filters
 Summary:        Import and Export Filters for KOffice
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
-# for karbon eps import filter
-Requires:       pstoedit
-
 %description filters
-%{summary}
+%{summary}.
 
 %package kplato
 Summary:         An integrated project management and planning tool
 Group:           Applications/Productivity
 Requires:        %{name}-core = %{epoch}:%{version}-%{release}
-
 %description kplato
-%{summary}
+%{summary}.
 
 
 %prep
 %setup -q
 
+%if 0%{?svn:1}
+%patch100 -p1 -b .svn
+%patch101 -p1 -b .quint32
+%patch102 -p1 -b .magick_version
+%else
+%patch1 -p0 -b .CVE-2007-3387
+%patch2 -p0 -b .CVE-2007-4352-5392-5393
+%patch3 -p1 -b .gcc43
+%endif
+
+%patch4 -p1 -b .dejavu
+# use LGC variant instead
+sed -i.dejavu-lgc \
+  -e 's|DejaVu Sans|DejaVu LGC Sans|' \
+  -e 's|dejavu sans|dejavu lgc sans|' \
+  lib/kformula/{contextstyle,fontstyle,symboltable}.cc 
+
+%patch50 -p1 -b glibc_strrchr
+
+# hack/fix for newer automake
+sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
+make -f admin/Makefile.common
+
 
 %build
+unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-# SET EIGEN2_INCLUDE_DIR since our kde4_incdir != eigen2_incdir
-%{cmake_kde4} \
-  -DEIGEN2_INCLUDE_DIR=%{_includedir}/eigen2 \
-  ..
-popd
+%configure \
+  --disable-rpath --disable-dependency-tracking \
+  --enable-new-ldflags \
+  --disable-debug --disable-warnings \
+  --with-pic --enable-shared --disable-static \
+  --with-extra-libs=%{_libdir} \
+  --with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \
+  --with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \
+  --disable-final
 
-make %{?_smp_mflags} -C %{_target_platform} 
+make %{?_smp_mflags}
 
 
 %install
 rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-
-## unpackaged files
-# fonts
-%if 0%{?external_lilypond_fonts}
-rm -fv %{buildroot}%{_kde4_appsdir}/musicshape/fonts/Emmentaler-14.ttf
-%endif
-rm -rfv %{buildroot}%{_kde4_appsdir}/apps/kformula/fonts/
-# conflicts with oxygen-icon-theme  
-rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/format-justify-{center,fill,left,right}.png
-rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/format-text-{bold,italic,underline}.png
-rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/object-{group,ungroup}.png
-rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/object-order-{back,front,lower,raise}.png
-# extraneous stuff we don't want in -devel
-rm -fv %{buildroot}%{_kde4_libdir}/lib*common.so
-rm -fv %{buildroot}%{_kde4_libdir}/lib*filters.so
-rm -fv %{buildroot}%{_kde4_libdir}/lib*private.so
-rm -fv %{buildroot}%{_kde4_libdir}/libkarbon*.so
-rm -fv %{buildroot}%{_kde4_libdir}/libkexi*.so
-rm -fv %{buildroot}%{_kde4_libdir}/libkisexiv2.so
-rm -fv %{buildroot}%{_kde4_libdir}/libkformdesigner.so
-rm -fv %{buildroot}%{_kde4_libdir}/libkplato*.so
-rm -fv %{buildroot}%{_kde4_libdir}/libkword*.so
-rm -fv %{buildroot}%{_kde4_libdir}/libkrita*.so
-rm -fv %{buildroot}%{_kde4_libdir}/libkross*.so
-%if ! 0%{?kchart}
-rm -fv %{buildroot}%{_kde4_libdir}/libkchartcommon.so.*
-rm -fv %{buildroot}%{_kde4_libdir}/kde4/*kchart*.*
-rm -rfv %{buildroot}%{_kde4_appsdir}/kchart/
-rm -rfv %{buildroot}%{_kde4_docdir}/HTML/en/kchart/
-rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/kchart*.desktop
-rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kchart_konqi.desktop
-%endif
-%if ! 0%{?kexi}
-rm -rfv %{buildroot}%{_kde4_docdir}/HTML/en/kexi/
-rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kexi_konqi.desktop
-%endif
-%if ! 0%{?kformula}
-rm -rfv %{buildroot}%{_kde4_docdir}/HTML/en/kformula/
-rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kformula_konqi.desktop
-%endif
-%if ! 0%{?kivio}
-rm -rfv %{buildroot}%{_kde4_docdir}/HTML/en/kivio/
-rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kivio_konqi.desktop
-%endif
+[ ! -f %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/koshell.png ] && \
+install -p -D -m644 %{SOURCE100} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/koshell.png
 
-rm -f devel.list
-for lib in %{buildroot}%{_kde4_libdir}/lib*.so ; do
-if [ -L ${lib} ]; then
-  echo $lib | sed -e "s|^%{buildroot}||" >> devel.list
-fi
+# Replace absolute symlinks with relative ones
+pushd %{buildroot}%{_docdir}/HTML
+for lang in *; do
+  if [ -d $lang ]; then
+    pushd $lang
+    for i in */*; do
+      [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common
+    done
+    popd
+  fi
 done
+popd
 
-
-%check
-## FIXME: fix validation errors
-for desktop_file in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
-desktop-file-validate ${desktop_file} ||:
+desktop-file-install \
+  --dir=%{buildroot}%{_datadir}/applications/kde \
+  --vendor="" \
+  --delete-original \
+  %{buildroot}%{_datadir}/applnk/Office/*.desktop
+
+## Hack-in NoDisplay=True (http://bugzilla.redhat.com/245061)
+## until http://bugzilla.redhat.com/245190 is fixed
+for desktop_file in %{buildroot}%{_datadir}/applnk/.hidden/*.desktop ; do
+  grep "^NoDisplay=" ${desktop_file} || \
+    echo "NoDisplay=True" >> ${desktop_file}
 done
 
+## unpackaged files
+# fonts
+rm -rfv %{buildroot}%{_datadir}/apps/kformula/fonts/
+# libtool archives
+rm -f %{buildroot}%{_libdir}/lib*.la
+# shouldn't these be in koffice-l10n? 
+rm -f %{buildroot}%{_datadir}/locale/pl/LC_MESSAGES/kexi_{add,delete}_column_gui_transl_pl.sh
+# -devel symlinks to nuke
+rm -f %{buildroot}%{_libdir}/lib*common.so
+rm -f %{buildroot}%{_libdir}/lib*filters.so
+rm -f %{buildroot}%{_libdir}/lib*private.so
+rm -f %{buildroot}%{_libdir}/libkarbon*.so
+rm -f %{buildroot}%{_libdir}/libkchart*.so
+rm -f %{buildroot}%{_libdir}/libkexi*.so
+rm -f %{buildroot}%{_libdir}/libkisexiv2.so
+rm -f %{buildroot}%{_libdir}/libkformdesigner.so
+rm -f %{buildroot}%{_libdir}/libkplato*.so
+rm -f %{buildroot}%{_libdir}/libkpresenter*.so
+rm -f %{buildroot}%{_libdir}/libkword*.so
+rm -f %{buildroot}%{_libdir}/libkrita*.so
+rm -f %{buildroot}%{_libdir}/libkross*.so
+rm -f %{buildroot}%{_libdir}/libkugar*.so
+
 
 %clean
-rm -rf %{buildroot} 
-
+rm -rf %{buildroot}
 
 %post core
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
-
-%posttrans core
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
-update-desktop-database -q &> /dev/null ||:
+touch --no-create %{_datadir}/icons/crystalsvg &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+touch --no-create %{_datadir}/icons/locolor &> /dev/null || :
 
 %postun core
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
-update-desktop-database -q &> /dev/null ||:
+if [ $1 -eq 0 ]; then
+  gtk-update-icon-cache %{_datadir}/icons/crystalsvg &> /dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || :
+  update-desktop-database -q &> /dev/null ||:
 fi
 
-%post kword
-/sbin/ldconfig
+%posttrans core
+gtk-update-icon-cache %{_datadir}/icons/crystalsvg &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || :
 update-desktop-database -q &> /dev/null ||:
 
-%postun kword
-/sbin/ldconfig
-update-desktop-database -q &> /dev/null ||:
+%post kword -p /sbin/ldconfig
 
-%post kpresenter
-/sbin/ldconfig
-update-desktop-database -q &> /dev/null ||:
+%postun kword -p /sbin/ldconfig
 
-%postun kpresenter
-/sbin/ldconfig
+%posttrans kword
 update-desktop-database -q &> /dev/null ||:
 
-%post kugar
-/sbin/ldconfig
-update-desktop-database -q &> /dev/null ||:
+%post kpresenter -p /sbin/ldconfig
 
-%postun kugar
-/sbin/ldconfig
-update-desktop-database -q &> /dev/null ||:
+%postun kpresenter -p /sbin/ldconfig
 
-%post kexi
-/sbin/ldconfig
+%posttrans kpresenter
 update-desktop-database -q &> /dev/null ||:
 
-%postun kexi
-/sbin/ldconfig
+%post kugar -p /sbin/ldconfig
+
+%postun kugar -p /sbin/ldconfig
+
+%posttrans kugar
 update-desktop-database -q &> /dev/null ||:
 
-%if 0%{?kchart}
-%post kchart
-/sbin/ldconfig
+%post kexi -p /sbin/ldconfig
+
+%postun kexi -p /sbin/ldconfig
+
+%posttrans kexi
 update-desktop-database -q &> /dev/null ||:
 
-%postun kchart
-/sbin/ldconfig
+%post kchart -p /sbin/ldconfig
+
+%postun kchart -p /sbin/ldconfig
+
+%posttrans kchart
 update-desktop-database -q &> /dev/null ||:
-%endif
 
 %post filters -p /sbin/ldconfig
 %postun filters -p /sbin/ldconfig 
@@ -433,473 +429,378 @@ update-desktop-database -q &> /dev/null 
 
 %files core
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYING.LIB README
-%{_kde4_bindir}/kthesaurus
-%{_kde4_bindir}/koconverter
-%{_kde4_libdir}/libkdeinit4_kthesaurus.so
-%{_kde4_libdir}/kde4/autocorrect.so
-%{_kde4_libdir}/kde4/changecase.so
-%{_kde4_libdir}/kde4/clipartthumbnail.*
-%{_kde4_libdir}/kde4/defaulttools.so
-%{_kde4_libdir}/kde4/kodocinfopropspage.*
-%{_kde4_libdir}/kde4/kofficescan.*
-%{_kde4_libdir}/kde4/kofficethumbnail.*
-%{_kde4_libdir}/kde4/kopabackgroundtool.*
-%{_kde4_libdir}/kde4/koffice_graya_u16_plugin.so
-%{_kde4_libdir}/kde4/kofficegrayau8plugin.so
-%{_kde4_libdir}/kde4/kofficedockers.so
-%{_kde4_libdir}/kde4/kofficesimpletextedit.so
-%{_kde4_libdir}/kde4/libkounavailpart.*
-%{_kde4_libdir}/kde4/paragraphtool.so
-%{_kde4_libdir}/kde4/spellcheck.so
-%{_kde4_libdir}/kde4/textvariables.so
-%{_kde4_libdir}/kde4/thesaurustool.so
-%{_kde4_appsdir}/koffice/
-%{_kde4_docdir}/HTML/en/koffice/
-%{_kde4_docdir}/HTML/en/thesaurus/
-%{_kde4_datadir}/applications/kde4/KThesaurus.desktop
-%{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_datadir}/kde4/services/autocorrect.desktop
-%{_kde4_datadir}/kde4/services/changecase.desktop
-%{_kde4_datadir}/kde4/services/clipartthumbnail.desktop
-%{_kde4_datadir}/kde4/services/defaulttools.desktop
-%{_kde4_datadir}/kde4/services/kodocinfopropspage.desktop
-%{_kde4_datadir}/kde4/services/kofficethumbnail.desktop
-%{_kde4_datadir}/kde4/services/koffice_graya_u16_plugin.desktop
-%{_kde4_datadir}/kde4/services/kofficegrayaplugin.desktop
-%{_kde4_datadir}/kde4/services/kofficedockers.desktop
-%{_kde4_datadir}/kde4/services/kopabackgroundtool.desktop
-%{_kde4_datadir}/kde4/services/kounavail.desktop
-%{_kde4_datadir}/kde4/services/kofficesimpletextedit.desktop
-%{_kde4_datadir}/kde4/services/paragraphtool.desktop
-%{_kde4_datadir}/kde4/services/spellcheck.desktop
-%{_kde4_datadir}/kde4/services/textvariables.desktop
-%{_kde4_datadir}/kde4/services/thesaurustool.desktop
-%{_kde4_datadir}/kde4/servicetypes/filtereffect.desktop
-%{_kde4_datadir}/kde4/servicetypes/kochart.desktop
-%{_kde4_datadir}/kde4/servicetypes/kofficedocker.desktop
-%{_kde4_datadir}/kde4/servicetypes/kofficepart.desktop
-%{_kde4_datadir}/kde4/servicetypes/koplugin.desktop
-%{_kde4_datadir}/kde4/servicetypes/inlinetextobject.desktop
-%{_kde4_datadir}/kde4/servicetypes/texteditingplugin.desktop
-%{_kde4_datadir}/kde4/servicetypes/textvariableplugin.desktop
-%{_kde4_datadir}/applications/kde4/*koffice.desktop
-%{_kde4_datadir}/kde4/services/*shape.desktop
-%if 0%{?kformula}
-%{_kde4_appsdir}/formulashape/
-%endif
-%{_kde4_appsdir}/musicshape/
-%dir %{_datadir}/color/
-%dir %{_datadir}/color/icc/
-%{_datadir}/color/icc/pigment/
-%{_kde4_datadir}/kde4/servicetypes/pigment*.desktop
-%{_kde4_libdir}/kde4/pathshapes.so
-%{_kde4_datadir}/kde4/services/pathshapes.desktop
+%doc AUTHORS COPYING README
+%{_bindir}/koshell
+%{_bindir}/kthesaurus
+%{_bindir}/koconverter
+%{_libdir}/libkdeinit_koshell.so
+%{_libdir}/libkdeinit_kthesaurus.so
+%{_libdir}/kde3/kfile_koffice.*
+%{_libdir}/kde3/kfile_ooo.*
+%{_libdir}/kde3/kfile_abiword.*
+%{_libdir}/kde3/kfile_gnumeric.*
+%{_libdir}/kde3/kodocinfopropspage.*
+%{_libdir}/kde3/kofficescan.*
+%{_libdir}/kde3/kofficethumbnail.*
+%{_libdir}/kde3/koshell.*
+%{_libdir}/kde3/kthesaurus.*
+%{_libdir}/kde3/kwmailmerge_classic.*
+%{_libdir}/kde3/kwmailmerge_kabc.*
+%{_libdir}/kde3/kwmailmerge_qtsqldb_power.*
+%{_libdir}/kde3/kwmailmerge_qtsqldb.*
+%{_libdir}/kde3/libkounavailpart.*
+%{_libdir}/kde3/libkprkword.*
+%{_libdir}/kde3/libthesaurustool.*
+%{_libdir}/kde3/clipartthumbnail.*
+%{_datadir}/apps/koffice/
+%{_datadir}/apps/konqueror/servicemenus/*
+%{_datadir}/apps/koshell/
+%{_datadir}/apps/thesaurus/
+%{_datadir}/config.kcfg/koshell.kcfg
+%{_datadir}/doc/HTML/en/koffice/
+%{_datadir}/doc/HTML/en/koshell/
+%{_datadir}/doc/HTML/en/thesaurus/
+%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
+%{_datadir}/services/clipartthumbnail.desktop
+%{_datadir}/services/kfile*.desktop
+%{_datadir}/services/kwmailmerge*.desktop
+%{_datadir}/services/kodocinfopropspage.desktop
+%{_datadir}/services/kofficethumbnail.desktop
+%{_datadir}/services/kounavail.desktop
+%{_datadir}/services/kprkword.desktop
+%{_datadir}/services/thesaurustool.desktop
+%{_datadir}/servicetypes/kochart.desktop
+%{_datadir}/servicetypes/kofficepart.desktop
+%{_datadir}/servicetypes/koplugin.desktop
+%{_datadir}/servicetypes/kwmailmerge.desktop
+%{_datadir}/servicetypes/widgetfactory.desktop
+%{_datadir}/applications/kde/*koffice.desktop
+%{_datadir}/applications/kde/*KThesaurus.desktop
+%{_datadir}/applications/kde/*koshell.desktop
+%{_datadir}/apps/kofficewidgets/
+%{_datadir}/apps/kross/
+%{_libdir}/kde3/krosspython.*
+%{?ruby:%{_libdir}/kde3/krossruby.*}
 
 %files libs
 %defattr(-,root,root,-)
-%{_kde4_datadir}/kde4/servicetypes/flake*.desktop
-%{_kde4_libdir}/libflake.so.*
-%{_kde4_libdir}/kde4/*shape.so
-%if 0%{?kformula}
-%exclude %{_kde4_libdir}/kde4/formulashape.*
-%endif
-%exclude %{_kde4_libdir}/kde4/kritashape.*
-%{_kde4_libdir}/libchartshapelib.so.*
-%{_kde4_libdir}/libkdchart.so.*
-%{_kde4_libdir}/libkoaction.so.*
-#{_kde4_libdir}/libkoaspectbutton.so.*
-%{_kde4_libdir}/libkobase.so.*
-#{_kde4_libdir}/libkocharacterselectiondialog.so.*
-%{_kde4_libdir}/libkochart.so.*
-%{_kde4_libdir}/libkocolorwidgets.so.*
-#{_kde4_libdir}/libkocvsimport.so.*
-#{_kde4_libdir}/libkodocumentsectionbox.so.*
-%{_kde4_libdir}/libkoffice_graya_u16.so.*
-%{_kde4_libdir}/libkofficegrayau8colorspace.so.*
-#{_kde4_libdir}/libkoinput.so.*
-%{_kde4_libdir}/libkokross.so.*
-#{_kde4_libdir}/libkolinestyleselector.so.*
-%{_kde4_libdir}/libkomain.so.*
-%{_kde4_libdir}/libkoodf.so.*
-#{_kde4_libdir}/libkoopenpane.so.*
-%{_kde4_libdir}/libkopageapp.so.*
-#{_kde4_libdir}/libkopagelayout.so.*
-#{_kde4_libdir}/libkopicture.so.*
-%{_kde4_libdir}/libkoplugin.so.*
-#{_kde4_libdir}/libkoprogress.so.*
-%{_kde4_libdir}/libkoresources.so.*
-#{_kde4_libdir}/libkoresourcewidget.so.*
-%{_kde4_libdir}/libkostore.so.*
-%{_kde4_libdir}/libkotext.so.*
-%{_kde4_libdir}/libkowidgets.so.*
-%{_kde4_libdir}/libkowmf.so.*
-#{_kde4_libdir}/libkozoomaction.so.*
-%{_kde4_libdir}/libkspreadcommon.so.*
-%{_kde4_libdir}/libkwmf.so.*
-%if 0%{?kformula}
-%{_kde4_libdir}/libkformulalib.so.*
-%endif
-%{_kde4_libdir}/libpigmentcms.so.*
+%doc COPYING.LIB
+#_libdir/libk*common.so.*
+%{_libdir}/libkarboncommon.so.*
+%{_libdir}/libkspreadcommon.so.*
+%{_libdir}/libkdchart.so.*
+%{_libdir}/libkochart.so.*
+%{_libdir}/libkofficecore.so.*
+%{_libdir}/libkofficeui.so.*
+%{_libdir}/libkotext.so.*
+%{_libdir}/libkowmf.so.*
+%{_libdir}/libkopainter.so.*
+%{_libdir}/libkstore.so.*
+%{_libdir}/libkwmailmerge_interface.so.*
+%{_libdir}/libkwmf.so.*
+%{_libdir}/libkformulalib.so.*
+%{_libdir}/libkopalette.so.*
+%{_libdir}/libkoproperty.so.*
+%{_libdir}/libkrossapi.so.*
+%{_libdir}/libkrossmain.so.*
 
-%files -f devel.list devel
+%files devel
 %defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/koffice-apidocs/
 %{_includedir}/*
-%{_kde4_appsdir}/cmake/modules/FindKOfficeLibs.cmake
+# FIXME: include only shlib symlinks we know/want to export
+%{_libdir}/lib*.so
+%exclude %{_libdir}/libkdeinit_*.so
+%exclude %{_libdir}/libkudesignercore.so
+
+%files kword
+%defattr(-,root,root,-)
+%lang(en) %{_docdir}/HTML/en/kword/
+%{_bindir}/kword
+%{_libdir}/libkdeinit_kword.so
+%{_libdir}/libkwordprivate.so.*
+%{_libdir}/kde3/libkwordpart.*
+%{_libdir}/kde3/kword.*
+%{_datadir}/apps/kword/
+%{_datadir}/services/kword*.desktop
+%{_datadir}/services/kwserial*.desktop
+%{_datadir}/templates/TextDocument.desktop
+%{_datadir}/templates/.source/TextDocument.kwt
+%{_datadir}/applications/kde/*kword.desktop
 
 %files kspread
 %defattr(-,root,root,-)
-%{_kde4_bindir}/kspread
-%{_kde4_libdir}/libkdeinit4_kspread.so
-%{_kde4_libdir}/kde4/krossmodulekspread.so
-%{_kde4_libdir}/kde4/kspread*.so
-%{_kde4_libdir}/kde4/libkspreadpart.*
-%{_kde4_libdir}/kde4/libcsvexport.*
-%{_kde4_libdir}/kde4/libcsvimport.*
-%{_kde4_libdir}/kde4/libgnumericexport.*
-%{_kde4_libdir}/kde4/libgnumericimport.*
-%{_kde4_libdir}/kde4/libkspreadhtmlexport.*
-%{_kde4_libdir}/kde4/libkspreadsolver.so
-%{_kde4_libdir}/kde4/libopencalcexport.*
-%{_kde4_libdir}/kde4/libopencalcimport.*
-%{_kde4_libdir}/kde4/libqproimport.*
-%{_kde4_appsdir}/kspread/
-%{_kde4_docdir}/HTML/en/kspread/
-%{_kde4_datadir}/config.kcfg/kspread.kcfg
-%{_kde4_datadir}/kde4/services/kspread*.desktop
-%{_kde4_datadir}/templates/SpreadSheet.desktop
-%{_kde4_datadir}/templates/.source/SpreadSheet.kst
-%{_kde4_datadir}/applications/kde4/*kspread.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/kspread_konqi.desktop
-%{_kde4_datadir}/kde4/services/krossmodulekspread.desktop
-%{_kde4_datadir}/kde4/servicetypes/kspread_plugin.desktop
+%lang(en) %{_docdir}/HTML/en/kspread/
+%{_bindir}/kspread
+%{_libdir}/libkdeinit_kspread.so
+%{_libdir}/kde3/kspread.*
+%{_libdir}/kde3/libkspreadpart.*
+%{_libdir}/kde3/kwmailmerge_kspread.*
+%{_libdir}/kde3/libcsvexport.*
+%{_libdir}/kde3/libcsvimport.*
+%{_libdir}/kde3/libgnumericexport.*
+%{_libdir}/kde3/libgnumericimport.*
+%{_libdir}/kde3/libkspreadhtmlexport.*
+%{_libdir}/kde3/libkspreadinsertcalendar.*
+%{_libdir}/kde3/libopencalcexport.*
+%{_libdir}/kde3/libopencalcimport.*
+%{_libdir}/kde3/libqproimport.*
+%{_libdir}/kde3/kspreadscripting.*
+%{_libdir}/kde3/krosskspreadcore.*
+%{_datadir}/apps/kspread/
+%{_datadir}/services/kspread*.desktop
+%{_datadir}/templates/SpreadSheet.desktop
+%{_datadir}/templates/.source/SpreadSheet.kst
+%{_datadir}/applications/kde/*kspread.desktop
 
 %files kpresenter
 %defattr(-,root,root,-)
-%{_kde4_bindir}/kpresenter
-%{_kde4_libdir}/libkdeinit4_kpresenter.so
-%{_kde4_libdir}/libkpresenterprivate.so.*
-%{_kde4_libdir}/kde4/*kpresenter*.*
-%{_kde4_libdir}/kde4/kpr_*.*
-%{_kde4_libdir}/kde4/libFilterkpr2odf.so
-%{_kde4_appsdir}/kpresenter/
-%{_kde4_configdir}/kpresenterrc
-%{_kde4_docdir}/HTML/en/kpresenter/
-%{_kde4_datadir}/kde4/services/kpr*.desktop
-%{_kde4_datadir}/kde4/servicetypes/kpr*.desktop
-%{_kde4_datadir}/kde4/servicetypes/presentationeventaction.desktop
-%{_kde4_datadir}/kde4/servicetypes/scripteventaction.desktop
-%{_kde4_datadir}/templates/Presentation.desktop
-%{_kde4_datadir}/templates/.source/Presentation.kpt
-%{_kde4_datadir}/applications/kde4/*kpresenter.desktop
-%{_kde4_datadir}/kde4/services/Filterkpr2odf.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/kpresenter_konqi.desktop
+%lang(en) %{_docdir}/HTML/en/kpresenter/
+%{_bindir}/kpresenter
+%{_bindir}/kprconverter.pl
+%{_libdir}/libkdeinit_kpresenter.so
+%{_libdir}/libkpresenterimageexport.so.*
+%{_libdir}/libkpresenterprivate.so.*
+%{_libdir}/kde3/*kpresenter*.*
+%{_datadir}/apps/kpresenter/
+%{_datadir}/services/kpresenter*.desktop
+%{_datadir}/templates/Presentation.desktop
+%{_datadir}/templates/.source/Presentation.kpt
+%{_datadir}/applications/kde/*kpresenter.desktop
 
 %files karbon
 %defattr(-,root,root,-)
-%{_kde4_bindir}/karbon
-%{_kde4_configdir}/karbonrc
-%{_kde4_libdir}/libkdeinit4_karbon.so
-%{_kde4_libdir}/libkarboncommon.so.*
-%{_kde4_libdir}/libkarbonui.so.*
-%{_kde4_libdir}/kde4/*karbon*.*
-%{_kde4_libdir}/kde4/libwmfexport.*
-%{_kde4_libdir}/kde4/libwmfimport.*
-%{_kde4_appsdir}/karbon/
-%{_kde4_datadir}/kde4/services/karbon*
-%{_kde4_datadir}/kde4/servicetypes/karbon_module.desktop
-%{_kde4_datadir}/templates/Illustration.desktop
-%{_kde4_datadir}/templates/.source/Illustration.karbon
-%{_kde4_datadir}/applications/kde4/*karbon.desktop
-%{_kde4_docdir}/HTML/en/karbon/
-%{_kde4_datadir}/kde4/services/ServiceMenus/karbon_konqi.desktop
+%lang(en) %{_docdir}/HTML/en/karbon/
+%{_bindir}/karbon
+%{_libdir}/libkdeinit_karbon.so
+%{_libdir}/kde3/*karbon*.*
+%{_libdir}/kde3/libwmfexport.*
+%{_libdir}/kde3/libwmfimport.*
+%{_datadir}/apps/karbon/
+%{_datadir}/services/karbon*
+%{_datadir}/servicetypes/karbon_module.desktop
+%{_datadir}/templates/Illustration.desktop
+%{_datadir}/templates/.source/Illustration.karbon
+%{_datadir}/applications/kde/*karbon.desktop
 
 %files krita
 %defattr(-,root,root,-)
-%{_kde4_bindir}/krita
-%{_kde4_configdir}/kritarc
-%{_kde4_libdir}/libkdeinit4_krita.so
-%{_kde4_libdir}/libkrita*.so.*
-%{_kde4_libdir}/kde4/*krita*.*
-%{_kde4_libdir}/libkrossmodulekrita.so.*
-%{_kde4_appsdir}/krita/
-%{_kde4_datadir}/kde4/services/krita*.desktop
-%{_kde4_datadir}/kde4/servicetypes/krita*.desktop
-%{_kde4_datadir}/applications/kde4/*krita*.desktop
-# FIXME: add scriptlet
-%{_datadir}/mime/packages/krita_ora.xml
-%{_kde4_appsdir}/kritaplugins/
-%{_kde4_docdir}/HTML/en/krita/
-%{_datadir}/color/icc/krita/
-%{_kde4_datadir}/kde4/services/ServiceMenus/krita_konqi.desktop
+%lang(en) %{_docdir}/HTML/en/krita/
+%{_bindir}/krita
+%{_libdir}/libkdeinit_krita.so
+%{_libdir}/libkrita*.so.*
+%{_libdir}/kde3/*krita*.*
+%{_datadir}/apps/krita/
+%{_datadir}/services/krita*.desktop
+%{_datadir}/servicetypes/krita*.desktop
+%{_datadir}/applications/kde/*krita*.desktop
+%{_datadir}/applnk/.hidden/*krita*.desktop
+%{_datadir}/apps/kritaplugins/
 
-%if 0%{?kexi}
 %files kugar
 %defattr(-,root,root,-)
-%{_kde4_docdir}/HTML/en/kugar/
-%endif
+%lang(en) %{_docdir}/HTML/en/kugar/
+%{_bindir}/kugar
+%{_bindir}/kudesigner
+%{_libdir}/libkdeinit_kugar.so
+%{_libdir}/libkdeinit_kudesigner.so
+%{_libdir}/libkugarlib.so.*
+%{_libdir}/libkudesignercore.so
+%{_libdir}/kde3/kudesigner.*
+%{_libdir}/kde3/kugar.*
+%{_libdir}/kde3/libkudesignerpart.*
+%{_libdir}/kde3/libkugarpart.*
+%{_datadir}/apps/kudesigner/
+%{_datadir}/apps/kugar/
+%{_datadir}/services/kugar*.desktop
+%{_datadir}/applications/kde/*kugar.desktop
+%{_datadir}/applications/kde/*kudesigner.desktop
 
-%if 0%{?kexi}
 %files kexi
 %defattr(-,root,root,-)
-%{_kde4_bindir}/kexi*
-%{_kde4_bindir}/ksqlite*
-%{_kde4_libdir}/libkexi*.so.*
-%{_kde4_libdir}/libkformdesigner.so.*
-%{_kde4_libdir}/kde4/kformdesigner_*.*
-%{_kde4_libdir}/kde4/kexidb_sqlite3driver.*
-%{_kde4_libdir}/kde4/kexihandler_*.*
-%{_kde4_libdir}/kde4/krossmodulekexidb.so
-%{_kde4_libdir}/kde4/pgzkexireportpart2.so
-%{_kde4_datadir}/config/kexirc
-%{_kde4_datadir}/kde4/servicetypes/kexi*.desktop
-%{_kde4_datadir}/kde4/services/kexi
-%{_kde4_appsdir}/kexi/
-%{_kde4_datadir}/kde4/services/kformdesigner/*
-%{_kde4_docdir}/HTML/en/kexi/
-%{_kde4_datadir}/applications/kde4/*kexi.desktop
-%{_kde4_datadir}/kde4/services/kexidb_sqlite*driver.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/kexi_konqi.desktop
+%lang(en) %{_docdir}/HTML/en/kexi/
+%{_bindir}/kexi*
+%{_bindir}/ksqlite*
+%{_bindir}/krossrunner
+%{_libdir}/libkdeinit_kexi.so
+%{_libdir}/libkexi*.so.*
+%{_libdir}/libkformdesigner.so.*
+%{_libdir}/kde3/kformdesigner_*.*
+%{_libdir}/kde3/kexidb_sqlite2driver.*
+%{_libdir}/kde3/kexidb_sqlite3driver.*
+%{_libdir}/kde3/kexihandler_*.*
+%{_libdir}/kde3/kexi.*
+%{_libdir}/kde3/krosskexiapp.*
+%{_libdir}/kde3/krosskexidb.*
+# moved here to workaround bug #394101, alternative is to move libkexi(db|dbparser|utils) to -libs)
+%{_libdir}/kde3/libkspreadkexiimport.*
+%{_datadir}/config/kexirc
+%{_datadir}/config/magic/kexi.magic
+%{_datadir}/mimelnk/application/*
+%{_datadir}/servicetypes/kexi*.desktop
+%{_datadir}/services/kexi/
+%{_datadir}/apps/kexi/
+%{_datadir}/services/kformdesigner/*
+%{_datadir}/applications/kde/*kexi.desktop
+%{_datadir}/services/kexidb_sqlite*driver.desktop
 
 %files kexi-driver-mysql
 %defattr(-,root,root,-)
-%{_kde4_libdir}/kde4/kexidb_mysqldriver.*
-%{_kde4_libdir}/kde4/keximigrate_mysql.*
-%{_kde4_datadir}/kde4/services/keximigrate_mysql.desktop
-%{_kde4_datadir}/kde4/services/kexidb_mysqldriver.desktop
+%{_libdir}/kde3/kexidb_mysqldriver.*
+%{_libdir}/kde3/keximigrate_mysql.*
+%{_datadir}/services/keximigrate_mysql.desktop
+%{_datadir}/services/kexidb_mysqldriver.desktop
 
 %files kexi-driver-pgsql
 %defattr(-,root,root,-)
-%{_kde4_libdir}/kde4/kexidb_pqxxsqldriver.*
-%{_kde4_libdir}/kde4/keximigrate_pqxx.*
-%{_kde4_datadir}/kde4/services/kexidb_pqxxsqldriver.desktop
-%{_kde4_datadir}/kde4/services/keximigrate_pqxx.desktop
-%endif
+%{_libdir}/kde3/kexidb_pqxxsqldriver.*
+%{_libdir}/kde3/keximigrate_pqxx.*
+%{_datadir}/services/kexidb_pqxxsqldriver.desktop
+%{_datadir}/services/keximigrate_pqxx.desktop
 
-%if 0%{?kchart}
 %files kchart
 %defattr(-,root,root,-)
-## Some parts of kchart went awol 1.9.98.1 -> 1.9.98.2, bug?
-#{_kde4_bindir}/kchart
-%{_kde4_libdir}/libkchartcommon.so.*
-#{_kde4_libdir}/libkdeinit4_kchart.so
-%{_kde4_libdir}/kde4/*kchart*.*
-%{_kde4_appsdir}/kchart/
-%{_kde4_datadir}/config.kcfg/kchart.kcfg
-%{_kde4_datadir}/kde4/services/kchart*.desktop
-%{_kde4_docdir}/HTML/en/kchart/
-#{_kde4_datadir}/applications/kde4/*kchart.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/kchart_konqi.desktop
-%endif
+%lang(en) %{_docdir}/HTML/en/kchart/
+%{_bindir}/kchart
+%{_libdir}/libkchart*.so.*
+%{_libdir}/libkdeinit_kchart.so
+%{_libdir}/kde3/*kchart*.*
+%{_datadir}/apps/kchart/
+%{_datadir}/services/kchart*.desktop
+%{_datadir}/applications/kde/*kchart.desktop
 
-%if 0%{?kformula}
 %files kformula
 %defattr(-,root,root,-)
-%{_kde4_bindir}/kformula
-%{_kde4_libdir}/libkdeinit_kformula.so
-%{_kde4_libdir}/libkformulaprivate.so.*
-%{_kde4_libdir}/kde4/*kformula*.*
-%{_kde4_libdir}/kde4/formulashape.*
-%{_kde4_appsdir}/kformula/
-%{_kde4_datadir}/kde4/services/kformula*.desktop
-%{_kde4_datadir}/applications/kde4/*kformula.desktop
-%{_kde4_docdir}/HTML/en/kformula/
-%{_kde4_datadir}/kde4/services/ServiceMenus/kformula_konqi.desktop
-%endif
+%lang(en) %{_docdir}/HTML/en/kformula/
+%{_bindir}/kformula
+%{_libdir}/libkdeinit_kformula.so
+%{_libdir}/kde3/*kformula*.*
+%{_datadir}/apps/kformula/
+%{_datadir}/services/kformula*.desktop
+%{_datadir}/applications/kde/*kformula.desktop
 
-%if 0%{?kivio}
 %files kivio
 %defattr(-,root,root,-)
-%{_kde4_bindir}/kivio
-%{_kde4_libdir}/libkdeinit4_kivio.so
-%{_kde4_libdir}/libkivioprivate.so.*
-%{_kde4_libdir}/kde4/*kivio*.*
-%{_kde4_appsdir}/kivio/
-%{_kde4_docdir}/HTML/en/kivio/
-%{_kde4_datadir}/kde4/services/kivio*.desktop
-%{_kde4_datadir}/applications/kde4/kivio.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/kivio_konqi.desktop
-%{_kde4_docdir}/HTML/en/kivio/
-%endif
+%lang(en) %{_docdir}/HTML/en/kivio/
+%{_bindir}/kivio
+%{_libdir}/libkdeinit_kivio.so
+%{_libdir}/libkiviocommon.so.*
+%{_libdir}/kde3/*kivio*.*
+%{_libdir}/kde3/straight_connector.*
+%{_datadir}/apps/kivio/
+%{_datadir}/config.kcfg/kivio.kcfg
+%{_datadir}/services/kivio*.desktop
+%{_datadir}/applications/kde/*kivio.desktop
 
 %files filters
 %defattr(-,root,root,-)
-%{_kde4_libdir}/libkwordexportfilters.so.*
-%{_kde4_libdir}/kde4/libabiwordexport.*
-%{_kde4_libdir}/kde4/libabiwordimport.*
-%{_kde4_libdir}/kde4/libamiproexport.*
-%{_kde4_libdir}/kde4/libamiproimport.*
-%{_kde4_libdir}/kde4/libapplixspreadimport.*
-%{_kde4_libdir}/kde4/libapplixwordimport.*
-%{_kde4_libdir}/kde4/libasciiexport.*
-%{_kde4_libdir}/kde4/libasciiimport.*
-%{_kde4_libdir}/kde4/libdbaseimport.*
-%{_kde4_libdir}/kde4/libdocbookexport.*
-%{_kde4_libdir}/kde4/libexcelimport.*
-%{_kde4_libdir}/kde4/libgenerickofilter.*
-%{_kde4_libdir}/kde4/libhtmlexport.*
-%{_kde4_libdir}/kde4/libhtmlimport.*
-%{_kde4_libdir}/kde4/libkspreadlatexexport.*
-%{_kde4_libdir}/kde4/libkwordkword1dot3import.*
-%{_kde4_libdir}/kde4/libmswordodf_import.*
-%{_kde4_libdir}/kde4/libmswriteexport.*
-%{_kde4_libdir}/kde4/libmswriteimport.*
-%{_kde4_libdir}/kde4/liboowriterexport.*
-%{_kde4_libdir}/kde4/liboowriterimport.*
-%{_kde4_libdir}/kde4/libpalmdocexport.*
-%{_kde4_libdir}/kde4/libpalmdocimport.*
-%{_kde4_libdir}/kde4/libpowerpointimport.*
-%{_kde4_libdir}/kde4/librtfexport.*
-%{_kde4_libdir}/kde4/librtfimport.*
-%{_kde4_libdir}/kde4/libwmlexport.*
-%{_kde4_libdir}/kde4/libwmlimport.*
-%{_kde4_libdir}/kde4/libwpexport.*
-%{_kde4_libdir}/kde4/libwpgimport.*
-%{_kde4_libdir}/kde4/libwpimport.*
-#{_kde4_libdir}/kde4/libmswordimport.*
-#{_kde4_libdir}/kde4/libmswordodf_import.*
-%{_kde4_libdir}/kde4/libxsltimport.*
-%{_kde4_libdir}/kde4/libxsltexport.*
-%{_kde4_libdir}/kde4/libhancomwordimport.*
-%{_kde4_appsdir}/xsltfilter/
-%{_kde4_datadir}/kde4/services/generic_filter.desktop
-%{_kde4_datadir}/kde4/services/xslt*.desktop
-%{_kde4_datadir}/kde4/servicetypes/kofilter*.desktop
+%{_libdir}/libkwordexportfilters.so.*
+%{_libdir}/kde3/libabiwordexport.*
+%{_libdir}/kde3/libabiwordimport.*
+%{_libdir}/kde3/libamiproexport.*
+%{_libdir}/kde3/libamiproimport.*
+%{_libdir}/kde3/libapplixspreadimport.*
+%{_libdir}/kde3/libapplixwordimport.*
+%{_libdir}/kde3/libasciiexport.*
+%{_libdir}/kde3/libasciiimport.*
+%{_libdir}/kde3/libdbaseimport.*
+%{_libdir}/kde3/libdocbookexport.*
+%{_libdir}/kde3/libexcelimport.*
+%{_libdir}/kde3/libgenerickofilter.*
+%{_libdir}/kde3/libhtmlexport.*
+%{_libdir}/kde3/libhtmlimport.*
+%{_libdir}/kde3/libkarbonepsimport.*
+%{_libdir}/kde3/libkfolatexexport.*
+%{_libdir}/kde3/libkfomathmlexport.*
+%{_libdir}/kde3/libkfomathmlimport.*
+%{_libdir}/kde3/libkfopngexport.*
+%{_libdir}/kde3/libkspreadlatexexport.*
+%{_libdir}/kde3/libkugarnopimport.*
+%{_libdir}/kde3/libkwordkword1dot3import.*
+%{_libdir}/kde3/libkwordlatexexport.*
+%{_libdir}/kde3/libmswriteexport.*
+%{_libdir}/kde3/libmswriteimport.*
+%{_libdir}/kde3/libooimpressexport.*
+%{_libdir}/kde3/libooimpressimport.*
+%{_libdir}/kde3/liboowriterexport.*
+%{_libdir}/kde3/liboowriterimport.*
+%{_libdir}/kde3/libpalmdocexport.*
+%{_libdir}/kde3/libpalmdocimport.*
+%{_libdir}/kde3/libpdfimport.*
+%{_libdir}/kde3/librtfexport.*
+%{_libdir}/kde3/librtfimport.*
+%{_libdir}/kde3/libwmlexport.*
+%{_libdir}/kde3/libwmlimport.*
+%{_libdir}/kde3/libwpexport.*
+%if 0%{?libwpd}
+%{_libdir}/kde3/libwpimport.*
+%endif
+%{_libdir}/kde3/libmswordimport.*
+%{_libdir}/kde3/libxsltimport.*
+%{_libdir}/kde3/libxsltexport.*
+%{_libdir}/kde3/libhancomwordimport.*
+%{_libdir}/kde3/libkfosvgexport.*
+%{_libdir}/kde3/liboodrawimport.*
+%{_libdir}/kde3/libolefilter.*
+%{_datadir}/apps/xsltfilter/
+%{_datadir}/services/generic_filter.desktop
+%{_datadir}/services/ole_powerpoint97_import.desktop
+%{_datadir}/services/xslt*.desktop
+%{_datadir}/servicetypes/kofilter*.desktop
 
 %files kplato
 %defattr(-,root,root,-)
-%{_kde4_bindir}/kplato
-%{_kde4_bindir}/kplatowork
-%{_kde4_configdir}/kplatorc
-%{_kde4_configdir}/kplatoworkrc
-%{_kde4_datadir}/config.kcfg/kplatosettings.kcfg
-%{_kde4_libdir}/libkdeinit4_kplato.so
-%{_kde4_libdir}/libkdeinit4_kplatowork.so
-%{_kde4_libdir}/kde4/libkplatopart.*
-%{_kde4_libdir}/kde4/libkplatoworkpart.so
-%{_kde4_libdir}/libkplato*.so.*
-%{_kde4_libdir}/kde4/libicalendarexport.*
-%{_kde4_libdir}/kde4/krossmodulekplato.so
-%{_kde4_datadir}/kde4/services/krossmodulekplato.desktop
-%{_kde4_appsdir}/kplato/
-%{_kde4_appsdir}/kplatowork/
-%{_kde4_docdir}/HTML/en/kplato/
-%{_kde4_datadir}/kde4/services/kplato*.desktop
-%{_kde4_datadir}/kde4/servicetypes/kplato*.desktop
-%{_kde4_datadir}/applications/kde4/kplato.desktop
-%{_kde4_datadir}/applications/kde4/kplatowork.desktop
-
-%files kword
-%defattr(-,root,root,-)
-%{_kde4_bindir}/kword
-%{_kde4_configdir}/kwordrc
-%{_kde4_libdir}/libkdeinit4_kword.so
-%{_kde4_libdir}/libkwordprivate.so.*
-%{_kde4_libdir}/kde4/krossmodulekword.so
-%{_kde4_libdir}/kde4/libkwordpart.*
-%{_kde4_appsdir}/kword/
-#{_kde4_docdir}/HTML/en/kword/
-%{_kde4_datadir}/kde4/services/*kword*.desktop
-%{_kde4_datadir}/templates/TextDocument.desktop
-%{_kde4_datadir}/templates/.source/TextDocument.kwt
-%{_kde4_datadir}/applications/kde4/*kword.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/kword_konqi.desktop
+%lang(en) %{_docdir}/HTML/en/kplato/
+%{_bindir}/kplato
+%{_libdir}/libkdeinit_kplato.so
+%{_libdir}/kde3/kplato.*
+%{_libdir}/kde3/libkplatopart.*
+%{_datadir}/apps/kplato/
+%{_datadir}/services/kplatopart.desktop
+%{_datadir}/applications/kde/*kplato.desktop
 
 
 %changelog
-* Fri Sep 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.82-1
-- koffice-2.0.82 (2.1beta2)
-
-* Thu Aug 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.81-3
-- fixup some cross dependencies between -filters -kplato -krita
-
-* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.81-2
-- fix %%files
+* Sat Sep 26 2009 Rex Dieter <rdieter at fedoraproject.org> 3:1.6.3-26.20090306svn
+- Epoch++ (revert koffice2 -> koffice1)
 
-* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.81-1
-- koffice-2.0.81 (2.1beta1)
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:2.0.1-3.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Tue Jun 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.1-2 
+* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-25.20090306svn
 - rebuild (GraphicsMagick)
 
-* Wed Jun 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:2.0.1-1
-- koffice-2.0.1
-- KOffice 2 ships private copy of Emmentaler music font (#507741)
-
-* Fri May 22 2009 Lukáš Tinkl <ltinkl at redhat.com> - 2:2.0.0-1
-- KOffice 2.0.0
-
-* Tue Apr 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 2:1.0.99.0-1
-- koffice-1.0.99.0, koffice2 RC1
-- optimize/fix scriptlets
-
-* Thu Mar 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.7-1
-- koffice-1.9.98.7, koffice2 beta 7
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.9.98.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Wed Jan 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.6-1
-- koffice-1.9.98.6, koffice2 beta 6
-
-* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.5-2 
-- respin (mysql)
-
-* Thu Jan 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.5-1
-- koffice-1.9.98.5, koffice2 beta 5 (take 2)
-
-* Wed Dec 31 2008 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.4-1
-- koffice-1.9.98.4 (koffice2 beta5) 
-
-* Sun Dec 21 2008 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.3-2
-- respin (omit broken eviv2 support, for now)
-
-* Fri Dec 05 2008 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.3-1
-- koffice-1.9.98.3 (koffice2 beta4)
-
-* Thu Dec 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:1.9.98.2-4
-- Rebuild for fixed kde-filesystem (macros.kde4) (get rid of rpaths)
-
-* Wed Dec 03 2008 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.2-3
-- Conflicts with oxygen-icon-theme-4.1.80 (#474268)
-
-* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1:1.9.98.2-2
-- Rebuild for Python 2.6
-
-* Fri Nov 14 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.9.98.2-2
-- fix conflicts with oxygen-icon-theme
-
-* Tue Nov 11 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.9.98.2-1
-- koffice-1.9.98.2 (koffice2 beta3)
-- kchart awol
-
-* Thu Oct 09 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.9.98.1-1
-- koffice-1.9.98.1 (koffice2 beta2)
-
-* Wed Oct 08 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.9.98.0-2
-- -krita: move %%{_kde4_libdir}/libKrita*.so here
-- BR: libkdcraw-devel >= 0.2.0
-
-* Thu Sep 25 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.9.98.0-1
-- koffice-1.9.98.0 (koffice2 beta1)
-- Epoch: 1
-
-* Wed Aug 20 2008 Rex Dieter <rdieter at fedoraproject.org> 1.9.95.10-1
-- koffice-1.9.95.10
-
-* Thu Jul 17 2008 Rex Dieter <rdieter at fedoraproject.org> 1.9.95.9-1
-- koffice-1.9.95.9
-- fix pkg interdependencies, multilib issues
-
-* Fri Jun 27 2008 Rex Dieter <rdieter at fedoraproject.org> 1.9.95.8.2
-- respin (eviv2)
+* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-24.20090306svn
+- -kformula: Requires: lyx-cmex10-fonts
 
-* Tue May 27 2008 Rex Dieter <rdieter at fedoraproject.org> 1.9.95.8-1
-- koffice-1.9.95.8
+* Wed Jul 29 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-23.20090306svn
+- -kformula: use dejavu-lgc-sans-fonts
+- optimize scriptlets
+
+* Tue Jul 28 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-22.20090306svn
+- -kformula: omit bundled fonts
+- koffice kword crash with formulas (#514217)
+
+* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-21.20090306svn
+- -krita: revert/re-add dropped Requires: -filters
+
+* Tue Mar 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2:1.6.3-20.20090306svn
+- rebuild for new ImageMagick
+
+* Fri Mar 06 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-19.20090306svn
+- revert koffice2 -> koffice1, Epoch bump
+- 20090306svn
+
+* Mon Nov 03 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.6.3-18
+- pull in svn updates
+
+* Mon Oct 27 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.6.3-17
+- move libkiviocommon to -kivio (avoids libpython/multilib issues)
+
+* Thu Sep 18 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.6.3-16
+- revert koffice2->koffice1, introduce Epoch (F-10)
+- fix pkg interdependencies (#394101), multilib issues
+- -krita: drop Requires: %%name-filters (#394101)
+- cleanup scriptlets
 
 * Fri Feb 22 2008 Rex Dieter <rdieter at fedoraproject.org> 1.6.3-15
 - upstream gcc43 patch (#433994)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-12/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	24 Sep 2009 13:33:41 -0000	1.34
+++ sources	26 Sep 2009 18:19:02 -0000	1.35
@@ -1 +1,2 @@
-25080954dd83b0d7d480b66bd89d1374  koffice-2.0.82.tar.bz2
+03382edf62db9913b57ad8760c7d5f52  koshell.png
+386d388094734f9759977c3267098e30  koffice-1.6.3.tar.bz2




More information about the scm-commits mailing list