The KDE FreeBSD team is proud to announce the release of KDE 4.1.0

for FreeBSD. The official KDE 4.1.0 release notes can be found at
http://www.kde.org/announcements/4.1/.

Some note:

* Prefix
KDE4 will be install into a custom prefixes namely ${LOCALBASE}/kde4.
KDE4 and KDE3 can co-exist

* Sound
For sound to work, it is necessary to have dbus and hal enabled
in your system. Please see the respective documentation on how
to enable these.

For more Informations see the HEADS UP at ports@ and kde-freebsd@
or our wiki page http://wiki.freebsd.org/KDE4/Install.

Have fun!

7 files changed, 463 insertions, 1886 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 63aafecdfe9c..3c4176d12b94 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -345,6 +345,7 @@
     SUBDIR += kbarcode
     SUBDIR += kdc2tiff
     SUBDIR += kdegraphics3
+    SUBDIR += kdegraphics4
     SUBDIR += kipi-plugins
     SUBDIR += kisomandel
     SUBDIR += kix-kmod
diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index 1fc874129a60..9d9fdaa1d26c 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -1,77 +1,52 @@
-# -*-mode: makefile-*-
-# New ports collection makefile for:	KDE3 Graphics
-# Date created:				Saturday 2 September 2000
-# Whom:					Will Andrews <will@FreeBSD.org>
+# New ports collection Makefile for:	kdegraphics
+# Date created:				2008-01-31
+# Whom:					Martin Wilke <miwi@FreeBSD.org>
 #
 # $FreeBSD$
-#
 
 PORTNAME=	kdegraphics
-PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	3
+PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Graphics utilities for the KDE3 integrated X11 desktop
+COMMENT=	Graphics utilities for the KDE4 integrated X11 desktop
 
 BUILD_DEPENDS=	kpsewhich:${PORTSDIR}/print/teTeX-base
 LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 		freetype:${PORTSDIR}/print/freetype2 \
 		fribidi:${PORTSDIR}/converters/fribidi \
-		glut:${PORTSDIR}/graphics/libglut \
 		lcms:${PORTSDIR}/graphics/lcms \
 		paper:${PORTSDIR}/print/libpaper \
-		poppler-qt:${PORTSDIR}/graphics/poppler-qt
-
-CONFLICTS=	kolourpaint-[0-9]*
-
-USE_KDELIBS_VER=3
-PREFIX=		${KDE_PREFIX}
-
+		poppler-qt4:${PORTSDIR}/graphics/poppler-qt4 \
+		exiv2.3:${PORTSDIR}/graphics/exiv2 \
+		chm.0:${PORTSDIR}/misc/chmlib \
+		sane.1:${PORTSDIR}/graphics/sane-backends \
+		gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \
+		djvulibre:${PORTSDIR}/graphics/djvulibre-nox11 \
+		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
+		spectre.1:${PORTSDIR}/print/libspectre \
+		qca.2:${PORTSDIR}/devel/qca \
+		epub.0:${PORTSDIR}/textproc/ebook-tools
+
+LATEST_LINK=	${PORTNAME}4
+
+USE_GL=			glut
+USE_GHOSTSCRIPT=	yes
+USE_KDE4=	kdelibs workspace kdeprefix kdehier automoc4
+KDE4_BUILDENV=	yes
 USE_BZIP2=	yes
-USE_AUTOTOOLS=  libtool:15
-USE_GMAKE=	yes
-WANT_GNOME=	yes
-USE_GHOSTSCRIPT=yes
-
-USE_LDCONFIG=	yes
-LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
-DO_NOT_COMPILE+=kooka kuickshow libkscan
-
-OPTIONS=	IMLIB "Build Kuickshow, a fast and versatile image viewer" off \
-		GPHOTO2 "Enable support for digital cameras" off \
-		SANE "Build Kooka, a SANE scanner frontend for KDE" off
-
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_IMLIB)
-RUN_DEPENDS+=	kuickshow:${PORTSDIR}/graphics/kuickshow
-.elif defined(WITHOUT_IMLIB)
-CONFIGURE_ARGS+=--without-imlib-config
-.endif
-
-.if defined(WITH_GPHOTO2)
-RUN_DEPENDS+=	${LOCALBASE}/lib/kde3/kcm_kamera.la:${PORTSDIR}/graphics/kamera
-.elif defined(WITHOUT_GPHOTO2)
-CONFIGURE_ARGS+=--without-kamera
-.endif
-
-.if defined(WITH_SANE)
-RUN_DEPENDS+=	kooka:${PORTSDIR}/graphics/kooka
-.endif
+USE_QT_VER=	4
+QT_COMPONENTS=	opengl gui moc rcc uic svg iconengines pixeltool
 
-.if defined(DO_NOT_COMPILE)
-CONFIGURE_ENV+=DO_NOT_COMPILE="${DO_NOT_COMPILE}"
-.endif # defined(DO_NOT_COMPILE)
+post-extract:
+	${MKDIR} ${WRKSRC}
 
-pre-configure:
-	${REINPLACE_CMD} \
-	-E -e '/^SUBDIRS/s/(kamera|kooka|kuickshow)//g' \
-		${WRKSRC}/doc/Makefile.in
+post-patch:
+	${FIND} ${WRKSRC}/.. -type f -name CMakeLists.txt | ${XARGS} \
+		${REINPLACE_CMD} -e 's|pkgconfig|../libdata/pkgconfig|'
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/kdegraphics4/distinfo b/graphics/kdegraphics4/distinfo
index 2061f57cceb0..ca55ab348a66 100644
--- a/graphics/kdegraphics4/distinfo
+++ b/graphics/kdegraphics4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdegraphics-3.5.8.tar.bz2) = a3a31fc0e5b791ef330dd0627095d90f
-SHA256 (KDE/kdegraphics-3.5.8.tar.bz2) = 4d041d892f17ef90e0029ef14925980cf6a637d7a9971fba5835a5620ff3e155
-SIZE (KDE/kdegraphics-3.5.8.tar.bz2) = 7444011
+MD5 (KDE/kdegraphics-4.1.0.tar.bz2) = 2488d850b66eba1b542bded3def3e87e
+SHA256 (KDE/kdegraphics-4.1.0.tar.bz2) = f46ffe76ee69b7e569f79a74634d1379019eda4ee571c99e817c7cd2d3f16216
+SIZE (KDE/kdegraphics-4.1.0.tar.bz2) = 3383727
diff --git a/graphics/kdegraphics4/files/patch-kamera-config-kamera.h b/graphics/kdegraphics4/files/patch-kamera-config-kamera.h
new file mode 100644
index 000000000000..46e75402b13d
--- /dev/null
+++ b/graphics/kdegraphics4/files/patch-kamera-config-kamera.h
@@ -0,0 +1,11 @@
+--- ../kamera/config-kamera.h.cmake.orig	2008-02-10 12:38:09.000000000 +0100
++++ ../kamera/config-kamera.h.cmake	2008-02-10 12:38:35.000000000 +0100
+@@ -1,6 +1,6 @@
+ /* Define if we have va_copy */
+-/* #undef HAVE_VA_COPY */
++#define HAVE_VA_COPY
+ 
+ /* Define if we have __va_copy */
+-#define HAVE___VA_COPY 1
++/* #define HAVE___VA_COPY 1 */
+ 
diff --git a/graphics/kdegraphics4/files/patch-post-3.5.8-kdegraphics-kpdf.diff b/graphics/kdegraphics4/files/patch-post-3.5.8-kdegraphics-kpdf.diff
deleted file mode 100644
index 94e44a0280e9..000000000000
--- a/graphics/kdegraphics4/files/patch-post-3.5.8-kdegraphics-kpdf.diff
+++ /dev/null
@@ -1,643 +0,0 @@
---- kpdf/xpdf/xpdf/Stream.cc
-+++ kpdf/xpdf/xpdf/Stream.cc
-@@ -1245,23 +1245,26 @@ CCITTFaxStream::CCITTFaxStream(Stream *s
-   columns = columnsA;
-   if (columns < 1) {
-     columns = 1;
--  }
--  if (columns + 4 <= 0) {
--    columns = INT_MAX - 4;
-+  } else if (columns > INT_MAX - 2) {
-+    columns = INT_MAX - 2;
-   }
-   rows = rowsA;
-   endOfBlock = endOfBlockA;
-   black = blackA;
--  refLine = (short *)gmallocn(columns + 3, sizeof(short));
--  codingLine = (short *)gmallocn(columns + 2, sizeof(short));
-+  // 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 *)gmallocn(columns + 1, sizeof(int));
-+  refLine = (int *)gmallocn(columns + 2, sizeof(int));
- 
-   eof = gFalse;
-   row = 0;
-   nextLine2D = encoding < 0;
-   inputBits = 0;
--  codingLine[0] = 0;
--  codingLine[1] = refLine[2] = columns;
--  a0 = 1;
-+  codingLine[0] = columns;
-+  a0i = 0;
-+  outputBits = 0;
- 
-   buf = EOF;
- }
-@@ -1280,9 +1283,9 @@ void CCITTFaxStream::reset() {
-   row = 0;
-   nextLine2D = encoding < 0;
-   inputBits = 0;
--  codingLine[0] = 0;
--  codingLine[1] = columns;
--  a0 = 1;
-+  codingLine[0] = columns;
-+  a0i = 0;
-+  outputBits = 0;
-   buf = EOF;
- 
-   // skip any initial zero bits and end-of-line marker, and get the 2D
-@@ -1299,211 +1302,230 @@ void CCITTFaxStream::reset() {
-   }
- }
- 
-+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 a0New;
--  GBool err, gotEOL;
--  int ret;
--  int bits, i;
-+  int b1i, blackPixels, i, bits;
-+  GBool gotEOL;
- 
--  // if at eof just return EOF
--  if (eof && codingLine[a0] >= columns) {
--    return EOF;
-+  if (buf != EOF) {
-+    return buf;
-   }
- 
-   // read the next row
--  err = gFalse;
--  if (codingLine[a0] >= columns) {
-+  if (outputBits == 0) {
-+
-+    // if at eof just return EOF
-+    if (eof) {
-+      return EOF;
-+    }
-+
-+    err = gFalse;
- 
-     // 2-D encoding
-     if (nextLine2D) {
--      // state:
--      //   a0New = current position in coding line (0 <= a0New <= columns)
--      //   codingLine[a0] = last change in coding line
--      //                    (black-to-white if a0 is even,
--      //                     white-to-black if a0 is odd)
--      //   refLine[b1] = next change in reference line of opposite color
--      //                 to a0
--      // invariants:
--      //   0 <= codingLine[a0] <= a0New
--      //           <= refLine[b1] <= refLine[b1+1] <= columns
--      //   0 <= a0 <= columns+1
--      //   refLine[0] = 0
--      //   refLine[n] = refLine[n+1] = columns
--      //     -- for some 1 <= n <= columns+1
--      // end condition:
--      //   0 = codingLine[0] <= codingLine[1] < codingLine[2] < ...
--      //     < codingLine[n-1] < codingLine[n] = columns
--      //     -- where 1 <= n <= columns+1
-       for (i = 0; codingLine[i] < columns; ++i) {
- 	refLine[i] = codingLine[i];
-       }
--      refLine[i] = refLine[i + 1] = columns;
--      b1 = 1;
--      a0New = codingLine[a0 = 0] = 0;
--      do {
-+      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:
--	  if (refLine[b1] < columns) {
--	    a0New = refLine[b1 + 1];
--	    b1 += 2;
-+	  addPixels(refLine[b1i + 1], blackPixels);
-+	  if (refLine[b1i + 1] < columns) {
-+	    b1i += 2;
- 	  }
- 	  break;
- 	case twoDimHoriz:
--	  if ((a0 & 1) == 0) {
--	    code1 = code2 = 0;
-+	  code1 = code2 = 0;
-+	  if (blackPixels) {
- 	    do {
--	      code1 += code3 = getWhiteCode();
-+	      code1 += code3 = getBlackCode();
- 	    } while (code3 >= 64);
- 	    do {
--	      code2 += code3 = getBlackCode();
-+	      code2 += code3 = getWhiteCode();
- 	    } while (code3 >= 64);
- 	  } else {
--	    code1 = code2 = 0;
- 	    do {
--	      code1 += code3 = getBlackCode();
-+	      code1 += code3 = getWhiteCode();
- 	    } while (code3 >= 64);
- 	    do {
--	      code2 += code3 = getWhiteCode();
-+	      code2 += code3 = getBlackCode();
- 	    } while (code3 >= 64);
- 	  }
--	  if (code1 > 0 || code2 > 0) {
--	    if (a0New + code1 <= columns) {
--	      codingLine[a0 + 1] = a0New + code1;
--	    } else {
--	      codingLine[a0 + 1] = columns;
--	    }
--	    ++a0;
--	    if (codingLine[a0] + code2 <= columns) {
--	      codingLine[a0 + 1] = codingLine[a0] + code2;
--	    } else {
--	      codingLine[a0 + 1] = columns;
--	    }
--	    ++a0;
--	    a0New = codingLine[a0];
--	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
--	      b1 += 2;
-+	  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 twoDimVert0:
--	  if (refLine[b1] < columns) {
--	    a0New = codingLine[++a0] = refLine[b1];
--	    ++b1;
--	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
--	      b1 += 2;
-+	case twoDimVertR2:
-+	  addPixels(refLine[b1i] + 2, blackPixels);
-+	  blackPixels ^= 1;
-+	  if (codingLine[a0i] < columns) {
-+	    ++b1i;
-+	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-+	      b1i += 2;
- 	    }
--	  } else {
--	    a0New = codingLine[++a0] = columns;
- 	  }
- 	  break;
- 	case twoDimVertR1:
--	  if (refLine[b1] + 1 < columns) {
--	    a0New = codingLine[++a0] = refLine[b1] + 1;
--	    ++b1;
--	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
--	      b1 += 2;
-+	  addPixels(refLine[b1i] + 1, blackPixels);
-+	  blackPixels ^= 1;
-+	  if (codingLine[a0i] < columns) {
-+	    ++b1i;
-+	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-+	      b1i += 2;
- 	    }
--	  } else {
--	    a0New = codingLine[++a0] = columns;
- 	  }
- 	  break;
--	case twoDimVertL1:
--	  if (refLine[b1] - 1 > a0New || (a0 == 0 && refLine[b1] == 1)) {
--	    a0New = codingLine[++a0] = refLine[b1] - 1;
--	    --b1;
--	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
--	      b1 += 2;
-+	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 twoDimVertR2:
--	  if (refLine[b1] + 2 < columns) {
--	    a0New = codingLine[++a0] = refLine[b1] + 2;
--	    ++b1;
--	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
--	      b1 += 2;
-+	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;
- 	    }
--	  } else {
--	    a0New = codingLine[++a0] = columns;
- 	  }
- 	  break;
- 	case twoDimVertL2:
--	  if (refLine[b1] - 2 > a0New || (a0 == 0 && refLine[b1] == 2)) {
--	    a0New = codingLine[++a0] = refLine[b1] - 2;
--	    --b1;
--	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
--	      b1 += 2;
-+	  addPixelsNeg(refLine[b1i] - 2, blackPixels);
-+	  blackPixels ^= 1;
-+	  if (codingLine[a0i] < columns) {
-+	    if (b1i > 0) {
-+	      --b1i;
-+	    } else {
-+	      ++b1i;
- 	    }
--	  }
--	  break;
--	case twoDimVertR3:
--	  if (refLine[b1] + 3 < columns) {
--	    a0New = codingLine[++a0] = refLine[b1] + 3;
--	    ++b1;
--	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
--	      b1 += 2;
-+	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-+	      b1i += 2;
- 	    }
--	  } else {
--	    a0New = codingLine[++a0] = columns;
- 	  }
- 	  break;
--	case twoDimVertL3:
--	  if (refLine[b1] - 3 > a0New || (a0 == 0 && refLine[b1] == 3)) {
--	    a0New = codingLine[++a0] = refLine[b1] - 3;
--	    --b1;
--	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
--	      b1 += 2;
-+	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;
--	  codingLine[a0 = 0] = columns;
--	  return EOF;
-+	  break;
- 	default:
- 	  error(getPos(), "Bad 2D code %04x in CCITTFax stream", code1);
-+	  addPixels(columns, 0);
- 	  err = gTrue;
- 	  break;
- 	}
--      } while (codingLine[a0] < columns);
-+      }
- 
-     // 1-D encoding
-     } else {
--      codingLine[a0 = 0] = 0;
--      while (1) {
-+      codingLine[0] = 0;
-+      a0i = 0;
-+      blackPixels = 0;
-+      while (codingLine[a0i] < columns) {
- 	code1 = 0;
--	do {
--	  code1 += code3 = getWhiteCode();
--	} while (code3 >= 64);
--	codingLine[a0+1] = codingLine[a0] + code1;
--	++a0;
--	if (codingLine[a0] >= columns) {
--	  break;
--	}
--	code2 = 0;
--	do {
--	  code2 += code3 = getBlackCode();
--	} while (code3 >= 64);
--	codingLine[a0+1] = codingLine[a0] + code2;
--	++a0;
--	if (codingLine[a0] >= columns) {
--	  break;
-+	if (blackPixels) {
-+	  do {
-+	    code1 += code3 = getBlackCode();
-+	  } while (code3 >= 64);
-+	} else {
-+	  do {
-+	    code1 += code3 = getWhiteCode();
-+	  } while (code3 >= 64);
- 	}
-+	addPixels(codingLine[a0i] + code1, blackPixels);
-+	blackPixels ^= 1;
-       }
-     }
- 
--    if (codingLine[a0] != columns) {
--      error(getPos(), "CCITTFax row is wrong length (%d)", codingLine[a0]);
--      // force the row to be the correct length
--      while (codingLine[a0] > columns) {
--	--a0;
--      }
--      codingLine[++a0] = columns;
--      err = gTrue;
--    }
--
-     // byte-align the row
-     if (byteAlign) {
-       inputBits &= ~7;
-@@ -1562,14 +1584,17 @@ int CCITTFaxStream::lookChar() {
-     // 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) {
--      do {
-+      while (1) {
-+	code1 = lookBits(13);
- 	if (code1 == EOF) {
- 	  eof = gTrue;
- 	  return EOF;
- 	}
-+	if ((code1 >> 1) == 0x001) {
-+	  break;
-+	}
- 	eatBits(1);
--	code1 = lookBits(13);
--      } while ((code1 >> 1) != 0x001);
-+      }
-       eatBits(12); 
-       if (encoding > 0) {
- 	eatBits(1);
-@@ -1577,11 +1602,11 @@ int CCITTFaxStream::lookChar() {
-       }
-     }
- 
--    a0 = 0;
--    outputBits = codingLine[1] - codingLine[0];
--    if (outputBits == 0) {
--      a0 = 1;
--      outputBits = codingLine[2] - codingLine[1];
-+    // set up for output
-+    if (codingLine[0] > 0) {
-+      outputBits = codingLine[a0i = 0];
-+    } else {
-+      outputBits = codingLine[a0i = 1];
-     }
- 
-     ++row;
-@@ -1589,39 +1614,43 @@ int CCITTFaxStream::lookChar() {
- 
-   // get a byte
-   if (outputBits >= 8) {
--    ret = ((a0 & 1) == 0) ? 0xff : 0x00;
--    if ((outputBits -= 8) == 0) {
--      ++a0;
--      if (codingLine[a0] < columns) {
--	outputBits = codingLine[a0 + 1] - codingLine[a0];
--      }
-+    buf = (a0i & 1) ? 0x00 : 0xff;
-+    outputBits -= 8;
-+    if (outputBits == 0 && codingLine[a0i] < columns) {
-+      ++a0i;
-+      outputBits = codingLine[a0i] - codingLine[a0i - 1];
-     }
-   } else {
-     bits = 8;
--    ret = 0;
-+    buf = 0;
-     do {
-       if (outputBits > bits) {
--	i = bits;
--	bits = 0;
--	if ((a0 & 1) == 0) {
--	  ret |= 0xff >> (8 - i);
-+	buf <<= bits;
-+	if (!(a0i & 1)) {
-+	  buf |= 0xff >> (8 - bits);
- 	}
--	outputBits -= i;
-+	outputBits -= bits;
-+	bits = 0;
-       } else {
--	i = outputBits;
--	bits -= outputBits;
--	if ((a0 & 1) == 0) {
--	  ret |= (0xff >> (8 - i)) << bits;
-+	buf <<= outputBits;
-+	if (!(a0i & 1)) {
-+	  buf |= 0xff >> (8 - outputBits);
- 	}
-+	bits -= outputBits;
- 	outputBits = 0;
--	++a0;
--	if (codingLine[a0] < columns) {
--	  outputBits = codingLine[a0 + 1] - codingLine[a0];
-+	if (codingLine[a0i] < columns) {
-+	  ++a0i;
-+	  outputBits = codingLine[a0i] - codingLine[a0i - 1];
-+	} else if (bits > 0) {
-+	  buf <<= bits;
-+	  bits = 0;
- 	}
-       }
--    } while (bits > 0 && codingLine[a0] < columns);
-+    } while (bits);
-+  }
-+  if (black) {
-+    buf ^= 0xff;
-   }
--  buf = black ? (ret ^ 0xff) : ret;
-   return buf;
- }
- 
-@@ -1663,6 +1692,9 @@ short CCITTFaxStream::getWhiteCode() {
-   code = 0; // make gcc happy
-   if (endOfBlock) {
-     code = lookBits(12);
-+    if (code == EOF) {
-+      return 1;
-+    }
-     if ((code >> 5) == 0) {
-       p = &whiteTab1[code];
-     } else {
-@@ -1675,6 +1707,9 @@ short CCITTFaxStream::getWhiteCode() {
-   } else {
-     for (n = 1; n <= 9; ++n) {
-       code = lookBits(n);
-+      if (code == EOF) {
-+	return 1;
-+      }
-       if (n < 9) {
- 	code <<= 9 - n;
-       }
-@@ -1686,6 +1721,9 @@ short CCITTFaxStream::getWhiteCode() {
-     }
-     for (n = 11; n <= 12; ++n) {
-       code = lookBits(n);
-+      if (code == EOF) {
-+	return 1;
-+      }
-       if (n < 12) {
- 	code <<= 12 - n;
-       }
-@@ -1711,9 +1749,12 @@ short CCITTFaxStream::getBlackCode() {
-   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) {
-+    } else if ((code >> 9) == 0 && (code >> 7) != 0) {
-       p = &blackTab2[(code >> 1) - 64];
-     } else {
-       p = &blackTab3[code >> 7];
-@@ -1725,6 +1766,9 @@ short CCITTFaxStream::getBlackCode() {
-   } else {
-     for (n = 2; n <= 6; ++n) {
-       code = lookBits(n);
-+      if (code == EOF) {
-+	return 1;
-+      }
-       if (n < 6) {
- 	code <<= 6 - n;
-       }
-@@ -1736,6 +1780,9 @@ short CCITTFaxStream::getBlackCode() {
-     }
-     for (n = 7; n <= 12; ++n) {
-       code = lookBits(n);
-+      if (code == EOF) {
-+	return 1;
-+      }
-       if (n < 12) {
- 	code <<= 12 - n;
-       }
-@@ -1749,6 +1796,9 @@ short CCITTFaxStream::getBlackCode() {
-     }
-     for (n = 10; n <= 13; ++n) {
-       code = lookBits(n);
-+      if (code == EOF) {
-+	return 1;
-+      }
-       if (n < 13) {
- 	code <<= 13 - n;
-       }
-@@ -1963,6 +2013,12 @@ void DCTStream::reset() {
-     // 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 *)gmallocn(bufWidth * bufHeight, sizeof(int));
-       memset(frameBuf[i], 0, bufWidth * bufHeight * sizeof(int));
-@@ -3038,6 +3094,11 @@ GBool DCTStream::readScanInfo() {
-   }
-   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;
---- kpdf/xpdf/xpdf/Stream.h
-+++ kpdf/xpdf/xpdf/Stream.h
-@@ -528,13 +528,15 @@ private:
-   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 ouput bits
-   int buf;			// character buffer
- 
-+  void addPixels(int a1, int black);
-+  void addPixelsNeg(int a1, int black);
-   short getTwoDimCode();
-   short getWhiteCode();
-   short getBlackCode();
diff --git a/graphics/kdegraphics4/pkg-descr b/graphics/kdegraphics4/pkg-descr
index 76134544da73..b98cb517afe1 100644
--- a/graphics/kdegraphics4/pkg-descr
+++ b/graphics/kdegraphics4/pkg-descr
@@ -1,5 +1,5 @@
 KDE provides an integrated X11 based environment, much like CDE.
 This particular port installs the graphics and image manipulation
-components of KDE3.
+components of KDE4.
 
 WWW: http://www.kde.org/
diff --git a/graphics/kdegraphics4/pkg-plist b/graphics/kdegraphics4/pkg-plist
index 4e191ecdd3cc..7f4cc2561c2c 100644
--- a/graphics/kdegraphics4/pkg-plist
+++ b/graphics/kdegraphics4/pkg-plist
@@ -1,409 +1,137 @@
+bin/gwenview
+bin/kbackgroundsnapshot
 bin/kcolorchooser
-bin/kcoloredit
-bin/kdvi
-bin/kfax
-bin/kfaxview
-bin/kghostview
-bin/kiconedit
 bin/kolourpaint
-bin/kpdf
-bin/kpovmodeler
 bin/kruler
 bin/ksnapshot
-bin/kview
-bin/kviewshell
-bin/mrmlsearch
-bin/printnodetest
-bin/svgdisplay
+bin/okular
 bin/xf86gammacfg
-include/dom/SVGAElement.h
-include/dom/SVGAltGlyphDefElement.h
-include/dom/SVGAltGlyphElement.h
-include/dom/SVGAngle.h
-include/dom/SVGAnimateColorElement.h
-include/dom/SVGAnimateElement.h
-include/dom/SVGAnimateMotionElement.h
-include/dom/SVGAnimateTransformElement.h
-include/dom/SVGAnimatedAngle.h
-include/dom/SVGAnimatedBoolean.h
-include/dom/SVGAnimatedEnumeration.h
-include/dom/SVGAnimatedInteger.h
-include/dom/SVGAnimatedLength.h
-include/dom/SVGAnimatedLengthList.h
-include/dom/SVGAnimatedNumber.h
-include/dom/SVGAnimatedNumberList.h
-include/dom/SVGAnimatedPathData.h
-include/dom/SVGAnimatedPoints.h
-include/dom/SVGAnimatedPreserveAspectRatio.h
-include/dom/SVGAnimatedRect.h
-include/dom/SVGAnimatedString.h
-include/dom/SVGAnimatedTransformList.h
-include/dom/SVGAnimationElement.h
-include/dom/SVGCSSRule.h
-include/dom/SVGCircleElement.h
-include/dom/SVGClipPathElement.h
-include/dom/SVGColor.h
-include/dom/SVGColorProfileElement.h
-include/dom/SVGColorProfileRule.h
-include/dom/SVGComponentTransferFunctionElement.h
-include/dom/SVGCursorElement.h
-include/dom/SVGDefinitionSrcElement.h
-include/dom/SVGDefsElement.h
-include/dom/SVGDescElement.h
-include/dom/SVGDocument.h
-include/dom/SVGElement.h
-include/dom/SVGElementInstance.h
-include/dom/SVGElementInstanceList.h
-include/dom/SVGEllipseElement.h
-include/dom/SVGEvent.h
-include/dom/SVGException.h
-include/dom/SVGExternalResourcesRequired.h
-include/dom/SVGFEBlendElement.h
-include/dom/SVGFEColorMatrixElement.h
-include/dom/SVGFEComponentTransferElement.h
-include/dom/SVGFECompositeElement.h
-include/dom/SVGFEConvolveMatrixElement.h
-include/dom/SVGFEDiffuseLightingElement.h
-include/dom/SVGFEDisplacementMapElement.h
-include/dom/SVGFEDistantLightElement.h
-include/dom/SVGFEFloodElement.h
-include/dom/SVGFEFuncAElement.h
-include/dom/SVGFEFuncBElement.h
-include/dom/SVGFEFuncGElement.h
-include/dom/SVGFEFuncRElement.h
-include/dom/SVGFEGaussianBlurElement.h
-include/dom/SVGFEImageElement.h
-include/dom/SVGFEMergeElement.h
-include/dom/SVGFEMergeNodeElement.h
-include/dom/SVGFEMorphologyElement.h
-include/dom/SVGFEOffsetElement.h
-include/dom/SVGFEPointLightElement.h
-include/dom/SVGFESpecularLightingElement.h
-include/dom/SVGFESpotLightElement.h
-include/dom/SVGFETileElement.h
-include/dom/SVGFETurbulenceElement.h
-include/dom/SVGFilterElement.h
-include/dom/SVGFilterPrimitiveStandardAttributes.h
-include/dom/SVGFitToViewBox.h
-include/dom/SVGFontElement.h
-include/dom/SVGFontFaceElement.h
-include/dom/SVGFontFaceFormatElement.h
-include/dom/SVGFontFaceNameElement.h
-include/dom/SVGFontFaceSrcElement.h
-include/dom/SVGFontFaceUriElement.h
-include/dom/SVGForeignObjectElement.h
-include/dom/SVGGElement.h
-include/dom/SVGGlyphElement.h
-include/dom/SVGGlyphRefElement.h
-include/dom/SVGGradientElement.h
-include/dom/SVGHKernElement.h
-include/dom/SVGICCColor.h
-include/dom/SVGImageElement.h
-include/dom/SVGLangSpace.h
-include/dom/SVGLength.h
-include/dom/SVGLengthList.h
-include/dom/SVGLineElement.h
-include/dom/SVGLinearGradientElement.h
-include/dom/SVGLocatable.h
-include/dom/SVGMPathElement.h
-include/dom/SVGMarkerElement.h
-include/dom/SVGMaskElement.h
-include/dom/SVGMatrix.h
-include/dom/SVGMetadataElement.h
-include/dom/SVGMissingGlyphElement.h
-include/dom/SVGNumber.h
-include/dom/SVGNumberList.h
-include/dom/SVGPaint.h
-include/dom/SVGPathElement.h
-include/dom/SVGPathSeg.h
-include/dom/SVGPathSegArc.h
-include/dom/SVGPathSegClosePath.h
-include/dom/SVGPathSegCurvetoCubic.h
-include/dom/SVGPathSegCurvetoCubicSmooth.h
-include/dom/SVGPathSegCurvetoQuadratic.h
-include/dom/SVGPathSegCurvetoQuadraticSmooth.h
-include/dom/SVGPathSegLineto.h
-include/dom/SVGPathSegLinetoHorizontal.h
-include/dom/SVGPathSegLinetoVertical.h
-include/dom/SVGPathSegList.h
-include/dom/SVGPathSegMoveto.h
-include/dom/SVGPatternElement.h
-include/dom/SVGPoint.h
-include/dom/SVGPointList.h
-include/dom/SVGPolygonElement.h
-include/dom/SVGPolylineElement.h
-include/dom/SVGPreserveAspectRatio.h
-include/dom/SVGRadialGradientElement.h
-include/dom/SVGRect.h
-include/dom/SVGRectElement.h
-include/dom/SVGRenderingIntent.h
-include/dom/SVGSVGElement.h
-include/dom/SVGScriptElement.h
-include/dom/SVGSetElement.h
-include/dom/SVGStopElement.h
-include/dom/SVGStringList.h
-include/dom/SVGStylable.h
-include/dom/SVGStyleElement.h
-include/dom/SVGSwitchElement.h
-include/dom/SVGSymbolElement.h
-include/dom/SVGTRefElement.h
-include/dom/SVGTSpanElement.h
-include/dom/SVGTests.h
-include/dom/SVGTextContentElement.h
-include/dom/SVGTextElement.h
-include/dom/SVGTextPathElement.h
-include/dom/SVGTextPositioningElement.h
-include/dom/SVGTitleElement.h
-include/dom/SVGTransform.h
-include/dom/SVGTransformList.h
-include/dom/SVGTransformable.h
-include/dom/SVGURIReference.h
-include/dom/SVGUnitTypes.h
-include/dom/SVGUseElement.h
-include/dom/SVGVKernElement.h
-include/dom/SVGViewElement.h
-include/dom/SVGViewSpec.h
-include/dom/SVGWindow.h
-include/dom/SVGZoomAndPan.h
-include/dom/SVGZoomEvent.h
-include/kfaximage.h
-include/kmultipageInterface.h
-include/ksvg/CanvasFactory.h
-include/ksvg/CanvasItem.h
-include/ksvg/CanvasItems.h
-include/ksvg/DocumentFactory.h
-include/ksvg/KSVGCanvas.h
-include/ksvg/ksvg_plugin.h
-include/kviewshell/anchor.h
-include/kviewshell/bookmark.h
-include/kviewshell/documentPageCache.h
-include/kviewshell/documentRenderer.h
-include/kviewshell/documentWidget.h
-include/kviewshell/history.h
-include/kviewshell/hyperlink.h
-include/kviewshell/kmultipage.h
-include/kviewshell/length.h
-include/kviewshell/pageNumber.h
-include/kviewshell/pageSize.h
-include/kviewshell/pageView.h
-include/kviewshell/renderedDocumentPage.h
-include/kviewshell/renderedDocumentPagePixmap.h
-include/kviewshell/renderedDocumentPagePrinter.h
-include/kviewshell/selection.h
-include/kviewshell/simplePageSize.h
-include/kviewshell/textBox.h
-include/kviewshell/zoom.h
-include/kviewshell/zoomlimits.h
-include/libtext2path-0.1/BezierPath.h
-include/libtext2path-0.1/Glyph.h
-include/libtext2path-0.1/GlyphTracer.h
-lib/kde3/djvuviewpart.a
-lib/kde3/djvuviewpart.la
-lib/kde3/djvuviewpart.so
-lib/kde3/emptymultipagepart.a
-lib/kde3/emptymultipagepart.la
-lib/kde3/emptymultipagepart.so
-lib/kde3/gsthumbnail.a
-lib/kde3/gsthumbnail.la
-lib/kde3/gsthumbnail.so
-lib/kde3/kcm_kgamma.a
-lib/kde3/kcm_kgamma.la
-lib/kde3/kcm_kgamma.so
-lib/kde3/kcm_kmrml.a
-lib/kde3/kcm_kmrml.la
-lib/kde3/kcm_kmrml.so
-lib/kde3/kcm_kviewcanvasconfig.a
-lib/kde3/kcm_kviewcanvasconfig.la
-lib/kde3/kcm_kviewcanvasconfig.so
-lib/kde3/kcm_kviewgeneralconfig.a
-lib/kde3/kcm_kviewgeneralconfig.la
-lib/kde3/kcm_kviewgeneralconfig.so
-lib/kde3/kcm_kviewpluginsconfig.a
-lib/kde3/kcm_kviewpluginsconfig.la
-lib/kde3/kcm_kviewpluginsconfig.so
-lib/kde3/kcm_kviewviewerpluginsconfig.a
-lib/kde3/kcm_kviewviewerpluginsconfig.la
-lib/kde3/kcm_kviewviewerpluginsconfig.so
-lib/kde3/kded_daemonwatcher.a
-lib/kde3/kded_daemonwatcher.la
-lib/kde3/kded_daemonwatcher.so
-lib/kde3/kdvipart.a
-lib/kde3/kdvipart.la
-lib/kde3/kdvipart.so
-lib/kde3/kfaxviewpart.a
-lib/kde3/kfaxviewpart.la
-lib/kde3/kfaxviewpart.so
-lib/kde3/kfile_bmp.a
-lib/kde3/kfile_bmp.la
-lib/kde3/kfile_bmp.so
-lib/kde3/kfile_dds.a
-lib/kde3/kfile_dds.la
-lib/kde3/kfile_dds.so
-lib/kde3/kfile_dvi.a
-lib/kde3/kfile_dvi.la
-lib/kde3/kfile_dvi.so
-lib/kde3/kfile_exr.a
-lib/kde3/kfile_exr.la
-lib/kde3/kfile_exr.so
-lib/kde3/kfile_gif.a
-lib/kde3/kfile_gif.la
-lib/kde3/kfile_gif.so
-lib/kde3/kfile_ico.a
-lib/kde3/kfile_ico.la
-lib/kde3/kfile_ico.so
-lib/kde3/kfile_jpeg.a
-lib/kde3/kfile_jpeg.la
-lib/kde3/kfile_jpeg.so
-lib/kde3/kfile_pcx.a
-lib/kde3/kfile_pcx.la
-lib/kde3/kfile_pcx.so
-lib/kde3/kfile_pdf.a
-lib/kde3/kfile_pdf.la
-lib/kde3/kfile_pdf.so
-lib/kde3/kfile_png.a
-lib/kde3/kfile_png.la
-lib/kde3/kfile_png.so
-lib/kde3/kfile_pnm.a
-lib/kde3/kfile_pnm.la
-lib/kde3/kfile_pnm.so
-lib/kde3/kfile_ps.a
-lib/kde3/kfile_ps.la
-lib/kde3/kfile_ps.so
-lib/kde3/kfile_raw.a
-lib/kde3/kfile_raw.la
-lib/kde3/kfile_raw.so
-lib/kde3/kfile_rgb.a
-lib/kde3/kfile_rgb.la
-lib/kde3/kfile_rgb.so
-lib/kde3/kfile_tga.a
-lib/kde3/kfile_tga.la
-lib/kde3/kfile_tga.so
-lib/kde3/kfile_tiff.a
-lib/kde3/kfile_tiff.la
-lib/kde3/kfile_tiff.so
-lib/kde3/kfile_xbm.a
-lib/kde3/kfile_xbm.la
-lib/kde3/kfile_xbm.so
-lib/kde3/kfile_xpm.a
-lib/kde3/kfile_xpm.la
-lib/kde3/kfile_xpm.so
-lib/kde3/kio_mrml.a
-lib/kde3/kio_mrml.la
-lib/kde3/kio_mrml.so
-lib/kde3/kview.a
-lib/kde3/kview.la
-lib/kde3/kview.so
-lib/kde3/kview_browserplugin.a
-lib/kde3/kview_browserplugin.la
-lib/kde3/kview_browserplugin.so
-lib/kde3/kview_effectsplugin.a
-lib/kde3/kview_effectsplugin.la
-lib/kde3/kview_effectsplugin.so
-lib/kde3/kview_presenterplugin.a
-lib/kde3/kview_presenterplugin.la
-lib/kde3/kview_presenterplugin.so
-lib/kde3/kview_scannerplugin.a
-lib/kde3/kview_scannerplugin.la
-lib/kde3/kview_scannerplugin.so
-lib/kde3/kviewerpart.a
-lib/kde3/kviewerpart.la
-lib/kde3/kviewerpart.so
-lib/kde3/libdjvu.a
-lib/kde3/libdjvu.la
-lib/kde3/libdjvu.so
-lib/kde3/libkghostviewpart.a
-lib/kde3/libkghostviewpart.la
-lib/kde3/libkghostviewpart.so
-lib/kde3/libkmrmlpart.a
-lib/kde3/libkmrmlpart.la
-lib/kde3/libkmrmlpart.so
-lib/kde3/libkpdfpart.a
-lib/kde3/libkpdfpart.la
-lib/kde3/libkpdfpart.so
-lib/kde3/libkpovmodelerpart.a
-lib/kde3/libkpovmodelerpart.la
-lib/kde3/libkpovmodelerpart.so
-lib/kde3/libksvgplugin.a
-lib/kde3/libksvgplugin.la
-lib/kde3/libksvgplugin.so
-lib/kde3/libksvgrendererlibart.a
-lib/kde3/libksvgrendererlibart.la
-lib/kde3/libksvgrendererlibart.so
-lib/kde3/libkviewcanvas.a
-lib/kde3/libkviewcanvas.la
-lib/kde3/libkviewcanvas.so
-lib/kde3/libkviewviewer.a
-lib/kde3/libkviewviewer.la
-lib/kde3/libkviewviewer.so
-lib/kde3/libphotobook.a
-lib/kde3/libphotobook.la
-lib/kde3/libphotobook.so
-lib/kde3/mrmlsearch.a
-lib/kde3/mrmlsearch.la
-lib/kde3/mrmlsearch.so
-lib/kde3/svgthumbnail.a
-lib/kde3/svgthumbnail.la
-lib/kde3/svgthumbnail.so
-lib/libkdeinit_kview.a
-lib/libkdeinit_kview.la
-lib/libkdeinit_kview.so
-lib/libkdeinit_mrmlsearch.a
-lib/libkdeinit_mrmlsearch.la
-lib/libkdeinit_mrmlsearch.so
-lib/libkfaximage.a
-lib/libkfaximage.la
-lib/libkfaximage.so
-lib/libkghostviewlib.a
-lib/libkghostviewlib.la
-lib/libkghostviewlib.so
-lib/libkghostviewlib.so.0
-lib/libkimageviewer.a
-lib/libkimageviewer.la
-lib/libkimageviewer.so
-lib/libkimageviewer.so.0
-lib/libkmultipage.a
-lib/libkmultipage.la
-lib/libkmultipage.so
-lib/libkmultipage.so.0
-lib/libkpovmodeler.a
-lib/libkpovmodeler.la
-lib/libkpovmodeler.so
-lib/libkpovmodeler.so.0
-lib/libksvg.a
-lib/libksvg.la
-lib/libksvg.so
-lib/libksvg.so.0
-lib/libtext2path.a
-lib/libtext2path.la
-lib/libtext2path.so
-lib/libtext2path.so.0
-share/applications/kde/kcmkmrml.desktop
-share/applications/kde/kcolorchooser.desktop
-share/applications/kde/kcoloredit.desktop
-share/applications/kde/kdvi.desktop
-share/applications/kde/kfax.desktop
-share/applications/kde/kfaxview.desktop
-share/applications/kde/kgamma.desktop
-share/applications/kde/kghostview.desktop
-share/applications/kde/kiconedit.desktop
-share/applications/kde/kolourpaint.desktop
-share/applications/kde/kpdf.desktop
-share/applications/kde/kpovmodeler.desktop
-share/applications/kde/kruler.desktop
-share/applications/kde/ksnapshot.desktop
-share/applications/kde/kview.desktop
-share/applnk/Graphics/kruler.desktop
-share/apps/djvumultipage.rc
-share/apps/kcoloredit/kcoloreditui.rc
-share/apps/kconf_update/kghostview.upd
-share/apps/kconf_update/update-to-xt-names.pl
-share/apps/kdvi/kdvi_part.rc
-share/apps/kdvi/kviewshell.rc
-share/apps/kdvi/tips
-share/apps/kfax/kfaxui.rc
-share/apps/kfax/pics/kfax.tif
-share/apps/kfax/pics/kfaxlogo.xpm
-share/apps/kfaxview/kviewshell.rc
+include/libkdcraw/dcrawbinary.h
+include/libkdcraw/dcrawinfocontainer.h
+include/libkdcraw/dcrawsettingswidget.h
+include/libkdcraw/kdcraw.h
+include/libkdcraw/libkdcraw_export.h
+include/libkdcraw/rawdecodingsettings.h
+include/libkdcraw/rawfiles.h
+include/libkdcraw/version.h
+include/libkexiv2/kexiv2.h
+include/libkexiv2/libkexiv2_export.h
+include/libkexiv2/version.h
+include/libkipi/imagecollection.h
+include/libkipi/imagecollectionselector.h
+include/libkipi/imagecollectionshared.h
+include/libkipi/imageinfo.h
+include/libkipi/imageinfoshared.h
+include/libkipi/interface.h
+include/libkipi/libkipi_export.h
+include/libkipi/plugin.h
+include/libkipi/pluginloader.h
+include/libkipi/uploadwidget.h
+include/libkipi/version.h
+include/libksane/ksane.h
+include/libksane/libksane_export.h
+include/libksane/version.h
+include/okular/core/action.h
+include/okular/core/annotations.h
+include/okular/core/area.h
+include/okular/core/document.h
+include/okular/core/fileprinter.h
+include/okular/core/fontinfo.h
+include/okular/core/form.h
+include/okular/core/generator.h
+include/okular/core/global.h
+include/okular/core/okular_export.h
+include/okular/core/page.h
+include/okular/core/pagesize.h
+include/okular/core/pagetransition.h
+include/okular/core/sound.h
+include/okular/core/sourcereference.h
+include/okular/core/textdocumentgenerator.h
+include/okular/core/textpage.h
+include/okular/core/utils.h
+include/okular/core/version.h
+include/okular/interfaces/configinterface.h
+include/okular/interfaces/guiinterface.h
+include/okular/interfaces/printinterface.h
+lib/kde4/gsthumbnail.so
+lib/kde4/gvpart.so
+lib/kde4/kcm_kamera.so
+lib/kde4/kcm_kgamma.so
+lib/kde4/kio_kamera.so
+lib/kde4/kio_msits.so
+lib/kde4/ksaneplugin.so
+lib/kde4/okularGenerator_chmlib.so
+lib/kde4/okularGenerator_comicbook.so
+lib/kde4/okularGenerator_epub.so
+lib/kde4/okularGenerator_djvu.so
+lib/kde4/okularGenerator_dvi.so
+lib/kde4/okularGenerator_fb.so
+lib/kde4/okularGenerator_ghostview.so
+lib/kde4/okularGenerator_kimgio.so
+lib/kde4/okularGenerator_ooo.so
+lib/kde4/okularGenerator_plucker.so
+lib/kde4/okularGenerator_poppler.so
+lib/kde4/okularGenerator_tiff.so
+lib/kde4/okularGenerator_xps.so
+lib/kde4/okularpart.so
+lib/kde4/svgpart.so
+lib/libgwenviewlib.so
+lib/libgwenviewlib.so.5
+lib/libgwenviewlib.so.5.0.0
+lib/libkdcraw.so
+lib/libkdcraw.so.5
+lib/libkdcraw.so.5.0.0
+lib/libkdcraw5/CAMERALIST
+lib/libkdcraw5/kdcraw
+lib/libkexiv2.so
+lib/libkexiv2.so.6
+lib/libkexiv2.so.6.0.0
+lib/libkipi.so
+lib/libkipi.so.5
+lib/libkipi.so.5.0.0
+lib/libkolourpaint_lgpl.so
+lib/libkolourpaint_lgpl.so.5
+lib/libkolourpaint_lgpl.so.5.0.0
+lib/libksane.so
+lib/libksane.so.0
+lib/libksane.so.0.1.1
+lib/libokularcore.so
+lib/libokularcore.so.1
+lib/libokularcore.so.1.1.0
+lib/strigi/strigita_dvi.so
+libdata/pkgconfig/libkipi.pc
+libdata/pkgconfig/libkdcraw.pc
+libdata/pkgconfig/libkexiv2.pc
+libdata/pkgconfig/libksane.pc
+share/applications/kde4/gwenview.desktop
+share/applications/kde4/kcolorchooser.desktop
+share/applications/kde4/kolourpaint.desktop
+share/applications/kde4/kruler.desktop
+share/applications/kde4/ksnapshot.desktop
+share/applications/kde4/okular.desktop
+share/applications/kde4/okularApplication_chm.desktop
+share/applications/kde4/okularApplication_comicbook.desktop
+share/applications/kde4/okularApplication_epub.desktop
+share/applications/kde4/okularApplication_djvu.desktop
+share/applications/kde4/okularApplication_dvi.desktop
+share/applications/kde4/okularApplication_fb.desktop
+share/applications/kde4/okularApplication_ghostview.desktop
+share/applications/kde4/okularApplication_kimgio.desktop
+share/applications/kde4/okularApplication_ooo.desktop
+share/applications/kde4/okularApplication_pdf.desktop
+share/applications/kde4/okularApplication_plucker.desktop
+share/applications/kde4/okularApplication_tiff.desktop
+share/applications/kde4/okularApplication_xps.desktop
+share/apps/cmake/modules/FindKSane.cmake
+share/apps/cmake/modules/FindOkular.cmake
+share/apps/gvpart/gvpart-gwenview.rc
+share/apps/gvpart/gvpart.rc
+share/apps/gwenview/cursors/zoom.png
+share/apps/gwenview/fullscreenthemes/blackglass/checked.png
+share/apps/gwenview/fullscreenthemes/blackglass/scroll-left.png
+share/apps/gwenview/fullscreenthemes/blackglass/scroll-right.png
+share/apps/gwenview/fullscreenthemes/blackglass/style.css
+share/apps/gwenview/gwenviewui.rc
 share/apps/kgamma/pics/background.png
 share/apps/kgamma/pics/cmyscale.png
 share/apps/kgamma/pics/darkgrey.png
@@ -411,132 +139,97 @@ share/apps/kgamma/pics/greyscale.png
 share/apps/kgamma/pics/lightgrey.png
 share/apps/kgamma/pics/midgrey.png
 share/apps/kgamma/pics/rgbscale.png
-share/apps/kghostview/kghostviewui.rc
-share/apps/kghostview/kgv_part.rc
-share/apps/kghostview/pdf_sec.ps
-share/apps/kiconedit/kiconeditui.rc
-share/apps/kiconedit/pics/aim-cursor.xpm
-share/apps/kiconedit/pics/aim.png
-share/apps/kiconedit/pics/airbrush-cursor.xpm
-share/apps/kiconedit/pics/areaselect.png
-share/apps/kiconedit/pics/circle.png
-share/apps/kiconedit/pics/colorpicker-cursor.xpm
-share/apps/kiconedit/pics/compressed.png
-share/apps/kiconedit/pics/ellipse.png
-share/apps/kiconedit/pics/eraser-cursor.xpm
-share/apps/kiconedit/pics/fileclose.png
-share/apps/kiconedit/pics/fill-cursor.xpm
-share/apps/kiconedit/pics/filledcircle.png
-share/apps/kiconedit/pics/filledellipse.png
-share/apps/kiconedit/pics/filledrectangle.png
-share/apps/kiconedit/pics/grayscale.png
-share/apps/kiconedit/pics/grid.png
-share/apps/kiconedit/pics/kdepalette.png
-share/apps/kiconedit/pics/line.png
-share/apps/kiconedit/pics/paintbrush-cursor.xpm
-share/apps/kiconedit/pics/pointer.png
-share/apps/kiconedit/pics/rectangle.png
-share/apps/kiconedit/pics/selectcircle.png
-share/apps/kiconedit/pics/selectrect.png
-share/apps/kiconedit/pics/source.png
-share/apps/kiconedit/pics/standard.png
-share/apps/kiconedit/pics/transform.png
-share/apps/kiconedit/pics/window_new.png
-share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_brush.png
-share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_color_picker.png
-share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_color_washer.png
-share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_curve.png
-share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_ellipse.png
-share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_elliptical_selection.png
-share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_eraser.png
-share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_flood_fill.png
-share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_free_form_selection.png
-share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_line.png
-share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_pen.png
-share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_polygon.png
-share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_polyline.png
-share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_rect_selection.png
-share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_rectangle.png
-share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_rounded_rectangle.png
-share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_spraycan.png
-share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_text.png
-share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_brush.png
-share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_color_picker.png
-share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_color_washer.png
-share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_curve.png
-share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_ellipse.png
-share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_elliptical_selection.png
-share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_eraser.png
-share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_flood_fill.png
-share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_free_form_selection.png
-share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_line.png
-share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_pen.png
-share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_polygon.png
-share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_polyline.png
-share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_rect_selection.png
-share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_rectangle.png
-share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_rounded_rectangle.png
-share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_spraycan.png
-share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_text.png
-share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_brush.png
-share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_color_picker.png
-share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_color_washer.png
-share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_curve.png
-share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_ellipse.png
-share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_elliptical_selection.png
-share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_eraser.png
-share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_flood_fill.png
-share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_free_form_selection.png
-share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_line.png
-share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_pen.png
-share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_polygon.png
-share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_polyline.png
-share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_rect_selection.png
-share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_rectangle.png
-share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_rounded_rectangle.png
-share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_spraycan.png
-share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_text.png
-share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_brush.png
-share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_color_picker.png
-share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_color_washer.png
-share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_curve.png
-share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_ellipse.png
-share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_elliptical_selection.png
-share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_eraser.png
-share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_flood_fill.png
-share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_free_form_selection.png
-share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_line.png
-share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_pen.png
-share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_polygon.png
-share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_polyline.png
-share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_rect_selection.png
-share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_rectangle.png
-share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_rounded_rectangle.png
-share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_spraycan.png
-share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_text.png
-share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_brush.svgz
-share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_color_picker.svgz
-share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_color_washer.svgz
-share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_curve.svgz
-share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_ellipse.svgz
-share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_elliptical_selection.svgz
-share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_eraser.svgz
-share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_flood_fill.svgz
-share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_free_form_selection.svgz
-share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_line.svgz
-share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_pen.svgz
-share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_polygon.svgz
-share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_polyline.svgz
-share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_rect_selection.svgz
-share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_rectangle.svgz
-share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_rounded_rectangle.svgz
-share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_spraycan.svgz
-share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_text.svgz
-share/apps/kolourpaint/icons/hicolor/16x16/apps/kolourpaint.png
-share/apps/kolourpaint/icons/hicolor/22x22/apps/kolourpaint.png
-share/apps/kolourpaint/icons/hicolor/32x32/apps/kolourpaint.png
-share/apps/kolourpaint/icons/hicolor/48x48/apps/kolourpaint.png
-share/apps/kolourpaint/icons/hicolor/scalable/apps/kolourpaint.svgz
+share/apps/kipi/data/kipi-plugins_logo.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_brush.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_color_eraser.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_color_picker.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_curve.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_ellipse.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_elliptical_selection.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_eraser.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_flood_fill.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_free_form_selection.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_line.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_pen.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_polygon.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_polyline.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_rect_selection.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_rectangle.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_rounded_rectangle.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_spraycan.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_text.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_brush.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_color_eraser.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_color_picker.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_curve.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_ellipse.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_elliptical_selection.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_eraser.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_flood_fill.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_free_form_selection.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_line.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_pen.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_polygon.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_polyline.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_rect_selection.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_rectangle.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_rounded_rectangle.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_spraycan.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_text.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_brush.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_color_eraser.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_color_picker.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_curve.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_ellipse.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_elliptical_selection.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_eraser.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_flood_fill.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_free_form_selection.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_line.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_pen.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_polygon.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_polyline.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_rect_selection.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_rectangle.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_rounded_rectangle.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_spraycan.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_text.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_brush.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_color_eraser.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_color_picker.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_curve.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_ellipse.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_elliptical_selection.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_eraser.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_flood_fill.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_free_form_selection.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_line.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_pen.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_polygon.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_polyline.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_rect_selection.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_rectangle.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_rounded_rectangle.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_spraycan.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_text.png
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_brush.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_color_eraser.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_color_picker.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_curve.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_ellipse.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_elliptical_selection.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_eraser.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_flood_fill.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_free_form_selection.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_line.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_pen.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_polygon.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_polyline.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_rect_selection.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_rectangle.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_rounded_rectangle.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_spraycan.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_text.svgz
 share/apps/kolourpaint/kolourpaintui.rc
 share/apps/kolourpaint/pics/color_transparent_26x26.png
 share/apps/kolourpaint/pics/colorbutton_swap_16x16.png
@@ -552,425 +245,67 @@ share/apps/kolourpaint/pics/smooth_scale.png
 share/apps/kolourpaint/pics/tool_spraycan_17x17.png
 share/apps/kolourpaint/pics/tool_spraycan_29x29.png
 share/apps/kolourpaint/pics/tool_spraycan_9x9.png
-share/apps/konqueror/servicemenus/mrml-servicemenu.desktop
-share/apps/kpdf/shell.rc
-share/apps/kpdfpart/part.rc
-share/apps/kpovmodeler/baseinsertrules.xml
-share/apps/kpovmodeler/examples/includes/inlined/chars.kpm
-share/apps/kpovmodeler/examples/includes/inlined/finish.kpm
-share/apps/kpovmodeler/examples/includes/inlined/glass.kpm
-share/apps/kpovmodeler/examples/includes/inlined/golds.kpm
-share/apps/kpovmodeler/examples/includes/inlined/metals.kpm
-share/apps/kpovmodeler/examples/includes/inlined/shapes.kpm
-share/apps/kpovmodeler/examples/includes/inlined/shapes2.kpm
-share/apps/kpovmodeler/examples/includes/inlined/shapesq.kpm
-share/apps/kpovmodeler/examples/includes/inlined/skies.kpm
-share/apps/kpovmodeler/examples/includes/inlined/stars.kpm
-share/apps/kpovmodeler/examples/includes/inlined/stones1.kpm
-share/apps/kpovmodeler/examples/includes/inlined/stones2.kpm
-share/apps/kpovmodeler/examples/includes/inlined/textures.kpm
-share/apps/kpovmodeler/examples/includes/inlined/woods.kpm
-share/apps/kpovmodeler/examples/includes/original/chars.kpm
-share/apps/kpovmodeler/examples/includes/original/finish.kpm
-share/apps/kpovmodeler/examples/includes/original/glass.kpm
-share/apps/kpovmodeler/examples/includes/original/golds.kpm
-share/apps/kpovmodeler/examples/includes/original/metals.kpm
-share/apps/kpovmodeler/examples/includes/original/shapes.kpm
-share/apps/kpovmodeler/examples/includes/original/shapes2.kpm
-share/apps/kpovmodeler/examples/includes/original/shapesq.kpm
-share/apps/kpovmodeler/examples/includes/original/skies.kpm
-share/apps/kpovmodeler/examples/includes/original/stars.kpm
-share/apps/kpovmodeler/examples/includes/original/stones1.kpm
-share/apps/kpovmodeler/examples/includes/original/stones2.kpm
-share/apps/kpovmodeler/examples/includes/original/textures.kpm
-share/apps/kpovmodeler/examples/includes/original/woods.kpm
-share/apps/kpovmodeler/examples/scenes/advanced/ants.kpm
-share/apps/kpovmodeler/examples/scenes/advanced/bee.kpm
-share/apps/kpovmodeler/examples/scenes/advanced/ink.kpm
-share/apps/kpovmodeler/examples/scenes/advanced/table.kpm
-share/apps/kpovmodeler/examples/scenes/csg/cheese.kpm
-share/apps/kpovmodeler/examples/scenes/csg/emptybox.kpm
-share/apps/kpovmodeler/examples/scenes/csg/heightfield.kpm
-share/apps/kpovmodeler/examples/scenes/interior/cubes.kpm
-share/apps/kpovmodeler/examples/scenes/interior/media1.kpm
-share/apps/kpovmodeler/examples/scenes/interior/media2.kpm
-share/apps/kpovmodeler/examples/scenes/interior/media3.kpm
-share/apps/kpovmodeler/examples/scenes/interior/spheres.kpm
-share/apps/kpovmodeler/examples/scenes/lights/arealight.kpm
-share/apps/kpovmodeler/examples/scenes/lights/arealight2.kpm
-share/apps/kpovmodeler/examples/scenes/lights/spotlight.kpm
-share/apps/kpovmodeler/examples/scenes/objects/allobjects.kpm
-share/apps/kpovmodeler/examples/scenes/objects/fractals.kpm
-share/apps/kpovmodeler/examples/scenes/objects/lathe.kpm
-share/apps/kpovmodeler/examples/scenes/objects/prism.kpm
-share/apps/kpovmodeler/examples/scenes/objects/sor.kpm
-share/apps/kpovmodeler/examples/scenes/objects/superellipsoid.kpm
-share/apps/kpovmodeler/examples/scenes/objects/text.kpm
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmaddpoint.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmaddpointabove.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmaddsubprism.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmbicubicpatch.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmblendmapmodifiers.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmblob.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmblobcylinder.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmblobsphere.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmboundedby.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmbox.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmbumpmap.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmcamera.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmclippedby.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmcolorlist.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmcolormap.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmcolormapdeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmcomment.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmcone.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmcylinder.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdensity.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdensitydeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdensitylist.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdensitymap.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdensitymapdeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdialogview.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdifference.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdisc.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdrag.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmfinish.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmfinishdeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmfog.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmfogdeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmglobalphotons.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmglobalsettings.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmglview.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmheightfield.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmimagemap.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pminserterrors.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pminsertfirstchild.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pminsertlastchild.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pminsertsibling.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pminterior.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pminteriordeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pminteriortexture.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pminteriortexturedeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmintersection.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmisosurface.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmjuliafractal.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmlathe.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmlight.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmlightgroup.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmlistpattern.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmlookslike.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmaterial.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmaterialdeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmaterialmap.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmatrix.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmedia.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmediadeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmerge.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmesh.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmnormal.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmnormaldeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmnormallist.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmnormalmap.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmnormalmapdeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmobjectdeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmobjectlink.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmpattern.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmphotons.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmpigment.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmpigmentdeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmpigmentlist.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmpigmentmap.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmpigmentmapdeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmplane.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmpolynom.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmprism.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmprojectedthrough.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmquickcolor.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmradiosity.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmrainbow.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmrainbowdeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmraw.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmremovepoint.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmrender.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmrenderpreview.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmrendersettings.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmrotate.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmscale.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmscene.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmskysphere.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmskyspheredeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmslope.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmslopemap.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmslopemapdeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmsolidcolor.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmsor.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmsphere.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmspheresweep.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmsqe.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtext.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtexture.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtexturedeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtexturelist.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtexturemap.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtexturemapdeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtorus.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtranslate.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtreeview.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtriangle.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmunion.png
-share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmwarp.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmbicubicpatch.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmblendmapmodifiers.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmblob.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmblobcylinder.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmblobsphere.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmboundedby.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmbox.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmbumpmap.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmcamera.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmclippedby.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmcolorlist.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmcolormap.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmcolormapdeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmcomment.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmcone.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfigurecolors.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfiguredialogview.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfiguregraphicalview.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfiguregrid.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfigureobjectlibrary.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfigureobjects.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfigureopengl.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfigurepovray.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfiguretexturepreview.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfigureviewlayout.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmcylinder.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdensity.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdensitydeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdensitylist.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdensitymap.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdensitymapdeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdifference.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdisc.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdrag.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmfinish.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmfinishdeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmfog.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmfogdeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmglobalphotons.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmglobalsettings.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmheightfield.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmimagemap.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pminserterrors.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pminterior.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pminteriordeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pminteriortexture.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pminteriortexturedeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmintersection.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmisosurface.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmjuliafractal.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmlathe.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmlight.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmlightgroup.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmlistpattern.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmlookslike.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmaterial.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmaterialdeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmaterialmap.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmatrix.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmedia.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmediadeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmerge.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmesh.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmnormal.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmnormaldeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmnormallist.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmnormalmap.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmnormalmapdeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmobjectdeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmobjectlink.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmpattern.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmphotons.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmpigment.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmpigmentdeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmpigmentlist.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmpigmentmap.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmpigmentmapdeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmplane.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmpolynom.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmprism.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmprojectedthrough.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmquickcolor.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmradiosity.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmrainbow.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmrainbowdeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmraw.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmrender.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmrenderpreview.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmrendersettings.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmrotate.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmscale.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmscene.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmskysphere.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmskyspheredeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmslope.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmslopemap.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmslopemapdeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmsolidcolor.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmsor.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmsphere.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmspheresweep.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmsqe.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtext.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtexture.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtexturedeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtexturelist.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtexturemap.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtexturemapdeclare.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtorus.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtranslate.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtriangle.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmunion.png
-share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmwarp.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmaddpoint.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmaddpointabove.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmaddsubprism.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmbicubicpatch.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmblendmapmodifiers.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmblob.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmblobcylinder.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmblobsphere.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmboundedby.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmbox.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmbumpmap.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmcamera.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmclippedby.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmcomment.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmcone.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmcylinder.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmdeclare.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmdensity.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmdensitydeclare.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmdensitylist.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmdensitymap.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmdensitymapdeclare.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmdifference.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmdisc.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmdrag.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmfog.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmfogdeclare.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmglobalsettings.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmheightfield.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmimagemap.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pminserterrors.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pminsertfirstchild.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pminsertlastchild.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pminsertsibling.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmintersection.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmjuliafractal.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmlathe.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmlight.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmlistpattern.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmlookslike.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmmaterialmap.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmmatrix.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmmerge.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmobjectdeclare.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmobjectlink.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmpigment.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmpigmentdeclare.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmplane.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmpolynom.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmprism.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmquickcolor.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmrainbow.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmrainbowdeclare.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmraw.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmremovepoint.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmrender.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmrenderpreview.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmrendersettings.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmrotate.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmscale.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmscene.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmskysphere.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmskyspheredeclare.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmsolidcolor.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmsor.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmsphere.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmsqr.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmtext.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmtexture.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmtexturedeclare.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmtorus.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmtranslate.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmtriangle.png
-share/apps/kpovmodeler/icons/locolor/16x16/actions/pmunion.png
-share/apps/kpovmodeler/kpovmodelerbrowser.rc
-share/apps/kpovmodeler/kpovmodelershell.rc
-share/apps/kpovmodeler/kpovmodelerui.rc
-share/apps/kpovmodeler/povraydocmap.xml
-share/apps/kpovmodeler/questionmark.png
-share/apps/kruler/eventsrc
+share/apps/kruler/kruler.notifyrc
 share/apps/kruler/pics/kruler-east.png
 share/apps/kruler/pics/kruler-north.png
 share/apps/kruler/pics/kruler-south.png
 share/apps/kruler/pics/kruler-west.png
 share/apps/kruler/sounds/move.wav
-share/apps/ksvg/ksvgplugin.rc
-share/apps/kview/kpartplugins/kvieweffects.desktop
-share/apps/kview/kpartplugins/kvieweffects.rc
-share/apps/kview/kpartplugins/kviewpresenter.desktop
-share/apps/kview/kpartplugins/kviewpresenter.rc
-share/apps/kview/kpartplugins/kviewscanner.desktop
-share/apps/kview/kpartplugins/kviewscanner.rc
-share/apps/kview/kview.setdlg
-share/apps/kview/kviewui.rc
-share/apps/kviewerpart/icons/hicolor/16x16/actions/movetool.png
-share/apps/kviewerpart/icons/hicolor/16x16/actions/selectiontool.png
-share/apps/kviewerpart/icons/hicolor/22x22/actions/movetool.png
-share/apps/kviewerpart/icons/hicolor/22x22/actions/selectiontool.png
-share/apps/kviewerpart/icons/hicolor/32x32/actions/movetool.png
-share/apps/kviewerpart/icons/hicolor/48x48/actions/movetool.png
-share/apps/kviewerpart/kviewerpart.rc
-share/apps/kviewshell/kviewshell.rc
-share/apps/kviewviewer/kpartplugins/kviewbrowser.desktop
-share/apps/kviewviewer/kpartplugins/kviewbrowser.rc
-share/apps/kviewviewer/kviewpopup.rc
-share/apps/kviewviewer/kviewviewer.rc
-share/apps/kviewviewer/kviewviewer_ro.rc
-share/apps/photobook/photobookui.rc
-share/config.kcfg/djvumultipage.kcfg
-share/config.kcfg/kdvi.kcfg
-share/config.kcfg/kghostview.kcfg
-share/config.kcfg/kpdf.kcfg
-share/config.kcfg/kviewshell.kcfg
-share/doc/HTML/en/kcoloredit/common
-share/doc/HTML/en/kcoloredit/index.cache.bz2
-share/doc/HTML/en/kcoloredit/index.docbook
-share/doc/HTML/en/kdvi/KDVI-features.dvi
-share/doc/HTML/en/kdvi/KDVI-features.tex
-share/doc/HTML/en/kdvi/aboutkde.ps
-share/doc/HTML/en/kdvi/common
-share/doc/HTML/en/kdvi/index.cache.bz2
-share/doc/HTML/en/kdvi/index.docbook
-share/doc/HTML/en/kdvi/kdvi-search.el
-share/doc/HTML/en/kdvi/optionrequester1.png
-share/doc/HTML/en/kdvi/optionrequester2.png
-share/doc/HTML/en/kdvi/srcltx.sty
-share/doc/HTML/en/kdvi/srctex.sty
-share/doc/HTML/en/kgamma/common
-share/doc/HTML/en/kgamma/index.cache.bz2
-share/doc/HTML/en/kgamma/index.docbook
-share/doc/HTML/en/kghostview/common
-share/doc/HTML/en/kghostview/index.cache.bz2
-share/doc/HTML/en/kghostview/index.docbook
-share/doc/HTML/en/kiconedit/common
-share/doc/HTML/en/kiconedit/index.cache.bz2
-share/doc/HTML/en/kiconedit/index.docbook
-share/doc/HTML/en/kiconedit/kiconedit-configuration.png
+share/apps/libkdcraw/profiles/adobergb.icm
+share/apps/libkdcraw/profiles/applergb.icm
+share/apps/libkdcraw/profiles/prophoto.icm
+share/apps/libkdcraw/profiles/srgb-d65.icm
+share/apps/libkdcraw/profiles/srgb.icm
+share/apps/libkdcraw/profiles/widegamut.icm
+share/apps/okular/icons/hicolor/16x16/apps/okular-gv.png
+share/apps/okular/icons/hicolor/32x32/apps/okular-gv.png
+share/apps/okular/part.rc
+share/apps/okular/pics/checkmark.png
+share/apps/okular/pics/circle.png
+share/apps/okular/pics/comment.png
+share/apps/okular/pics/cross.png
+share/apps/okular/pics/help.png
+share/apps/okular/pics/insert.png
+share/apps/okular/pics/key.png
+share/apps/okular/pics/newparagraph.png
+share/apps/okular/pics/note.png
+share/apps/okular/pics/paperclip.png
+share/apps/okular/pics/paragraph.png
+share/apps/okular/pics/pushpin.png
+share/apps/okular/pics/rightarrow.png
+share/apps/okular/pics/rightpointer.png
+share/apps/okular/pics/star.png
+share/apps/okular/pics/tool-note-inline.png
+share/apps/okular/pics/tool-note.png
+share/apps/okular/pics/tool-stamp.png
+share/apps/okular/pics/tool_ellipse_okular.png
+share/apps/okular/pics/tool_hl_yellow.png
+share/apps/okular/pics/tool_ink_green.png
+share/apps/okular/pics/tool_line_okular.png
+share/apps/okular/pics/tool_note.png
+share/apps/okular/pics/tool_polygon_okular.png
+share/apps/okular/pics/uparrow.png
+share/apps/okular/pics/upleftarrow.png
+share/apps/okular/shell.rc
+share/apps/okular/tools.xml
+share/apps/svgpart/svgpart.rc
+share/config.kcfg/gssettings.kcfg
+share/config.kcfg/okular.kcfg
+share/config/okular.knsrc
+share/dbus-1/interfaces/org.kde.ksnapshot.xml
+share/doc/HTML/en/gwenview/browse_mode.png
+share/doc/HTML/en/gwenview/common
+share/doc/HTML/en/gwenview/fullscreen_mode.png
+share/doc/HTML/en/gwenview/index.cache.bz2
+share/doc/HTML/en/gwenview/index.docbook
+share/doc/HTML/en/gwenview/interface.docbook
+share/doc/HTML/en/gwenview/introduction.docbook
+share/doc/HTML/en/gwenview/keybindings.docbook
+share/doc/HTML/en/gwenview/mouse.docbook
+share/doc/HTML/en/gwenview/view_mode.png
+share/doc/HTML/en/kamera/common
+share/doc/HTML/en/kamera/index.cache.bz2
+share/doc/HTML/en/kamera/index.docbook
 share/doc/HTML/en/kolourpaint/brush_shapes.png
 share/doc/HTML/en/kolourpaint/color_box.png
 share/doc/HTML/en/kolourpaint/common
@@ -1023,62 +358,6 @@ share/doc/HTML/en/kolourpaint/tool_selections.png
 share/doc/HTML/en/kolourpaint/tool_spraycan.png
 share/doc/HTML/en/kolourpaint/tool_text.png
 share/doc/HTML/en/kolourpaint/view_thumbnails.png
-share/doc/HTML/en/kpdf/common
-share/doc/HTML/en/kpdf/configure.png
-share/doc/HTML/en/kpdf/index.cache.bz2
-share/doc/HTML/en/kpdf/index.docbook
-share/doc/HTML/en/kpovmodeler/cameraview.png
-share/doc/HTML/en/kpovmodeler/common
-share/doc/HTML/en/kpovmodeler/controlpoints.png
-share/doc/HTML/en/kpovmodeler/cr22-action-pmcamera.png
-share/doc/HTML/en/kpovmodeler/cr22-action-pmcolorlist.png
-share/doc/HTML/en/kpovmodeler/cr22-action-pmfinish.png
-share/doc/HTML/en/kpovmodeler/cr22-action-pminterior.png
-share/doc/HTML/en/kpovmodeler/cr22-action-pmlight.png
-share/doc/HTML/en/kpovmodeler/cr22-action-pmpigment.png
-share/doc/HTML/en/kpovmodeler/cr22-action-pmplane.png
-share/doc/HTML/en/kpovmodeler/cr22-action-pmrender.png
-share/doc/HTML/en/kpovmodeler/cr22-action-pmsolidcolor.png
-share/doc/HTML/en/kpovmodeler/cr22-action-pmsphere.png
-share/doc/HTML/en/kpovmodeler/defaultviewlayout.png
-share/doc/HTML/en/kpovmodeler/dockwidget.png
-share/doc/HTML/en/kpovmodeler/dockwidgettab.png
-share/doc/HTML/en/kpovmodeler/index.cache.bz2
-share/doc/HTML/en/kpovmodeler/index.docbook
-share/doc/HTML/en/kpovmodeler/insertaspopup.png
-share/doc/HTML/en/kpovmodeler/objectpropertiesview.png
-share/doc/HTML/en/kpovmodeler/objecttree.png
-share/doc/HTML/en/kpovmodeler/rendericon.png
-share/doc/HTML/en/kpovmodeler/rendermodeoutput.png
-share/doc/HTML/en/kpovmodeler/rendermodequality.png
-share/doc/HTML/en/kpovmodeler/rendermodesize.png
-share/doc/HTML/en/kpovmodeler/rendermodesselection.png
-share/doc/HTML/en/kpovmodeler/rendermodestoolbar.png
-share/doc/HTML/en/kpovmodeler/rendersettingsicon.png
-share/doc/HTML/en/kpovmodeler/renderwindow.png
-share/doc/HTML/en/kpovmodeler/texturepreview.png
-share/doc/HTML/en/kpovmodeler/topview.png
-share/doc/HTML/en/kpovmodeler/tutorial01-camera-dialog.png
-share/doc/HTML/en/kpovmodeler/tutorial01-camera-graphic.png
-share/doc/HTML/en/kpovmodeler/tutorial01-final-render.png
-share/doc/HTML/en/kpovmodeler/tutorial01-ground-color-list.png
-share/doc/HTML/en/kpovmodeler/tutorial01-ground-pigment.png
-share/doc/HTML/en/kpovmodeler/tutorial01-ground-render.png
-share/doc/HTML/en/kpovmodeler/tutorial01-ground-solid-color-1.png
-share/doc/HTML/en/kpovmodeler/tutorial01-ground-solid-color-2.png
-share/doc/HTML/en/kpovmodeler/tutorial01-ground-wrong-colors-render.png
-share/doc/HTML/en/kpovmodeler/tutorial01-light-dialog.png
-share/doc/HTML/en/kpovmodeler/tutorial01-light-graphic.png
-share/doc/HTML/en/kpovmodeler/tutorial01-plane-dialog.png
-share/doc/HTML/en/kpovmodeler/tutorial01-plane-graphic.png
-share/doc/HTML/en/kpovmodeler/tutorial01-plane-tree-expanded.png
-share/doc/HTML/en/kpovmodeler/tutorial01-plane-tree-translate.png
-share/doc/HTML/en/kpovmodeler/tutorial01-sphere-dialog.png
-share/doc/HTML/en/kpovmodeler/tutorial01-sphere-finish-dialog.png
-share/doc/HTML/en/kpovmodeler/tutorial01-sphere-render-finish.png
-share/doc/HTML/en/kpovmodeler/tutorial01-sphere-render-nocolor.png
-share/doc/HTML/en/kpovmodeler/tutorial01-sphere-render-solidcolor.png
-share/doc/HTML/en/kpovmodeler/tutorial01-sphere-solid-color.png
 share/doc/HTML/en/kruler/common
 share/doc/HTML/en/kruler/index.cache.bz2
 share/doc/HTML/en/kruler/index.docbook
@@ -1087,225 +366,179 @@ share/doc/HTML/en/ksnapshot/index.cache.bz2
 share/doc/HTML/en/ksnapshot/index.docbook
 share/doc/HTML/en/ksnapshot/preview.png
 share/doc/HTML/en/ksnapshot/window.png
-share/doc/HTML/en/kview/common
-share/doc/HTML/en/kview/index.cache.bz2
-share/doc/HTML/en/kview/index.docbook
-share/doc/HTML/en/kview/kview-application-configuration.png
-share/doc/HTML/en/kview/kview-viewer-configuration.png
-share/icons/crystalsvg/16x16/apps/kviewshell.png
-share/icons/crystalsvg/16x16/apps/photobook.png
-share/icons/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png
-share/icons/crystalsvg/22x22/apps/photobook.png
-share/icons/crystalsvg/32x32/apps/kviewshell.png
-share/icons/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
-share/icons/crystalsvg/48x48/apps/kviewshell.png
-share/icons/crystalsvg/48x48/mimetypes/kpovmodeler_doc.png
-share/icons/hicolor/128x128/apps/kghostview.png
-share/icons/hicolor/128x128/apps/kpdf.png
+share/doc/HTML/en/okular/common
+share/doc/HTML/en/okular/configure.png
+share/doc/HTML/en/okular/embedded-files-bar.png
+share/doc/HTML/en/okular/index.cache.bz2
+share/doc/HTML/en/okular/index.docbook
+share/icons/hicolor/128x128/apps/gwenview.png
+share/icons/hicolor/128x128/apps/kdcraw.png
+share/icons/hicolor/128x128/apps/kipi.png
+share/icons/hicolor/128x128/apps/kruler.png
+share/icons/hicolor/128x128/apps/okular.png
+share/icons/hicolor/16x16/actions/black-white.png
+share/icons/hicolor/16x16/actions/color.png
+share/icons/hicolor/16x16/actions/gray-scale.png
+share/icons/hicolor/16x16/apps/gwenview.png
 share/icons/hicolor/16x16/apps/kcolorchooser.png
-share/icons/hicolor/16x16/apps/kcoloredit.png
-share/icons/hicolor/16x16/apps/kdvi.png
-share/icons/hicolor/16x16/apps/kfax.png
-share/icons/hicolor/16x16/apps/kfaxview.png
 share/icons/hicolor/16x16/apps/kgamma.png
-share/icons/hicolor/16x16/apps/kghostview.png
-share/icons/hicolor/16x16/apps/kiconedit.png
+share/icons/hicolor/16x16/apps/kipi.png
 share/icons/hicolor/16x16/apps/kolourpaint.png
-share/icons/hicolor/16x16/apps/kpdf.png
-share/icons/hicolor/16x16/apps/kpovmodeler.png
 share/icons/hicolor/16x16/apps/kruler.png
 share/icons/hicolor/16x16/apps/ksnapshot.png
-share/icons/hicolor/16x16/apps/kview.png
+share/icons/hicolor/16x16/apps/okular.png
+share/icons/hicolor/22x22/apps/gwenview.png
 share/icons/hicolor/22x22/apps/kcolorchooser.png
-share/icons/hicolor/22x22/apps/kdvi.png
-share/icons/hicolor/22x22/apps/kfax.png
-share/icons/hicolor/22x22/apps/kfaxview.png
-share/icons/hicolor/22x22/apps/kghostview.png
-share/icons/hicolor/22x22/apps/kiconedit.png
+share/icons/hicolor/22x22/apps/kipi.png
 share/icons/hicolor/22x22/apps/kolourpaint.png
-share/icons/hicolor/22x22/apps/kpdf.png
-share/icons/hicolor/22x22/apps/kpovmodeler.png
 share/icons/hicolor/22x22/apps/kruler.png
 share/icons/hicolor/22x22/apps/ksnapshot.png
-share/icons/hicolor/22x22/apps/kview.png
-share/icons/hicolor/32x32/apps/kcoloredit.png
-share/icons/hicolor/32x32/apps/kdvi.png
-share/icons/hicolor/32x32/apps/kfax.png
-share/icons/hicolor/32x32/apps/kfaxview.png
+share/icons/hicolor/22x22/apps/okular.png
+share/icons/hicolor/32x32/apps/gwenview.png
+share/icons/hicolor/32x32/apps/kdcraw.png
 share/icons/hicolor/32x32/apps/kgamma.png
-share/icons/hicolor/32x32/apps/kghostview.png
-share/icons/hicolor/32x32/apps/kiconedit.png
+share/icons/hicolor/32x32/apps/kipi.png
 share/icons/hicolor/32x32/apps/kolourpaint.png
-share/icons/hicolor/32x32/apps/kpdf.png
-share/icons/hicolor/32x32/apps/kpovmodeler.png
 share/icons/hicolor/32x32/apps/kruler.png
 share/icons/hicolor/32x32/apps/ksnapshot.png
-share/icons/hicolor/32x32/apps/kview.png
-share/icons/hicolor/48x48/apps/kdvi.png
-share/icons/hicolor/48x48/apps/kfax.png
-share/icons/hicolor/48x48/apps/kfaxview.png
+share/icons/hicolor/32x32/apps/okular.png
+share/icons/hicolor/48x48/apps/gwenview.png
+share/icons/hicolor/48x48/apps/kdcraw.png
 share/icons/hicolor/48x48/apps/kgamma.png
-share/icons/hicolor/48x48/apps/kghostview.png
-share/icons/hicolor/48x48/apps/kiconedit.png
+share/icons/hicolor/48x48/apps/kipi.png
 share/icons/hicolor/48x48/apps/kolourpaint.png
-share/icons/hicolor/48x48/apps/kpdf.png
-share/icons/hicolor/48x48/apps/kpovmodeler.png
 share/icons/hicolor/48x48/apps/kruler.png
 share/icons/hicolor/48x48/apps/ksnapshot.png
-share/icons/hicolor/48x48/apps/kview.png
-share/icons/hicolor/64x64/apps/kghostview.png
-share/icons/hicolor/64x64/apps/kpdf.png
-share/icons/hicolor/scalable/apps/kdvi.svgz
-share/icons/hicolor/scalable/apps/kfax.svgz
-share/icons/hicolor/scalable/apps/kfaxview.svgz
+share/icons/hicolor/48x48/apps/okular.png
+share/icons/hicolor/64x64/apps/gwenview.png
+share/icons/hicolor/64x64/apps/kdcraw.png
+share/icons/hicolor/64x64/apps/kruler.png
+share/icons/hicolor/64x64/apps/okular.png
+share/icons/hicolor/scalable/apps/gwenview.svgz
 share/icons/hicolor/scalable/apps/kolourpaint.svgz
-share/icons/hicolor/scalable/apps/kpdf.svgz
+share/icons/hicolor/scalable/apps/kruler.svgz
 share/icons/hicolor/scalable/apps/ksnapshot.svgz
-share/mimelnk/text/mrml.desktop
-share/services/djvumultipage.desktop
-share/services/emptymultipage.desktop
-share/services/gsthumbnail.desktop
-share/services/kconfiguredialog/kviewcanvasconfig.desktop
-share/services/kconfiguredialog/kviewgeneralconfig.desktop
-share/services/kconfiguredialog/kviewpluginsconfig.desktop
-share/services/kconfiguredialog/kviewviewerpluginsconfig.desktop
-share/services/kded/daemonwatcher.desktop
-share/services/kdvimultipage.desktop
-share/services/kfaxmultipage.desktop
-share/services/kfaxmultipage_tiff.desktop
-share/services/kfile_bmp.desktop
-share/services/kfile_dds.desktop
-share/services/kfile_dvi.desktop
-share/services/kfile_exr.desktop
-share/services/kfile_gif.desktop
-share/services/kfile_ico.desktop
-share/services/kfile_jpeg.desktop
-share/services/kfile_pcx.desktop
-share/services/kfile_pdf.desktop
-share/services/kfile_png.desktop
-share/services/kfile_pnm.desktop
-share/services/kfile_ps.desktop
-share/services/kfile_raw.desktop
-share/services/kfile_rgb.desktop
-share/services/kfile_tga.desktop
-share/services/kfile_tiff.desktop
-share/services/kfile_xbm.desktop
-share/services/kfile_xpm.desktop
-share/services/kghostview_part.desktop
-share/services/kpdf_part.desktop
-share/services/ksvglibartcanvas.desktop
-share/services/ksvgplugin.desktop
-share/services/kviewcanvas.desktop
-share/services/kviewviewer.desktop
-share/services/mrml.protocol
-share/services/mrml_part.desktop
-share/services/photobook.desktop
-share/services/svgthumbnail.desktop
-share/servicetypes/kimageviewer.desktop
-share/servicetypes/kimageviewercanvas.desktop
-share/servicetypes/kmultipage.desktop
-share/servicetypes/ksvgrenderer.desktop
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdegraphics-apidocs/kviewshell/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdegraphics-apidocs/kviewshell/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdegraphics-apidocs/kfaxview/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdegraphics-apidocs/kfaxview/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdegraphics-apidocs/kviewshell/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdegraphics-apidocs/kfaxview/html
-@dirrm share/services/kconfiguredialog
-@dirrm share/doc/HTML/en/kview
+share/icons/hicolor/scalable/apps/okular.svgz
+share/kde4/services/ServiceMenus/slideshow.desktop
+share/kde4/services/camera.protocol
+share/kde4/services/gsthumbnail.desktop
+share/kde4/services/gvpart.desktop
+share/kde4/services/kamera.desktop
+share/kde4/services/kgamma.desktop
+share/kde4/services/ksane_scan_service.desktop
+share/kde4/services/libokularGenerator_chmlib.desktop
+share/kde4/services/libokularGenerator_comicbook.desktop
+share/kde4/services/libokularGenerator_epub.desktop
+share/kde4/services/libokularGenerator_djvu.desktop
+share/kde4/services/libokularGenerator_dvi.desktop
+share/kde4/services/libokularGenerator_fb.desktop
+share/kde4/services/libokularGenerator_ghostview.desktop
+share/kde4/services/libokularGenerator_kimgio.desktop
+share/kde4/services/libokularGenerator_ooo.desktop
+share/kde4/services/libokularGenerator_plucker.desktop
+share/kde4/services/libokularGenerator_poppler.desktop
+share/kde4/services/libokularGenerator_tiff.desktop
+share/kde4/services/libokularGenerator_xps.desktop
+share/kde4/services/msits.protocol
+share/kde4/services/okularChm.desktop
+share/kde4/services/okularComicbook.desktop
+share/kde4/services/okularEPub.desktop
+share/kde4/services/okularDjvu.desktop
+share/kde4/services/okularDvi.desktop
+share/kde4/services/okularFb.desktop
+share/kde4/services/okularGhostview.desktop
+share/kde4/services/okularKimgio.desktop
+share/kde4/services/okularOoo.desktop
+share/kde4/services/okularPlucker.desktop
+share/kde4/services/okularPoppler.desktop
+share/kde4/services/okularTiff.desktop
+share/kde4/services/okularXps.desktop
+share/kde4/services/okular_part.desktop
+share/kde4/services/svgpart.desktop
+share/kde4/servicetypes/kipiplugin.desktop
+share/kde4/servicetypes/okularGenerator.desktop
+@dirrmtry share/kde4/servicetypes
+@dirrmtry share/kde4/services/ServiceMenus
+@dirrmtry share/kde4/services
+@dirrmtry share/kde4
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16/actions
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrm share/doc/HTML/en/okular
 @dirrm share/doc/HTML/en/ksnapshot
 @dirrm share/doc/HTML/en/kruler
-@dirrm share/doc/HTML/en/kpovmodeler
-@dirrm share/doc/HTML/en/kpdf
 @dirrm share/doc/HTML/en/kolourpaint
-@dirrm share/doc/HTML/en/kiconedit
-@dirrm share/doc/HTML/en/kghostview
-@dirrm share/doc/HTML/en/kgamma
-@dirrm share/doc/HTML/en/kdvi
-@dirrm share/doc/HTML/en/kdegraphics-apidocs/kviewshell/html
-@dirrm share/doc/HTML/en/kdegraphics-apidocs/kviewshell
-@dirrm share/doc/HTML/en/kdegraphics-apidocs/kfaxview/html
-@dirrm share/doc/HTML/en/kdegraphics-apidocs/kfaxview
-@dirrm share/doc/HTML/en/kdegraphics-apidocs
-@dirrm share/doc/HTML/en/kcoloredit
-@dirrm share/apps/photobook
-@dirrm share/apps/kviewviewer/kpartplugins
-@dirrm share/apps/kviewviewer
-@dirrm share/apps/kviewshell
-@dirrm share/apps/kviewerpart/icons/hicolor/48x48/actions
-@dirrm share/apps/kviewerpart/icons/hicolor/48x48
-@dirrm share/apps/kviewerpart/icons/hicolor/32x32/actions
-@dirrm share/apps/kviewerpart/icons/hicolor/32x32
-@dirrm share/apps/kviewerpart/icons/hicolor/22x22/actions
-@dirrm share/apps/kviewerpart/icons/hicolor/22x22
-@dirrm share/apps/kviewerpart/icons/hicolor/16x16/actions
-@dirrm share/apps/kviewerpart/icons/hicolor/16x16
-@dirrm share/apps/kviewerpart/icons/hicolor
-@dirrm share/apps/kviewerpart/icons
-@dirrm share/apps/kviewerpart
-@dirrm share/apps/kview/kpartplugins
-@dirrm share/apps/kview
-@dirrm share/apps/ksvg
+@dirrm share/doc/HTML/en/kamera
+@dirrm share/doc/HTML/en/gwenview
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
+@dirrmtry share/doc
+@dirrmtry share/dbus-1/interfaces
+@dirrmtry share/dbus-1
+@dirrmtry share/config.kcfg
+@dirrmtry share/config
+@dirrmtry share/apps/svgpart
+@dirrm share/apps/okular/pics
+@dirrm share/apps/okular/icons/hicolor/32x32/apps
+@dirrm share/apps/okular/icons/hicolor/32x32
+@dirrm share/apps/okular/icons/hicolor/16x16/apps
+@dirrm share/apps/okular/icons/hicolor/16x16
+@dirrm share/apps/okular/icons/hicolor
+@dirrm share/apps/okular/icons
+@dirrm share/apps/okular
+@dirrm share/apps/libkdcraw/profiles
+@dirrm share/apps/libkdcraw
 @dirrm share/apps/kruler/sounds
 @dirrm share/apps/kruler/pics
 @dirrm share/apps/kruler
-@dirrm share/apps/kpovmodeler/icons/locolor/16x16/actions
-@dirrm share/apps/kpovmodeler/icons/locolor/16x16
-@dirrm share/apps/kpovmodeler/icons/locolor
-@dirrm share/apps/kpovmodeler/icons/crystalsvg/22x22/actions
-@dirrm share/apps/kpovmodeler/icons/crystalsvg/22x22
-@dirrm share/apps/kpovmodeler/icons/crystalsvg/16x16/actions
-@dirrm share/apps/kpovmodeler/icons/crystalsvg/16x16
-@dirrm share/apps/kpovmodeler/icons/crystalsvg
-@dirrm share/apps/kpovmodeler/icons
-@dirrm share/apps/kpovmodeler/examples/scenes/objects
-@dirrm share/apps/kpovmodeler/examples/scenes/lights
-@dirrm share/apps/kpovmodeler/examples/scenes/interior
-@dirrm share/apps/kpovmodeler/examples/scenes/csg
-@dirrm share/apps/kpovmodeler/examples/scenes/advanced
-@dirrm share/apps/kpovmodeler/examples/scenes
-@dirrm share/apps/kpovmodeler/examples/includes/original
-@dirrm share/apps/kpovmodeler/examples/includes/inlined
-@dirrm share/apps/kpovmodeler/examples/includes
-@dirrm share/apps/kpovmodeler/examples
-@dirrm share/apps/kpovmodeler
-@dirrm share/apps/kpdfpart
-@dirrm share/apps/kpdf
 @dirrm share/apps/kolourpaint/pics
-@dirrm share/apps/kolourpaint/icons/hicolor/scalable/apps
+@dirrm share/apps/kolourpaint/icons/hicolor/scalable/actions
 @dirrm share/apps/kolourpaint/icons/hicolor/scalable
-@dirrm share/apps/kolourpaint/icons/hicolor/48x48/apps
+@dirrm share/apps/kolourpaint/icons/hicolor/48x48/actions
 @dirrm share/apps/kolourpaint/icons/hicolor/48x48
-@dirrm share/apps/kolourpaint/icons/hicolor/32x32/apps
+@dirrm share/apps/kolourpaint/icons/hicolor/32x32/actions
 @dirrm share/apps/kolourpaint/icons/hicolor/32x32
-@dirrm share/apps/kolourpaint/icons/hicolor/22x22/apps
+@dirrm share/apps/kolourpaint/icons/hicolor/22x22/actions
 @dirrm share/apps/kolourpaint/icons/hicolor/22x22
-@dirrm share/apps/kolourpaint/icons/hicolor/16x16/apps
+@dirrm share/apps/kolourpaint/icons/hicolor/16x16/actions
 @dirrm share/apps/kolourpaint/icons/hicolor/16x16
 @dirrm share/apps/kolourpaint/icons/hicolor
-@dirrm share/apps/kolourpaint/icons/crystalsvg/scalable/actions
-@dirrm share/apps/kolourpaint/icons/crystalsvg/scalable
-@dirrm share/apps/kolourpaint/icons/crystalsvg/48x48/actions
-@dirrm share/apps/kolourpaint/icons/crystalsvg/48x48
-@dirrm share/apps/kolourpaint/icons/crystalsvg/32x32/actions
-@dirrm share/apps/kolourpaint/icons/crystalsvg/32x32
-@dirrm share/apps/kolourpaint/icons/crystalsvg/22x22/actions
-@dirrm share/apps/kolourpaint/icons/crystalsvg/22x22
-@dirrm share/apps/kolourpaint/icons/crystalsvg/16x16/actions
-@dirrm share/apps/kolourpaint/icons/crystalsvg/16x16
-@dirrm share/apps/kolourpaint/icons/crystalsvg
 @dirrm share/apps/kolourpaint/icons
 @dirrm share/apps/kolourpaint
-@dirrm share/apps/kiconedit/pics
-@dirrm share/apps/kiconedit
-@dirrm share/apps/kghostview
+@dirrm share/apps/kipi/data
+@dirrm share/apps/kipi
 @dirrm share/apps/kgamma/pics
 @dirrm share/apps/kgamma
-@dirrm share/apps/kfaxview
-@dirrm share/apps/kfax/pics
-@dirrm share/apps/kfax
-@dirrm share/apps/kdvi
-@dirrm share/apps/kcoloredit
-@dirrm include/libtext2path-0.1
-@dirrm include/kviewshell
-@dirrm include/ksvg
+@dirrm share/apps/gwenview/fullscreenthemes/blackglass
+@dirrm share/apps/gwenview/fullscreenthemes
+@dirrm share/apps/gwenview/cursors
+@dirrm share/apps/gwenview
+@dirrm share/apps/gvpart
+@dirrmtry share/apps/cmake/modules
+@dirrmtry share/apps/cmake
+@dirrmtry share/apps
+@dirrmtry share/applications/kde4
+@dirrmtry share/applications
+@dirrmtry lib/strigi
+@dirrm lib/libkdcraw5
+@dirrm include/okular/interfaces
+@dirrm include/okular/core
+@dirrm include/okular
+@dirrm include/libksane
+@dirrm include/libkipi
+@dirrm include/libkexiv2
+@dirrm include/libkdcraw