diff -Nru kdegraphics-4.1.0/cmake/modules/FindEPub.cmake kdegraphics-4.1.1/cmake/modules/FindEPub.cmake
--- kdegraphics-4.1.0/cmake/modules/FindEPub.cmake	2008-04-10 10:29:56.000000000 +0100
+++ kdegraphics-4.1.1/cmake/modules/FindEPub.cmake	2008-08-28 09:06:53.000000000 +0100
@@ -20,7 +20,7 @@
 else (EPUB_INCLUDE_DIR AND EPUB_LIBRARIES)
 
   find_library (EPUB_LIBRARIES
-    NAMES epub
+    NAMES epub libepub
   )
 
   find_path (EPUB_INCLUDE_DIR
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/cmake/modules/FindLibSpectre.cmake /tmp/t1fz2IbI5G/kdegraphics-4.1.1/cmake/modules/FindLibSpectre.cmake
--- kdegraphics-4.1.0/cmake/modules/FindLibSpectre.cmake	2008-05-07 10:05:17.000000000 +0100
+++ kdegraphics-4.1.1/cmake/modules/FindLibSpectre.cmake	2008-08-28 09:06:53.000000000 +0100
@@ -36,6 +36,13 @@
         set(LIBSPECTRE_FOUND TRUE)
      endif(_return_VALUE STREQUAL "0")
    endif(_SpectreLinkFlags)
+else(NOT WIN32)
+    # do not use pkg-config on windows
+    find_library(_SpectreLinkFlags NAMES libspectre spectre PATHS ${CMAKE_LIBRARY_PATH})
+
+    find_path(LIBSPECTRE_INCLUDE_DIR spectre.h PATH_SUFFIXES libspectre )
+
+    set(LIBSPECTRE_FOUND TRUE)
 endif(NOT WIN32)
 
 if (LIBSPECTRE_FOUND)
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/debian/cdbs/control.mk /tmp/t1fz2IbI5G/kdegraphics-4.1.1/debian/cdbs/control.mk
--- kdegraphics-4.1.0/debian/cdbs/control.mk	2008-09-02 01:12:15.000000000 +0100
+++ kdegraphics-4.1.1/debian/cdbs/control.mk	1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-include debian/cdbs/versions.mk
-debian/control: debian/control.tmp
-	mv debian/control.tmp debian/control
-
-debian/control.tmp: update-versions
-
-update-versions: debian/control.in
-	sed "s/CDBS_MIN_VER/$(CDBS_MIN_VER)/;\
-	     s/QUILT_MIN_VER/$(QUILT_MIN_VER)/;\
-	     s/CMAKE_MIN_VER/$(CMAKE_MIN_VER)/;\
-	     s/KDELIBS_VERSION/$(KDELIBS_VERSION)/;\
-	     s/KDELIBS_UPSTREAM_VERSION/$(KDELIBS_UPSTREAM_VERSION)/;\
-	     s/KDELIBS_SOURCE_VERSION/$(KDELIBS_SOURCE_VERSION)/;\
-	     s/KDEPIMLIBS_VERSION/$(KDEPIMLIBS_VERSION)/;\
-	     s/KDEPIMLIBS_SOURCE_VERSION/$(KDEPIMLIBS_SOURCE_VERSION)/;\
-	     s/KDEPIMLIBS_UPSTREAM_VERSION/$(KDEPIMLIBS_UPSTREAM_VERSION)/;\
-	     " debian/control.in > debian/control.tmp
-
-.PHONY: update-versions
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/debian/cdbs/dh_sameversiondeps /tmp/t1fz2IbI5G/kdegraphics-4.1.1/debian/cdbs/dh_sameversiondeps
--- kdegraphics-4.1.0/debian/cdbs/dh_sameversiondeps	2008-09-02 01:12:15.000000000 +0100
+++ kdegraphics-4.1.1/debian/cdbs/dh_sameversiondeps	1970-01-01 01:00:00.000000000 +0100
@@ -1,140 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use Dpkg::Control;
-use Dpkg::Substvars;
-use Dpkg::ErrorHandling;
-use File::Copy;
-
-use Debian::Debhelper::Dh_Lib;
-
-my $namespace = "sameVersionDep";
-my @fields = qw(Depends Recommends Suggests Enhances Pre-Depends);
-my $re_fields = join("|", @fields);
-my $re_pkgname = qr/[a-z0-9][a-z0-9+.-]*/;
-my $re_oursubstvar = qr/\$\{($namespace:($re_pkgname):($re_pkgname)-($re_fields)-($re_pkgname))\}/;
-
-# Global substvars file
-my $g_substvars = new Dpkg::Substvars;
-$g_substvars->parse("debian/substvars") if (-r "debian/substvars");
-
-sub Shlibsvars::new {
-    my ($cls, $package, $control, $substvars_file) = @_;
-    my $self = bless ( {
-        "package" => $package,
-        "control" => $control,
-        "file" => $substvars_file,
-        }, $cls);
-    $self->{substvars} = new Dpkg::Substvars;
-    if (-r $self->{file}) {
-        $self->{substvars}->parse($self->{file});
-    }
-    return $self;
-}
-
-sub Shlibsvars::get_fieldval {
-    my ($self, $field) = @_;
-
-    my $pkg = $self->{control}->get_pkg_by_name($self->{package});
-    return undef if (!defined $pkg || !exists $pkg->{$field});
-
-    # Turn of warnings for substvars runs
-    my $save_quiet = $Dpkg::ErrorHandling::quiet_warnings;
-    $Dpkg::ErrorHandling::quiet_warnings = 1;
-
-    my $val = $pkg->{$field};
-    $val = $self->{substvars}->substvars($val);
-    $val = $g_substvars->substvars($val);
-
-    $Dpkg::ErrorHandling::quiet_warnings = $save_quiet;
-    return $val;
-}
-
-sub Shlibsvars::extract_deps {
-    my ($self, $field, $deppkg) = @_;
-
-    my $val = $self->get_fieldval($field);
-    return undef() unless defined $val;
-
-    # Extract dependency fields we need
-    my @matched_deps;
-    for my $dep (split(/\s*,\s*/, $val)) {
-        if ($dep =~ /^\Q$deppkg\E(?:$|[\W])/) {
-            push @matched_deps, $dep;
-        }
-    }
-    return join(",", @matched_deps);
-}
-
-sub write_substvar($$$$) {
-    my ($pkgname, $varname, $value, $substvars) = @_;
-    my @contents;
-    my $varset = 0;
-
-    my $file = (-r $substvars) ? $substvars : "debian/substvars";
-    if (-r $file) {
-        open(FILE, "<$file") or die "Unable to open substvars file '$file' for reading\n";
-        while (<FILE>) {
-            if (!$varset && /^\s*\Q$varname=\E/) {
-                push @contents, "$varname=$value\n";
-                $varset = 1;
-            } else {
-                push @contents, $_;
-            }
-        }
-        close(FILE);
-    } else {
-        # Fallback to default
-        $file = $substvars;
-    }
-
-    open(FILE, ">$file.tmp") or die "Unable to open substvars file '$file.tmp' for writing\n";
-    for (@contents) {
-        print FILE $_;
-    }
-    if (!$varset) {
-        print FILE "$varname=$value", "\n";
-    }
-    close(FILE);
-
-    File::Copy::move("$file.tmp", "$file");
-}
-
-init();
-
-my $control = new Dpkg::Control;
-my %shlibsvars;
-
-foreach my $package (@{$dh{DOPACKAGES}}) {
-    my $pkg_substvars = sprintf("debian/%ssubstvars", pkgext($package));
-    my $pkg = $control->get_pkg_by_name($package);
-
-    for my $fieldname (@fields) {
-        if (exists $pkg->{$fieldname}) {
-            my $fieldval = $pkg->{$fieldname};
-            my $pkgname = $pkg->{Package};
-
-            while ($fieldval =~ m/\G.*?$re_oursubstvar/gs) {
-                my $varname = $1;
-                my $dep2add = $2;
-                my $basepkg = $3;
-                my $deptype = $4;
-                my $deppkg  = $5;
-
-                if (!exists $shlibsvars{$basepkg}) {
-                    my $base_substvars = sprintf("debian/%ssubstvars", pkgext($basepkg));
-                    $shlibsvars{$basepkg} = new Shlibsvars($basepkg, $control, $base_substvars);
-                }
-                my $vars = $shlibsvars{$basepkg};
-                my $deps = $vars->extract_deps($deptype, $deppkg);
-                $deps = "" unless($deps);
-                $deps =~ s/\b\Q$deppkg\E\b/$dep2add/g;
-
-                # Write substvar for the package
-                write_substvar($pkgname, $varname, $deps, $pkg_substvars);
-            }
-        }
-    }
-}
-
-exit 0
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/debian/cdbs/kde.mk /tmp/t1fz2IbI5G/kdegraphics-4.1.1/debian/cdbs/kde.mk
--- kdegraphics-4.1.0/debian/cdbs/kde.mk	2008-09-02 01:12:15.000000000 +0100
+++ kdegraphics-4.1.1/debian/cdbs/kde.mk	1970-01-01 01:00:00.000000000 +0100
@@ -1,108 +0,0 @@
-include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/utils.mk
-
-DEB_CONFIG_INSTALL_DIR ?= /usr/share/kde4/config
-
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-DEB_CMAKE_EXTRA_FLAGS += \
-			-DCMAKE_BUILD_TYPE=Debian \
-			$(KDE4-ENABLE-FINAL) \
-			-DKDE4_BUILD_TESTS=false \
-			-DKDE_DISTRIBUTION_TEXT="Kubuntu packages" \
-			-DCMAKE_SKIP_RPATH=true \
-			-DKDE4_USE_ALWAYS_FULL_RPATH=false \
-			-DCONFIG_INSTALL_DIR=$(DEB_CONFIG_INSTALL_DIR) \
-			-DDATA_INSTALL_DIR=/usr/share/kde4/apps \
-			-DHTML_INSTALL_DIR=/usr/share/doc/kde4/HTML \
-			-DKCFG_INSTALL_DIR=/usr/share/kde4/config.kcfg \
-			-DLIB_INSTALL_DIR=/usr/lib \
-			-DSYSCONF_INSTALL_DIR=/etc
-
-# Set the one below to something else than 'yes' to disable linking 
-# with --as-needed (on by default)
-DEB_KDE_LINK_WITH_AS_NEEDED ?= yes
-ifneq (,$(findstring yes, $(DEB_KDE_LINK_WITH_AS_NEEDED)))
-	ifeq (,$(findstring no-as-needed, $(DEB_BUILD_OPTIONS)))
-		DEB_KDE_LINK_WITH_AS_NEEDED := yes
-		DEB_CMAKE_EXTRA_FLAGS += \
-					-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
-					-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
-					-DCMAKE_EXE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed"
-	else
-		DEB_KDE_LINK_WITH_AS_NEEDED := no
-	endif
-else
-	DEB_KDE_LINK_WITH_AS_NEEDED := no
-endif
-
-#DEB_CMAKE_PREFIX = /usr/lib/kde4
-DEB_DH_INSTALL_SOURCEDIR = debian/tmp
-#DEB_DH_SHLIBDEPS_ARGS = -l/usr/lib/kde4/lib/
-DEB_KDE_ENABLE_FINAL ?=
-#DEB_MAKE_ENVVARS += XDG_CONFIG_DIRS=/etc/xdg XDG_DATA_DIRS=/usr/share
-#DEB_STRIP_EXCLUDE = so
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        KDE4-ENABLE-FINAL = $(if $(DEB_KDE_ENABLE_FINAL),-DKDE4_ENABLE_FINAL=true,)
-    else
-        KDE4-ENABLE-FINAL =
-    endif
-endif
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-clean::
-ifndef THIS_SHOULD_GO_TO_UNSTABLE
-	#guard against experimental uploads to unstable
-	dpkg-parsechangelog | grep ^Distribution | grep -q 'experimental\|UNRELEASED'
-endif
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -f CMakeCache.txt
-
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
-		meinproc4 $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-		rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
-	done
-
-
-# Process "sameVersionDep:" substvars
-DH_SAMEVERSIONDEPS=debian/cdbs/dh_sameversiondeps
-common-binary-predeb-arch common-binary-predeb-indep::
-	@if [ ! -x "$(DH_SAMEVERSIONDEPS)" ]; then chmod a+x "$(DH_SAMEVERSIONDEPS)"; fi
-	$(DH_SAMEVERSIONDEPS)
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/debian/cdbs/versions.mk /tmp/t1fz2IbI5G/kdegraphics-4.1.1/debian/cdbs/versions.mk
--- kdegraphics-4.1.0/debian/cdbs/versions.mk	2008-09-02 01:12:15.000000000 +0100
+++ kdegraphics-4.1.1/debian/cdbs/versions.mk	1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-
-CDBS_MIN_VER:=0.4.52
-QUILT_MIN_VER:=0.40
-CMAKE_MIN_VER:=2.4.8
-
-
-KDELIBS_VERSION:=$(shell dpkg -l kdelibs5 | grep kdelibs5 | awk '{print $$3}')
-KDELIBS_SOURCE_VERSION:=$(shell echo $(KDELIBS_VERSION) | sed 's/+b.*//')
-KDELIBS_UPSTREAM_VERSION:=$(shell echo $(KDELIBS_VERSION) | sed 's/-.*//')
-
-KDEPIMLIBS_VERSION:=$(shell dpkg -l kdepimlibs5 | grep kdepimlibs5 | awk '{print $$3}')
-KDEPIMLIBS_SOURCE_VERSION:=$(shell echo $(KDEPIMLIBS_VERSION) | sed 's/+b.*//')
-KDEPIMLIBS_UPSTREAM_VERSION:=$(shell echo $(KDEPIMLIBS_VERSION) | sed 's/-.*//')
-
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/debian/changelog /tmp/t1fz2IbI5G/kdegraphics-4.1.1/debian/changelog
--- kdegraphics-4.1.0/debian/changelog	2008-09-02 01:12:15.000000000 +0100
+++ kdegraphics-4.1.1/debian/changelog	2008-09-02 01:12:16.000000000 +0100
@@ -1,3 +1,19 @@
+kdegraphics (4:4.1.1-0ubuntu1) intrepid; urgency=low
+
+  [ Guillaume Martres ]
+  * New upstream release
+  * removed debian/cdbs directory, not needed with kde4.mk
+  * debian/rules:
+    - removed THIS_SHOULD_GO_TO_UNSTABLE, not needed with latest cdbs
+  * debian/control:
+    - ensure cdbs version is (>= 0.4.52ubuntu7) and kdelibs5-dev is (>= 4:4.1.1)
+  * updated debian/kgamma.install
+
+  [ Harald Sitter ]
+  * Remove THIS_SHOULD_GO_TO_UNSTABLE, not needed with kde4.mk anymore
+
+ -- Harald Sitter <apachelogger@ubuntu.com>  Sat, 30 Aug 2008 02:32:46 +0200
+
 kdegraphics (4:4.1.0-0ubuntu2) intrepid; urgency=low
 
   * switch to kde4.mk from cdbs
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/debian/control /tmp/t1fz2IbI5G/kdegraphics-4.1.1/debian/control
--- kdegraphics-4.1.0/debian/control	2008-09-02 01:12:15.000000000 +0100
+++ kdegraphics-4.1.1/debian/control	2008-09-02 01:12:16.000000000 +0100
@@ -4,8 +4,8 @@
 Maintainer: Kubuntu Developers <kubuntu-devel@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>, Fathi Boudra <fabo@debian.org>, Armin Berres <trigger+debian@space-based.de>, Matthew Rosewarne <mrosewarne@inoutbox.com>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), cmake (>= 2.4.5), quilt,
- kdelibs5-dev (>= 4:4.1.0), libphonon-dev (>= 4:4.2.0),
+Build-Depends: cdbs (>= 0.4.52ubuntu7), debhelper (>= 6), cmake (>= 2.4.5), quilt,
+ kdelibs5-dev (>= 4:4.1.1), libphonon-dev (>= 4:4.2.0),
  libpoppler-qt4-dev (>= 0.8.0), libspectre-dev, libqca2-dev,
  libsane-dev, libtiff4-dev, libgphoto2-2-dev, libdjvulibre-dev,
  libxxf86vm-dev, libqimageblitz-dev (>= 1:0.0.4-2), libexiv2-dev, libgs-dev,
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/debian/kgamma.install /tmp/t1fz2IbI5G/kdegraphics-4.1.1/debian/kgamma.install
--- kdegraphics-4.1.0/debian/kgamma.install	2008-09-02 01:12:15.000000000 +0100
+++ kdegraphics-4.1.1/debian/kgamma.install	2008-09-02 01:12:16.000000000 +0100
@@ -11,3 +11,6 @@
 usr/share/kde4/apps/kgamma/pics/midgrey.png
 usr/share/kde4/apps/kgamma/pics/rgbscale.png
 usr/share/kde4/services/kgamma.desktop
+usr/share/doc/kde4/HTML/en/kgamma/common
+usr/share/doc/kde4/HTML/en/kgamma/index.cache.bz2
+usr/share/doc/kde4/HTML/en/kgamma/index.docbook
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/debian/rules /tmp/t1fz2IbI5G/kdegraphics-4.1.1/debian/rules
--- kdegraphics-4.1.0/debian/rules	2008-09-02 01:12:15.000000000 +0100
+++ kdegraphics-4.1.1/debian/rules	2008-09-02 01:12:16.000000000 +0100
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-THIS_SHOULD_GO_TO_UNSTABLE = 1
- 
 include /usr/share/cdbs/1/class/kde4.mk
 
 DEB_DH_MAKESHLIBS_ARGS_libokularcore1 := -V'libokularcore1 (>= 4:4.1.0)'
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/doc/CMakeLists.txt /tmp/t1fz2IbI5G/kdegraphics-4.1.1/doc/CMakeLists.txt
--- kdegraphics-4.1.0/doc/CMakeLists.txt	2008-01-04 23:53:46.000000000 +0000
+++ kdegraphics-4.1.1/doc/CMakeLists.txt	2008-08-28 09:06:53.000000000 +0100
@@ -1,8 +1,8 @@
 if(Q_WS_X11)
     add_subdirectory(ksnapshot)
-    if (XVIDMODEEXTENSIONS_FOUND)
+    if (X11_xf86vmode_FOUND)
        add_subdirectory(kgamma)
-    endif (XVIDMODEEXTENSIONS_FOUND)
+    endif (X11_xf86vmode_FOUND)
 endif(Q_WS_X11)
 
 if(KDE4_GPHOTO2 AND GPHOTO2_FOUND)
Binary files /tmp/zzzotW7RB5/kdegraphics-4.1.0/doc/gwenview/index.cache.bz2 and /tmp/t1fz2IbI5G/kdegraphics-4.1.1/doc/gwenview/index.cache.bz2 differ
Binary files /tmp/zzzotW7RB5/kdegraphics-4.1.0/doc/kamera/index.cache.bz2 and /tmp/t1fz2IbI5G/kdegraphics-4.1.1/doc/kamera/index.cache.bz2 differ
Binary files /tmp/zzzotW7RB5/kdegraphics-4.1.0/doc/kgamma/index.cache.bz2 and /tmp/t1fz2IbI5G/kdegraphics-4.1.1/doc/kgamma/index.cache.bz2 differ
Binary files /tmp/zzzotW7RB5/kdegraphics-4.1.0/doc/kolourpaint/index.cache.bz2 and /tmp/t1fz2IbI5G/kdegraphics-4.1.1/doc/kolourpaint/index.cache.bz2 differ
Binary files /tmp/zzzotW7RB5/kdegraphics-4.1.0/doc/kruler/index.cache.bz2 and /tmp/t1fz2IbI5G/kdegraphics-4.1.1/doc/kruler/index.cache.bz2 differ
Binary files /tmp/zzzotW7RB5/kdegraphics-4.1.0/doc/ksnapshot/index.cache.bz2 and /tmp/t1fz2IbI5G/kdegraphics-4.1.1/doc/ksnapshot/index.cache.bz2 differ
Binary files /tmp/zzzotW7RB5/kdegraphics-4.1.0/doc/okular/index.cache.bz2 and /tmp/t1fz2IbI5G/kdegraphics-4.1.1/doc/okular/index.cache.bz2 differ
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/gwenview/app/gwenview.desktop /tmp/t1fz2IbI5G/kdegraphics-4.1.1/gwenview/app/gwenview.desktop
--- kdegraphics-4.1.0/gwenview/app/gwenview.desktop	2008-06-03 10:34:15.000000000 +0100
+++ kdegraphics-4.1.1/gwenview/app/gwenview.desktop	2008-08-28 09:06:53.000000000 +0100
@@ -64,7 +64,7 @@
 Comment=A simple image viewer
 Comment[ca]=Un visualitzador d'imatges senzill
 Comment[cs]=Jednoduchý prohlížeč obrázků
-Comment[da]=Simpel biledfremviser
+Comment[da]=Simpel billedfremviser
 Comment[de]=Ein einfacher Bildbetrachter
 Comment[el]=Ένας απλός προβολέας εικόνων
 Comment[eo]=Simpla bildorigardilo
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/gwenview/app/imageopscontextmanageritem.cpp /tmp/t1fz2IbI5G/kdegraphics-4.1.1/gwenview/app/imageopscontextmanageritem.cpp
--- kdegraphics-4.1.0/gwenview/app/imageopscontextmanageritem.cpp	2008-06-25 08:54:21.000000000 +0100
+++ kdegraphics-4.1.1/gwenview/app/imageopscontextmanageritem.cpp	2008-08-28 09:06:53.000000000 +0100
@@ -36,6 +36,7 @@
 #include "mainwindow.h"
 #include "sidebar.h"
 #include <lib/cropsidebar.h>
+#include <lib/cropimageoperation.h>
 #include <lib/document/documentfactory.h>
 #include <lib/gwenviewconfig.h>
 #include <lib/imageviewpart.h>
@@ -104,7 +105,7 @@
 		mCropAction = actionCollection->addAction("crop");
 		mCropAction->setText(i18n("Crop"));
 		connect(mCropAction, SIGNAL(triggered()),
-			that, SLOT(crop()) );
+			that, SLOT(showCropSideBar()) );
 
 		mActionList
 			<< mRotateLeftAction
@@ -256,7 +257,7 @@
 }
 
 
-void ImageOpsContextManagerItem::crop() {
+void ImageOpsContextManagerItem::showCropSideBar() {
 	ImageViewPart* imageViewPart = d->mMainWindow->documentView()->imageViewPart();
 	if (!imageViewPart) {
 		kError() << "No ImageViewPart available!";
@@ -266,9 +267,17 @@
 	CropSideBar* cropSideBar = new CropSideBar(d->mMainWindow, imageViewPart->imageView(), doc);
 	connect(cropSideBar, SIGNAL(done()),
 		d->mMainWindow, SLOT(hideTemporarySideBar()) );
+	connect(cropSideBar, SIGNAL(cropRequested(const QRect&)),
+		SLOT(crop(const QRect&)) );
 
 	d->mMainWindow->showTemporarySideBar(cropSideBar);
 }
 
 
+void ImageOpsContextManagerItem::crop(const QRect& rect) {
+	CropImageOperation* op = new CropImageOperation(rect);
+	d->applyImageOperation(op);
+}
+
+
 } // namespace
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/gwenview/app/imageopscontextmanageritem.h /tmp/t1fz2IbI5G/kdegraphics-4.1.1/gwenview/app/imageopscontextmanageritem.h
--- kdegraphics-4.1.0/gwenview/app/imageopscontextmanageritem.h	2008-05-15 19:37:11.000000000 +0100
+++ kdegraphics-4.1.1/gwenview/app/imageopscontextmanageritem.h	2008-08-28 09:06:53.000000000 +0100
@@ -29,6 +29,9 @@
 #include "abstractcontextmanageritem.h"
 
 
+class QRect;
+
+
 namespace Gwenview {
 
 
@@ -51,7 +54,8 @@
 	void mirror();
 	void flip();
 	void resizeImage();
-	void crop();
+	void showCropSideBar();
+	void crop(const QRect&);
 
 private:
 	class Private;
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/gwenview/app/main.cpp /tmp/t1fz2IbI5G/kdegraphics-4.1.1/gwenview/app/main.cpp
--- kdegraphics-4.1.0/gwenview/app/main.cpp	2008-05-29 12:18:37.000000000 +0100
+++ kdegraphics-4.1.1/gwenview/app/main.cpp	2008-08-28 09:06:53.000000000 +0100
@@ -36,7 +36,7 @@
 		"gwenview",        /* appname */
 		0,                 /* catalogName */
 		ki18n("Gwenview"), /* programName */
-		"2.1");            /* version */
+		"2.1.1");          /* version */
 	aboutData.setShortDescription(ki18n("An Image Viewer"));
 	aboutData.setLicense(KAboutData::License_GPL);
 	aboutData.setCopyrightStatement(ki18n("Copyright 2000-2008 Aurélien Gâteau"));
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/gwenview/app/slideshow.desktop /tmp/t1fz2IbI5G/kdegraphics-4.1.1/gwenview/app/slideshow.desktop
--- kdegraphics-4.1.0/gwenview/app/slideshow.desktop	2008-07-23 09:25:16.000000000 +0100
+++ kdegraphics-4.1.1/gwenview/app/slideshow.desktop	2008-08-28 09:06:53.000000000 +0100
@@ -15,6 +15,7 @@
 Name[fr]=Démarrer un diaporama
 Name[ga]=Rith Taispeántas Sleamhnán
 Name[gl]=Iniciar unha presentación
+Name[hu]=Diabemutató indítása
 Name[is]=Hefja skyggnusýningu
 Name[it]=Avvia una presentazione
 Name[ja]=スライドショーを開始
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/gwenview/lib/cropsidebar.cpp /tmp/t1fz2IbI5G/kdegraphics-4.1.1/gwenview/lib/cropsidebar.cpp
--- kdegraphics-4.1.0/gwenview/lib/cropsidebar.cpp	2008-05-07 10:05:18.000000000 +0100
+++ kdegraphics-4.1.1/gwenview/lib/cropsidebar.cpp	2008-08-28 09:06:53.000000000 +0100
@@ -29,7 +29,6 @@
 #include "klocale.h"
 
 // Local
-#include "cropimageoperation.h"
 #include "croptool.h"
 #include "imageview.h"
 #include "ui_cropsidebar.h"
@@ -136,7 +135,7 @@
 		SLOT(slotHeightChanged()) );
 
 	connect(d->buttonBox, SIGNAL(accepted()),
-		SLOT(crop()) );
+		SLOT(slotAccepted()) );
 	
 	connect(d->buttonBox, SIGNAL(rejected()),
 		SIGNAL(done()) );
@@ -220,10 +219,8 @@
 }
 
 
-void CropSideBar::crop() {
-	CropImageOperation* op = new CropImageOperation(cropRect());
-	op->setDocument(d->mDocument);
-	d->mDocument->undoStack()->push(op);
+void CropSideBar::slotAccepted() {
+	emit cropRequested(cropRect());
 	emit done();
 }
 
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/gwenview/lib/cropsidebar.h /tmp/t1fz2IbI5G/kdegraphics-4.1.1/gwenview/lib/cropsidebar.h
--- kdegraphics-4.1.0/gwenview/lib/cropsidebar.h	2008-05-07 10:05:18.000000000 +0100
+++ kdegraphics-4.1.1/gwenview/lib/cropsidebar.h	2008-08-28 09:06:53.000000000 +0100
@@ -46,6 +46,7 @@
 
 Q_SIGNALS:
 	void done();
+	void cropRequested(const QRect&);
 
 private Q_SLOTS:
 	void slotPositionChanged();
@@ -53,7 +54,7 @@
 	void slotHeightChanged();
 	void setCropRect(const QRect& rect);
 
-	void crop();
+	void slotAccepted();
 	void applyRatioConstraint();
 	void setRatioConstraintFromComboBox();
 
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/gwenview/lib/thumbnailview/thumbnailview.cpp /tmp/t1fz2IbI5G/kdegraphics-4.1.1/gwenview/lib/thumbnailview/thumbnailview.cpp
--- kdegraphics-4.1.0/gwenview/lib/thumbnailview/thumbnailview.cpp	2008-07-15 20:48:47.000000000 +0100
+++ kdegraphics-4.1.1/gwenview/lib/thumbnailview/thumbnailview.cpp	2008-08-28 09:06:53.000000000 +0100
@@ -48,7 +48,10 @@
 
 
 static KFileItem fileItemForIndex(const QModelIndex& index) {
-	Q_ASSERT(index.isValid());
+	if (!index.isValid()) {
+		kWarning() << "Invalid index";
+		return KFileItem();
+	}
 	QVariant data = index.data(KDirModel::FileItemRole);
 	return qvariant_cast<KFileItem>(data);
 }
@@ -56,7 +59,7 @@
 
 static KUrl urlForIndex(const QModelIndex& index) {
 	KFileItem item = fileItemForIndex(index);
-	return item.url();
+	return item.isNull() ? KUrl() : item.url();
 }
 
 struct Thumbnail {
@@ -281,9 +284,12 @@
 
 
 QPixmap ThumbnailView::thumbnailForIndex(const QModelIndex& index) {
-	QVariant data = index.data(KDirModel::FileItemRole);
-	KFileItem item = qvariant_cast<KFileItem>(data);
-	QUrl url = item.url();
+	KFileItem item = fileItemForIndex(index);
+	if (item.isNull()) {
+		kWarning() << "Invalid item";
+		return QPixmap();
+	}
+	KUrl url = item.url();
 
 	QPixmap pix;
 
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/gwenview/part/gvpart.desktop /tmp/t1fz2IbI5G/kdegraphics-4.1.1/gwenview/part/gvpart.desktop
--- kdegraphics-4.1.0/gwenview/part/gvpart.desktop	2008-06-03 10:34:15.000000000 +0100
+++ kdegraphics-4.1.1/gwenview/part/gvpart.desktop	2008-08-28 09:06:53.000000000 +0100
@@ -43,7 +43,7 @@
 Name[x-test]=xxGwenview Image Viewerxx
 Name[zh_CN]=Gwenview 图像查看器
 Name[zh_TW]=Gwenview 影像檢視程式
-MimeType=image/gif;image/jpeg;image/jpeg2000;image/png;image/bmp;image/x-eps;image/x-ico;image/x-krl;image/x-portable-bitmap;image/x-portable-pixmap;image/x-xbitmap;image/x-xpixmap;
+MimeType=image/gif;image/jpeg;image/jp2;image/png;image/bmp;image/x-eps;image/x-ico;image/x-krl;image/x-portable-bitmap;image/x-portable-pixmap;image/x-xbitmap;image/x-xpixmap;
 X-KDE-ServiceTypes=KParts/ReadOnlyPart
 X-KDE-Library=gvpart
 InitialPreference=12
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/gwenview/tests/CMakeLists.txt /tmp/t1fz2IbI5G/kdegraphics-4.1.1/gwenview/tests/CMakeLists.txt
--- kdegraphics-4.1.0/gwenview/tests/CMakeLists.txt	2008-05-07 10:05:18.000000000 +0100
+++ kdegraphics-4.1.1/gwenview/tests/CMakeLists.txt	2008-08-28 09:06:53.000000000 +0100
@@ -7,6 +7,8 @@
 	${CMAKE_CURRENT_BINARY_DIR}/..
 	)
 
+include_directories( ${EXIV2_INCLUDE_DIR} )
+
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 
 
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/kamera/kcontrol/kamera.desktop /tmp/t1fz2IbI5G/kdegraphics-4.1.1/kamera/kcontrol/kamera.desktop
--- kdegraphics-4.1.0/kamera/kcontrol/kamera.desktop	2008-06-03 10:34:16.000000000 +0100
+++ kdegraphics-4.1.1/kamera/kcontrol/kamera.desktop	2008-08-28 09:06:53.000000000 +0100
@@ -38,7 +38,7 @@
 Comment[nl]=Camera instellen
 Comment[nn]=Set opp Kamera
 Comment[pa]=ਕੈਮਰਾ ਸੰਰਚਨਾ
-Comment[pl]=Konfiguracja Kamery
+Comment[pl]=Konfiguracja aparatu cyfrowego
 Comment[pt]=Configuração do Kamera
 Comment[pt_BR]=Configurar o Kamera
 Comment[ro]=Configurează aparatul foto digital
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/kamera/kioslave/kamera.cpp /tmp/t1fz2IbI5G/kdegraphics-4.1.1/kamera/kioslave/kamera.cpp
--- kdegraphics-4.1.0/kamera/kioslave/kamera.cpp	2008-01-04 23:53:46.000000000 +0000
+++ kdegraphics-4.1.1/kamera/kioslave/kamera.cpp	2008-08-28 09:06:53.000000000 +0100
@@ -232,8 +232,7 @@
 			error(KIO::ERR_DOES_NOT_EXIST, url.path());	\
 			return;						\
 		}							\
-		QByteArray chunkDataBuffer;				\
-		chunkDataBuffer.fromRawData(xx.text, strlen(xx.text));	\
+		QByteArray chunkDataBuffer = QByteArray::fromRawData(xx.text, strlen(xx.text));	\
 		data(chunkDataBuffer);					\
 		processedSize(strlen(xx.text));				\
 		chunkDataBuffer.clear();                                \
@@ -345,7 +344,7 @@
 
 			if (towrite > fileSize-m_fileSize-written)
 				towrite = fileSize-m_fileSize-written;
-			chunkDataBuffer.fromRawData(fileData + m_fileSize + written, towrite);
+			chunkDataBuffer = QByteArray::fromRawData(fileData + m_fileSize + written, towrite);
 			processedSize(m_fileSize + written + towrite);
 			data(chunkDataBuffer);
 			chunkDataBuffer.clear();
@@ -919,8 +918,7 @@
 	if (fileSize > 0) {
 		// XXX using assign() here causes segfault, prolly because
 		// gp_file_free is called before chunkData goes out of scope
-		QByteArray chunkDataBuffer;
-		chunkDataBuffer.fromRawData(fileData + object->getFileSize(), fileSize - object->getFileSize());
+		QByteArray chunkDataBuffer = QByteArray::fromRawData(fileData + object->getFileSize(), fileSize - object->getFileSize());
 		// Note: this will fail with sizes > 16MB ... 
 		object->data(chunkDataBuffer);
 		object->processedSize(fileSize);
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/kgamma/kcmkgamma/kgamma.desktop /tmp/t1fz2IbI5G/kdegraphics-4.1.1/kgamma/kcmkgamma/kgamma.desktop
--- kdegraphics-4.1.0/kgamma/kcmkgamma/kgamma.desktop	2008-06-03 10:34:15.000000000 +0100
+++ kdegraphics-4.1.1/kgamma/kcmkgamma/kgamma.desktop	2008-08-28 09:06:53.000000000 +0100
@@ -85,7 +85,7 @@
 Name[xh]=Unobumba wesithathu konoobumba besiGrike
 Name[zh_HK]=伽馬（Gamma）
 
-X-DocPath=kgamma
+X-DocPath=kgamma/index.html
 Exec=kcmshell4 kgamma
 Icon=kgamma
 X-KDE-Keywords=KGamma, kgamma, Gamma, gamma
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/kgamma/kcmkgamma/Messages.sh /tmp/t1fz2IbI5G/kdegraphics-4.1.1/kgamma/kcmkgamma/Messages.sh
--- kdegraphics-4.1.0/kgamma/kcmkgamma/Messages.sh	2008-01-04 23:53:45.000000000 +0000
+++ kdegraphics-4.1.1/kgamma/kcmkgamma/Messages.sh	2008-08-28 09:06:53.000000000 +0100
@@ -1,2 +1,2 @@
 #! /bin/sh
-$XGETTEXT *.cpp -o $podir/kgamma.pot
+$XGETTEXT *.cpp -o $podir/kcmkgamma.pot
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/kolourpaint/kpViewScrollableContainer.cpp /tmp/t1fz2IbI5G/kdegraphics-4.1.1/kolourpaint/kpViewScrollableContainer.cpp
--- kdegraphics-4.1.0/kolourpaint/kpViewScrollableContainer.cpp	2008-01-04 23:53:53.000000000 +0000
+++ kdegraphics-4.1.1/kolourpaint/kpViewScrollableContainer.cpp	2008-08-28 09:06:53.000000000 +0100
@@ -605,10 +605,12 @@
     if (m_resizeRoundedLastViewX < 0 || m_resizeRoundedLastViewY < 0)
         return QRect ();
 
+    QRect visibleArea = QRect(QPoint(contentsX(),contentsY()), viewport()->size());
+
     return QRect (QPoint (0,
                           m_resizeRoundedLastViewY),
                   QPoint (m_resizeRoundedLastViewX - 1,
-                          m_resizeRoundedLastViewY + bottomResizeLineWidth () - 1));
+                          m_resizeRoundedLastViewY + bottomResizeLineWidth () - 1)).intersected(visibleArea);
 }
 
 // protected
@@ -617,10 +619,12 @@
     if (m_resizeRoundedLastViewX < 0 || m_resizeRoundedLastViewY < 0)
         return QRect ();
 
+    QRect visibleArea = QRect(QPoint(contentsX(),contentsY()), viewport()->size());
+
     return QRect (QPoint (m_resizeRoundedLastViewX,
                           0),
                   QPoint (m_resizeRoundedLastViewX + rightResizeLineWidth () - 1,
-                          m_resizeRoundedLastViewY - 1));
+                          m_resizeRoundedLastViewY - 1)).intersected(visibleArea);
 }
 
 // protected
@@ -629,10 +633,12 @@
     if (m_resizeRoundedLastViewX < 0 || m_resizeRoundedLastViewY < 0)
         return QRect ();
 
+    QRect visibleArea = QRect(QPoint(contentsX(),contentsY()), viewport()->size());
+
     return QRect (QPoint (m_resizeRoundedLastViewX,
                           m_resizeRoundedLastViewY),
                   QPoint (m_resizeRoundedLastViewX + rightResizeLineWidth () - 1,
-                          m_resizeRoundedLastViewY + bottomResizeLineWidth () - 1));
+                          m_resizeRoundedLastViewY + bottomResizeLineWidth () - 1)).intersected(visibleArea);
 }
 
 
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/kruler/kruler.desktop /tmp/t1fz2IbI5G/kdegraphics-4.1.1/kruler/kruler.desktop
--- kdegraphics-4.1.0/kruler/kruler.desktop	2008-06-03 10:34:16.000000000 +0100
+++ kdegraphics-4.1.1/kruler/kruler.desktop	2008-08-28 09:06:53.000000000 +0100
@@ -23,7 +23,7 @@
 GenericName[hu]=Képernyővonalzó
 GenericName[is]=Reglustika
 GenericName[it]=Righello per lo schermo
-GenericName[ja]=スクリーン定規
+GenericName[ja]=スクリーンルーラー
 GenericName[kk]=Экран өлшегіші
 GenericName[km]=បន្ទាត់​អេក្រង់
 GenericName[ko]=화면 자
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/kruler/kruler.notifyrc /tmp/t1fz2IbI5G/kdegraphics-4.1.1/kruler/kruler.notifyrc
--- kdegraphics-4.1.0/kruler/kruler.notifyrc	2008-06-03 10:34:16.000000000 +0100
+++ kdegraphics-4.1.1/kruler/kruler.notifyrc	2008-08-28 09:06:53.000000000 +0100
@@ -22,7 +22,7 @@
 Comment[hu]=Képernyővonalzó
 Comment[is]=KDE skjáreglustika
 Comment[it]=Righello dello schermo
-Comment[ja]=KDE スクリーン定規
+Comment[ja]=KDE スクリーンルーラー
 Comment[kk]=KDE экран өлшегіші
 Comment[km]=បន្ទាត់​អេក្រង់ KDE
 Comment[ko]=KDE 화면 자
@@ -129,7 +129,7 @@
 Comment[hu]=A vonalzó elmozgatva képpontonként a kurzorbillentyűkkel
 Comment[is]=Reglustikan hefur verið færð um nokkra díla með notkun Bendillykla
 Comment[it]=Il righello è stato spostato usando i tasti cursore
-Comment[ja]=定規がカーソルキーによってピクセル単位で移動しました
+Comment[ja]=ルーラーがカーソルキーによってピクセル単位で移動しました
 Comment[km]=បន្ទាត់​ត្រូវ​បាន​ផ្លាស់ទី​តាម​ភីកសែល ដោយ​ប្រើ​គ្រាប់ចុច​ទស្សន៍​ទ្រនិច
 Comment[ko]=화면 자가 커서 키를 사용해서 픽셀 단위로 이동함
 Comment[lt]=Liniuote buvo paslinkta kelis taškus naudojant klaviatūros rodykles.
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/ksnapshot/kbackgroundsnapshot.cpp /tmp/t1fz2IbI5G/kdegraphics-4.1.1/ksnapshot/kbackgroundsnapshot.cpp
--- kdegraphics-4.1.0/ksnapshot/kbackgroundsnapshot.cpp	2008-06-25 08:54:22.000000000 +0100
+++ kdegraphics-4.1.1/ksnapshot/kbackgroundsnapshot.cpp	2008-08-28 09:06:53.000000000 +0100
@@ -88,7 +88,7 @@
 
 void KBackgroundSnapshot::savePictureOnDesktop()
 {
-    filename = KUrl( KGlobalSettings::desktopPath()+i18n("snapshot")+"1.png" );
+    filename = KUrl( KGlobalSettings::desktopPath()+'/'+i18n("snapshot")+"1.png" );
     // Make sure the name is not already being used
     while(KIO::NetAccess::exists( filename, KIO::NetAccess::DestinationSide, 0L )) {
         autoincFilename();
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/ksnapshot/ksnapshot.cpp /tmp/t1fz2IbI5G/kdegraphics-4.1.1/ksnapshot/ksnapshot.cpp
--- kdegraphics-4.1.0/ksnapshot/ksnapshot.cpp	2008-06-03 10:34:16.000000000 +0100
+++ kdegraphics-4.1.1/ksnapshot/ksnapshot.cpp	2008-08-28 09:06:53.000000000 +0100
@@ -396,6 +396,8 @@
     KUrl url = filename;
     url.setPass( QString::null );	//krazy:exclude=nullstrassign for old broken gcc
     conf.writePathEntry("filename",url.url());
+
+    conf.sync();
     e->accept();
 }
 
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/libs/libkdcraw/dcraw/CMakeLists.txt /tmp/t1fz2IbI5G/kdegraphics-4.1.1/libs/libkdcraw/dcraw/CMakeLists.txt
--- kdegraphics-4.1.0/libs/libkdcraw/dcraw/CMakeLists.txt	2008-06-26 02:33:03.000000000 +0100
+++ kdegraphics-4.1.1/libs/libkdcraw/dcraw/CMakeLists.txt	2008-08-28 09:06:52.000000000 +0100
@@ -26,10 +26,10 @@
     ADD_DEFINITIONS( -DDJGPP )
 ENDIF( WIN32 )
 SET(kdcraw_SRCS dcraw.c)
-IF( NOT MSVC)
+IF( NOT WIN32)
     FIND_LIBRARY(MATH_LIBRARY m)
-ENDIF( NOT MSVC )
-KDE4_ADD_EXECUTABLE(kdcraw_bin ${kdcraw_SRCS})
+ENDIF( NOT WIN32 )
+KDE4_ADD_EXECUTABLE(kdcraw_bin NOGUI ${kdcraw_SRCS})
 TARGET_LINK_LIBRARIES(kdcraw_bin ${JPEG_LIBRARY} ${MATH_LIBRARY} ${LCMS_LIBRARIES})
 
 IF( WIN32 )
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/libs/libkexiv2/libkexiv2/kexiv2.cpp /tmp/t1fz2IbI5G/kdegraphics-4.1.1/libs/libkexiv2/libkexiv2/kexiv2.cpp
--- kdegraphics-4.1.0/libs/libkexiv2/libkexiv2/kexiv2.cpp	2008-07-03 06:05:13.000000000 +0100
+++ kdegraphics-4.1.1/libs/libkexiv2/libkexiv2/kexiv2.cpp	2008-08-28 09:06:52.000000000 +0100
@@ -92,6 +92,15 @@
 #endif // _XMP_SUPPORT_
 }
 
+bool KExiv2::supportTiffWritting()
+{
+#if (EXIV2_TEST_VERSION(0,17,91))
+    return true;
+#else
+    return false;
+#endif
+}
+
 QString KExiv2::Exiv2Version()
 {
     // Since 0.14.0 release, we can extract run-time version of Exiv2.
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/libs/libkexiv2/libkexiv2/kexiv2.h /tmp/t1fz2IbI5G/kdegraphics-4.1.1/libs/libkexiv2/libkexiv2/kexiv2.h
--- kdegraphics-4.1.0/libs/libkexiv2/libkexiv2/kexiv2.h	2008-07-03 06:05:13.000000000 +0100
+++ kdegraphics-4.1.1/libs/libkexiv2/libkexiv2/kexiv2.h	2008-08-28 09:06:52.000000000 +0100
@@ -122,6 +122,10 @@
      */
     static bool supportXmp();
 
+    /** Return true if library can writte metadata to TIFF/DNG files
+     */
+    static bool supportTiffWritting();
+
     /** Return a string version of Exiv2 release in format "major.minor.patch"
      */
     static QString Exiv2Version();
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/libs/libkipi/kipiplugin.desktop /tmp/t1fz2IbI5G/kdegraphics-4.1.1/libs/libkipi/kipiplugin.desktop
--- kdegraphics-4.1.0/libs/libkipi/kipiplugin.desktop	2008-07-23 09:25:16.000000000 +0100
+++ kdegraphics-4.1.1/libs/libkipi/kipiplugin.desktop	2008-08-28 09:06:52.000000000 +0100
@@ -25,6 +25,7 @@
 Comment[fr]=Un module externe pour KIPI
 Comment[ga]=Breiseán KIPI
 Comment[gl]=Unha extension de KIPI
+Comment[hu]=Egy KIPI-bővítmény
 Comment[is]=KIPI íforrit
 Comment[it]=Un plugin di KIPI
 Comment[ja]=Kipi プラグイン
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/libs/libksane/libksane/sane_widget.cpp /tmp/t1fz2IbI5G/kdegraphics-4.1.1/libs/libksane/libksane/sane_widget.cpp
--- kdegraphics-4.1.0/libs/libksane/libksane/sane_widget.cpp	2008-06-10 12:40:55.000000000 +0100
+++ kdegraphics-4.1.1/libs/libksane/libksane/sane_widget.cpp	2008-08-28 09:06:52.000000000 +0100
@@ -822,10 +822,21 @@
 }
 
 void KSaneWidget::handleSelection(float tl_x, float tl_y, float br_x, float br_y) {
-    float max_x, max_y;
+
+    if ((d->optTl == 0) || (d->optTlY == 0) || (d->optBrX == 0) || (d->optBrY == 0)) {
+        // clear the selection since we can not set one
+        d->previewArea->setTLX(0);
+        d->previewArea->setTLY(0);
+        d->previewArea->setBRX(0);
+        d->previewArea->setBRY(0);
+        tl_x = tl_y = br_x = br_y = 0;
+        return;
+    }
 
     if ((d->previewImg->width()==0) || (d->previewImg->height()==0)) return;
 
+    float max_x, max_y;
+
     d->optBrX->getMaxValue(&max_x);
     d->optBrY->getMaxValue(&max_y);
     float ftl_x = tl_x*max_x;
@@ -833,10 +844,10 @@
     float fbr_x = br_x*max_x;
     float fbr_y = br_y*max_y;
 
-    if (d->optTl != 0) d->optTl->setValue(ftl_x);
-    if (d->optTlY != 0) d->optTlY->setValue(ftl_y);
-    if (d->optBrX != 0) d->optBrX->setValue(fbr_x);
-    if (d->optBrY != 0) d->optBrY->setValue(fbr_y);
+    d->optTl->setValue(ftl_x);
+    d->optTlY->setValue(ftl_y);
+    d->optBrX->setValue(fbr_x);
+    d->optBrY->setValue(fbr_y);
 }
 
 void KSaneWidget::setTLX(float ftlx)
@@ -1251,6 +1262,7 @@
             }
             if (d->params.last_frame == SANE_TRUE) {
                 // this is where it all ends well :)
+                sane_cancel(d->saneHandle);
                 d->readStatus = READ_FINISHED;
                 return;
             }
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/core/area.cpp /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/core/area.cpp
--- kdegraphics-4.1.0/okular/core/area.cpp	2008-05-21 09:32:44.000000000 +0100
+++ kdegraphics-4.1.1/okular/core/area.cpp	2008-08-28 09:06:53.000000000 +0100
@@ -42,7 +42,11 @@
 
 void NormalizedPoint::transform( const QMatrix &matrix )
 {
-    matrix.map( x, y, &x, &y );
+    qreal tmp_x = (qreal)x;
+    qreal tmp_y = (qreal)y;
+    matrix.map( tmp_x, tmp_y, &tmp_x, &tmp_y );
+    x = tmp_x;
+    y = tmp_y;
 }
 
 QDebug operator<<( QDebug str, const Okular::NormalizedPoint& p )
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/core/document.cpp /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/core/document.cpp
--- kdegraphics-4.1.0/okular/core/document.cpp	2008-07-23 09:25:17.000000000 +0100
+++ kdegraphics-4.1.1/okular/core/document.cpp	2008-08-28 09:06:53.000000000 +0100
@@ -592,6 +592,9 @@
     {
         // 1. Create DOM
         QDomDocument doc( "documentInfo" );
+        QDomProcessingInstruction xmlPi = doc.createProcessingInstruction(
+                QString::fromLatin1( "xml" ), QString::fromLatin1( "version=\"1.0\" encoding=\"utf-8\"" ) );
+        doc.appendChild( xmlPi );
         QDomElement root = doc.createElement( "documentInfo" );
         root.setAttribute( "url", m_url.pathOrUrl() );
         doc.appendChild( root );
@@ -653,6 +656,7 @@
         // 3. Save DOM to XML file
         QString xml = doc.toString();
         QTextStream os( &infoFile );
+        os.setCodec( "UTF-8" );
         os << xml;
     }
     infoFile.close();
@@ -1365,7 +1369,7 @@
         d->m_docFileName = docFile;
         if ( url.isLocalFile() )
         {
-        QString fn = docFile.contains('/') ? docFile.section('/', -1, -1) : docFile;
+        QString fn = url.fileName();
         document_size = fileReadTest.size();
         fn = QString::number( document_size ) + '.' + fn + ".xml";
         fileReadTest.close();
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/core/okularGenerator.desktop /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/core/okularGenerator.desktop
--- kdegraphics-4.1.0/okular/core/okularGenerator.desktop	2008-07-23 09:25:17.000000000 +0100
+++ kdegraphics-4.1.1/okular/core/okularGenerator.desktop	2008-08-28 09:06:53.000000000 +0100
@@ -12,6 +12,7 @@
 Comment[fr]=Interface du format de fichier d'Okular
 Comment[ga]=Inneall formáide comhaid le haghaidh Okular
 Comment[gl]=Infraestrutura dun formato de ficheiro para Okular
+Comment[hu]=Fájlformátumkezelő az Okularhoz
 Comment[is]=Skráasniðsstuðningur fyrir Okular
 Comment[it]=Backend per i formati di file di Okular
 Comment[ja]=Okular のファイル形式バックエンド
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/core/version.h /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/core/version.h
--- kdegraphics-4.1.0/okular/core/version.h	2008-07-15 20:48:47.000000000 +0100
+++ kdegraphics-4.1.1/okular/core/version.h	2008-08-28 09:06:53.000000000 +0100
@@ -10,10 +10,10 @@
 #ifndef _OKULAR_VERSION_H_
 #define _OKULAR_VERSION_H_
 
-#define OKULAR_VERSION_STRING "0.7"
+#define OKULAR_VERSION_STRING "0.7.1"
 #define OKULAR_VERSION_MAJOR 0
 #define OKULAR_VERSION_MINOR 7
-#define OKULAR_VERSION_RELEASE 0
+#define OKULAR_VERSION_RELEASE 1
 #define OKULAR_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
 
 #define OKULAR_VERSION \
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/generators/chm/generator_chm.cpp /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/generators/chm/generator_chm.cpp
--- kdegraphics-4.1.0/okular/generators/chm/generator_chm.cpp	2008-05-21 09:32:44.000000000 +0100
+++ kdegraphics-4.1.1/okular/generators/chm/generator_chm.cpp	2008-08-28 09:06:52.000000000 +0100
@@ -36,7 +36,7 @@
          "okular_chm",
          "okular_chm",
          ki18n( "CHM Backend" ),
-         "0.1",
+         "0.1.1",
          ki18n( "A Microsoft Windows help file renderer" ),
          KAboutData::License_GPL,
          ki18n( "© 2005-2007 Piotr Szymański\n© 2008 Albert Astals Cid" )
@@ -48,6 +48,23 @@
 
 OKULAR_EXPORT_PLUGIN( CHMGenerator, createAboutData() )
 
+static QString absolutePath( const QString &baseUrl, const QString &path )
+{
+    QString absPath;
+    if ( path.at( 0 ) == QLatin1Char( '/' ) )
+    {
+        // already absolute
+        absPath = path;
+    }
+    else
+    {
+        KUrl url = KUrl::fromPath( baseUrl );
+        url.setFileName( path );
+        absPath = url.toLocalFile();
+    }
+    return absPath;
+}
+
 CHMGenerator::CHMGenerator( QObject *parent, const QVariantList &args )
     : Okular::Generator( parent, args )
 {
@@ -143,6 +160,7 @@
 void CHMGenerator::preparePageForSyncOperation( int zoom , const QString & url)
 {
     KUrl pAddress= "ms-its:" + m_fileName + "::" + url;
+    m_chmUrl = url;
     m_syncGen->setZoomFactor(zoom);
     m_syncGen->openUrl(pAddress);
     m_syncGen->view()->layout();
@@ -177,6 +195,7 @@
     }
 
     m_syncGen->closeUrl();
+    m_chmUrl = QString();
 
     userMutex()->unlock();
 
@@ -240,6 +259,7 @@
         ) ) * 100;
 
     KUrl pAddress= "ms-its:" + m_fileName + "::" + url;
+    m_chmUrl = url;
     m_syncGen->setZoomFactor(zoom);
     m_syncGen->view()->resize(requestWidth,requestHeight);
     m_request=request;
@@ -346,7 +366,7 @@
                         }
                         else
                         {
-                            Okular::DocumentViewport viewport( metaData( "NamedViewport", '/' + url ).toString() );
+                            Okular::DocumentViewport viewport( metaData( "NamedViewport", absolutePath( m_chmUrl, url ) ).toString() );
                             objRects.push_back(
                                 new Okular::ObjectRect ( Okular::NormalizedRect(r,xScale,yScale),
                                 false,
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/generators/chm/generator_chm.h /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/generators/chm/generator_chm.h
--- kdegraphics-4.1.0/okular/generators/chm/generator_chm.h	2008-02-07 13:19:09.000000000 +0000
+++ kdegraphics-4.1.1/okular/generators/chm/generator_chm.h	2008-08-28 09:06:52.000000000 +0100
@@ -60,6 +60,7 @@
         LCHMFile* m_file;
         KHTMLPart *m_syncGen;
         QString m_fileName;
+        QString m_chmUrl;
         Okular::PixmapRequest* m_request;
         int m_pixmapRequestZoom;
         Okular::DocumentInfo* m_docInfo;
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/generators/chm/libokularGenerator_chmlib.desktop /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/generators/chm/libokularGenerator_chmlib.desktop
--- kdegraphics-4.1.0/okular/generators/chm/libokularGenerator_chmlib.desktop	2008-07-23 09:25:17.000000000 +0100
+++ kdegraphics-4.1.1/okular/generators/chm/libokularGenerator_chmlib.desktop	2008-08-28 09:06:52.000000000 +0100
@@ -15,6 +15,7 @@
 Comment[fr]=Interface d'Okular pour les fichiers d'aide Windows HTMLHelp
 Comment[ga]=Inneall HTMLHelp Windows le haghaidh Okular
 Comment[gl]=Infraestrutura de ficheiros Windows HTMLHelp para Okular
+Comment[hu]=Windows HTML-es súgókezelő az Okularhoz
 Comment[is]=Windows HTMLHelp stuðningur fyrir Okular
 Comment[it]=Backend guida di Windows in HTML per Okular
 Comment[ja]=Okular の Windows HTML ヘルプ用バックエンド
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/generators/comicbook/libokularGenerator_comicbook.desktop /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/generators/comicbook/libokularGenerator_comicbook.desktop
--- kdegraphics-4.1.0/okular/generators/comicbook/libokularGenerator_comicbook.desktop	2008-07-23 09:25:17.000000000 +0100
+++ kdegraphics-4.1.1/okular/generators/comicbook/libokularGenerator_comicbook.desktop	2008-08-28 09:06:52.000000000 +0100
@@ -37,6 +37,7 @@
 Comment[fr]=Interface d'Okular pour les bandes dessinés
 Comment[ga]=Inneall Comic Book le haghaidh Okular
 Comment[gl]=Infraestruturas de tebeos para Okular
+Comment[hu]=Képregénybeolvasó az Okularhoz
 Comment[is]=ComicBook stuðningur fyrir Okular
 Comment[it]=Backend Comic book per Okular
 Comment[ja]=Okular のコミックブック用バックエンド
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/generators/djvu/generator_djvu.cpp /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/generators/djvu/generator_djvu.cpp
--- kdegraphics-4.1.0/okular/generators/djvu/generator_djvu.cpp	2008-03-13 07:47:47.000000000 +0000
+++ kdegraphics-4.1.1/okular/generators/djvu/generator_djvu.cpp	2008-08-28 09:06:52.000000000 +0100
@@ -66,7 +66,7 @@
          "okular_djvu",
          "okular_djvu",
          ki18n( "DjVu Backend" ),
-         "0.1",
+         "0.1.1",
          ki18n( "A DjVu backend" ),
          KAboutData::License_GPL,
          ki18n( "© 2006-2007 Pino Toscano" )
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/generators/djvu/kdjvu.cpp /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/generators/djvu/kdjvu.cpp
--- kdegraphics-4.1.0/okular/generators/djvu/kdjvu.cpp	2008-03-13 07:47:47.000000000 +0000
+++ kdegraphics-4.1.1/okular/generators/djvu/kdjvu.cpp	2008-08-28 09:06:52.000000000 +0100
@@ -479,6 +479,9 @@
 #endif
     handle_ddjvu_messages( m_djvu_cxt, false );
     char* imagebuffer = new char[ realwidth * realheight * 4 + 1 ];
+    // the following line workarounds a rare crash in djvulibre;
+    // it should be fixed with >= 3.5.21
+    ddjvu_page_get_width( djvupage );
     res = ddjvu_page_render( djvupage, DDJVU_RENDER_COLOR,
                   &pagerect, &renderrect, m_format, realwidth * 4, imagebuffer );
 #ifdef KDJVU_DEBUG
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/generators/djvu/libokularGenerator_djvu.desktop /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/generators/djvu/libokularGenerator_djvu.desktop
--- kdegraphics-4.1.0/okular/generators/djvu/libokularGenerator_djvu.desktop	2008-07-23 09:25:17.000000000 +0100
+++ kdegraphics-4.1.1/okular/generators/djvu/libokularGenerator_djvu.desktop	2008-08-28 09:06:52.000000000 +0100
@@ -17,6 +17,7 @@
 Comment[fr]=Interface d'Okular pour DjVu
 Comment[ga]=Inneall DjVu le haghaidh Okular
 Comment[gl]=Infraestrutura de DjVu para Okular
+Comment[hu]=DjVu-beolvasó az Okularhoz
 Comment[is]=DjVu stuðningur fyrir Okular
 Comment[it]=Backend DjVu per Okular
 Comment[ja]=Okular の DjVu バックエンド
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/generators/dvi/libokularGenerator_dvi.desktop /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/generators/dvi/libokularGenerator_dvi.desktop
--- kdegraphics-4.1.0/okular/generators/dvi/libokularGenerator_dvi.desktop	2008-07-23 09:25:17.000000000 +0100
+++ kdegraphics-4.1.1/okular/generators/dvi/libokularGenerator_dvi.desktop	2008-08-28 09:06:52.000000000 +0100
@@ -16,6 +16,7 @@
 Comment[fr]=Interface d'Okular pour le DVI
 Comment[ga]=Inneall DVI le haghaidh Okular
 Comment[gl]=Infraestrutura de DVI para Okular
+Comment[hu]=DVI-beolvasó az Okularhoz
 Comment[is]=DVI stuðningur fyrir Okular
 Comment[it]=Backend DVI per Okular
 Comment[ja]=Okular の DVI バックエンド
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/generators/epub/libokularGenerator_epub.desktop /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/generators/epub/libokularGenerator_epub.desktop
--- kdegraphics-4.1.0/okular/generators/epub/libokularGenerator_epub.desktop	2008-07-23 09:25:17.000000000 +0100
+++ kdegraphics-4.1.1/okular/generators/epub/libokularGenerator_epub.desktop	2008-08-28 09:06:53.000000000 +0100
@@ -11,6 +11,7 @@
 Name[fr]=Document EPub
 Name[ga]=Cáipéis EPub
 Name[gl]=Documento EPub
+Name[hu]=EPub-dokumentum
 Name[is]=EPub skjal
 Name[it]=Documento EPub
 Name[ja]=EPub 文書
@@ -41,6 +42,7 @@
 Comment[fr]=Interface d'Okular pour EPub
 Comment[ga]=Inneall EPub le haghaidh Okular
 Comment[gl]=Infraestrutura de EPub para Okular
+Comment[hu]=EPub-beolvasó az Okularhoz
 Comment[is]=EPub stuðningur fyrir Okular
 Comment[it]=Backend EPub per Okular
 Comment[ja]=Okular の EPub バックエンド
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/generators/fictionbook/libokularGenerator_fb.desktop /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/generators/fictionbook/libokularGenerator_fb.desktop
--- kdegraphics-4.1.0/okular/generators/fictionbook/libokularGenerator_fb.desktop	2008-07-23 09:25:17.000000000 +0100
+++ kdegraphics-4.1.1/okular/generators/fictionbook/libokularGenerator_fb.desktop	2008-08-28 09:06:52.000000000 +0100
@@ -51,6 +51,7 @@
 Comment[fr]=Interface d'Okular pour « FictionBook »
 Comment[ga]=Inneall FictionBook le haghaidh Okular
 Comment[gl]=Infraestrutura FictionBook para Okular
+Comment[hu]=FictionBook-beolvasó az Okularhoz
 Comment[is]=FictionBook stuðningur fyrir Okular
 Comment[it]=Backend FictionBook per Okular
 Comment[ja]=Okular の FictionBook バックエンド
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/generators/kimgio/libokularGenerator_kimgio.desktop /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/generators/kimgio/libokularGenerator_kimgio.desktop
--- kdegraphics-4.1.0/okular/generators/kimgio/libokularGenerator_kimgio.desktop	2008-07-23 09:25:17.000000000 +0100
+++ kdegraphics-4.1.1/okular/generators/kimgio/libokularGenerator_kimgio.desktop	2008-08-28 09:06:52.000000000 +0100
@@ -52,6 +52,7 @@
 Comment[fr]=Interface d'Okular pour les images
 Comment[ga]=Inneall íomhánna le haghaidh Okular
 Comment[gl]=Infraestrutura de imaxes para Okular
+Comment[hu]=Képbeolvasó az Okularhoz
 Comment[is]=Myndmeðhöndlunarstuðningur fyrir Okular
 Comment[it]=Backend immagini per Okular
 Comment[ja]=Okular の画像用バックエンド
@@ -72,7 +73,7 @@
 Comment[zh_CN]=Okular 的图像格式后端
 Comment[zh_TW]=Okular 影像後端
 X-KDE-ServiceTypes=okular/Generator
-MimeType=image/bmp;image/x-dds;image/x-eps;image/x-exr;image/gif;image/x-hdr;image/x-ico;image/jpeg2000;image/jpeg;video/x-mng;image/x-portable-bitmap;image/x-pcx;image/x-portable-graymap;image/png;image/x-portable-pixmap;image/x-psd;image/x-rgb;image/x-tga;image/tiff;image/x-xbitmap;image/x-xcf;image/x-xpixmap;
+MimeType=image/bmp;image/x-dds;image/x-eps;image/x-exr;image/gif;image/x-hdr;image/x-ico;image/jp2;image/jpeg;video/x-mng;image/x-portable-bitmap;image/x-pcx;image/x-portable-graymap;image/png;image/x-portable-pixmap;image/x-psd;image/x-rgb;image/x-tga;image/tiff;image/x-xbitmap;image/x-xcf;image/x-xpixmap;
 X-KDE-Library=okularGenerator_kimgio
 X-KDE-Priority=1
 X-KDE-okularAPIVersion=1
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/generators/kimgio/okularApplication_kimgio.desktop /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/generators/kimgio/okularApplication_kimgio.desktop
--- kdegraphics-4.1.0/okular/generators/kimgio/okularApplication_kimgio.desktop	2008-07-15 20:48:47.000000000 +0100
+++ kdegraphics-4.1.1/okular/generators/kimgio/okularApplication_kimgio.desktop	2008-08-28 09:06:52.000000000 +0100
@@ -1,5 +1,5 @@
 [Desktop Entry]
-MimeType=image/bmp;image/x-dds;image/x-eps;image/x-exr;image/gif;image/x-hdr;image/x-ico;image/jpeg2000;image/jpeg;video/x-mng;image/x-portable-bitmap;image/x-pcx;image/x-portable-graymap;image/png;image/x-portable-pixmap;image/x-psd;image/x-rgb;image/x-tga;image/tiff;image/x-xbitmap;image/x-xcf;image/x-xpixmap;
+MimeType=image/bmp;image/x-dds;image/x-eps;image/x-exr;image/gif;image/x-hdr;image/x-ico;image/jp2;image/jpeg;video/x-mng;image/x-portable-bitmap;image/x-pcx;image/x-portable-graymap;image/png;image/x-portable-pixmap;image/x-psd;image/x-rgb;image/x-tga;image/tiff;image/x-xbitmap;image/x-xcf;image/x-xpixmap;
 Terminal=false
 Name=Okular
 Name[x-test]=xxOkularxx
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/generators/kimgio/okularKimgio.desktop /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/generators/kimgio/okularKimgio.desktop
--- kdegraphics-4.1.0/okular/generators/kimgio/okularKimgio.desktop	2008-06-18 13:41:07.000000000 +0100
+++ kdegraphics-4.1.1/okular/generators/kimgio/okularKimgio.desktop	2008-08-28 09:06:52.000000000 +0100
@@ -5,4 +5,4 @@
 X-KDE-ServiceTypes=KParts/ReadOnlyPart
 X-KDE-Library=okularpart
 Type=Service
-MimeType=image/bmp;image/x-dds;image/x-eps;image/x-exr;image/gif;image/x-hdr;image/x-ico;image/jpeg2000;image/jpeg;video/x-mng;image/x-portable-bitmap;image/x-pcx;image/x-portable-graymap;image/png;image/x-portable-pixmap;image/x-psd;image/x-rgb;image/x-tga;image/tiff;image/x-xbitmap;image/x-xcf;image/x-xpixmap;
+MimeType=image/bmp;image/x-dds;image/x-eps;image/x-exr;image/gif;image/x-hdr;image/x-ico;image/jp2;image/jpeg;video/x-mng;image/x-portable-bitmap;image/x-pcx;image/x-portable-graymap;image/png;image/x-portable-pixmap;image/x-psd;image/x-rgb;image/x-tga;image/tiff;image/x-xbitmap;image/x-xcf;image/x-xpixmap;
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/generators/ooo/libokularGenerator_ooo.desktop /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/generators/ooo/libokularGenerator_ooo.desktop
--- kdegraphics-4.1.0/okular/generators/ooo/libokularGenerator_ooo.desktop	2008-07-23 09:25:17.000000000 +0100
+++ kdegraphics-4.1.1/okular/generators/ooo/libokularGenerator_ooo.desktop	2008-08-28 09:06:53.000000000 +0100
@@ -52,6 +52,7 @@
 Comment[fr]=Interface d'Okular pour le format OpenDocument
 Comment[ga]=Inneall OpenDocument le haghaidh Okular
 Comment[gl]=Infraestrutura de OpenDocument para Okular
+Comment[hu]=OpenDocument-beolvasó az Okularhoz
 Comment[is]=OpenDocument stuðningur fyrir Okular
 Comment[it]=Backend OpenDocument per Okular
 Comment[ja]=Okular の OpenDocument バックエンド
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/generators/plucker/libokularGenerator_plucker.desktop /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/generators/plucker/libokularGenerator_plucker.desktop
--- kdegraphics-4.1.0/okular/generators/plucker/libokularGenerator_plucker.desktop	2008-07-23 09:25:17.000000000 +0100
+++ kdegraphics-4.1.1/okular/generators/plucker/libokularGenerator_plucker.desktop	2008-08-28 09:06:52.000000000 +0100
@@ -51,6 +51,7 @@
 Comment[fr]=Interface d'Okular pour les fichiers Plucker
 Comment[ga]=Inneall Plucker le haghaidh Okular
 Comment[gl]=Infraestrutura de Plucker para Okular
+Comment[hu]=Plucker-beolvasó az Okularhoz
 Comment[is]=Plucker stuðningur fyrir Okular
 Comment[it]=Backend Plucker per Okular
 Comment[ja]=Okular の Plucker バックエンド
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/generators/poppler/generator_pdf.cpp /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/generators/poppler/generator_pdf.cpp
--- kdegraphics-4.1.0/okular/generators/poppler/generator_pdf.cpp	2008-07-24 14:48:55.000000000 +0100
+++ kdegraphics-4.1.1/okular/generators/poppler/generator_pdf.cpp	2008-08-28 09:06:52.000000000 +0100
@@ -241,7 +241,7 @@
          "okular_poppler",
          "okular_poppler",
          ki18n( "PDF Backend" ),
-         "0.1",
+         "0.1.1",
          ki18n( "A PDF file renderer" ),
          KAboutData::License_GPL,
          ki18n( "© 2005-2008 Albert Astals Cid" )
@@ -261,8 +261,6 @@
     setFeature( FontInfo );
     setFeature( PrintPostscript );
     setFeature( ReadRawData );
-    // update the configuration
-    reparseConfig();
     // generate the pixmapGeneratorThread
     generatorThread = new PDFPixmapGeneratorThread( this );
     connect(generatorThread, SIGNAL(finished()), this, SLOT(threadFinished()), Qt::QueuedConnection);
@@ -392,7 +390,8 @@
 
     loadPages(pagesVector, 0, false);
 
-    setAAOptions();
+    // update the configuration
+    reparseConfig();
 
     // the file has been loaded correctly
     return true;
@@ -839,7 +838,11 @@
         pstitle = document()->currentDocument().fileName();
     }
 
-    bool forceRasterize = pdfOptionsPage->printForceRaster();
+    bool forceRasterize = false;
+    if ( pdfOptionsPage )
+    {
+        forceRasterize = pdfOptionsPage->printForceRaster();
+    }
 
     Poppler::PSConverter *psConverter = pdfdoc->psConverter();
 
@@ -865,6 +868,9 @@
     {
         userMutex()->unlock();
         delete psConverter;
+#ifdef HAVE_POPPLER_0_7
+        tf.close();
+#endif
         int ret = Okular::FilePrinter::printFile( printer, tempfilename,
                                                   Okular::FilePrinter::SystemDeletesFiles,
                                                   Okular::FilePrinter::ApplicationSelectsPages,
@@ -1538,7 +1544,9 @@
         pdfConv->setPDFOptions( pdfConv->pdfOptions() | Poppler::PDFConverter::WithChanges );
 
     QMutexLocker locker( userMutex() );
-    return pdfConv->convert();
+    bool success = pdfConv->convert();
+    delete pdfConv;
+    return success;
 #else
     Q_UNUSED( fileName )
     Q_UNUSED( options )
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/generators/poppler/libokularGenerator_poppler.desktop /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/generators/poppler/libokularGenerator_poppler.desktop
--- kdegraphics-4.1.0/okular/generators/poppler/libokularGenerator_poppler.desktop	2008-07-23 09:25:17.000000000 +0100
+++ kdegraphics-4.1.1/okular/generators/poppler/libokularGenerator_poppler.desktop	2008-08-28 09:06:52.000000000 +0100
@@ -17,6 +17,7 @@
 Comment[fr]=Interface d'Okular pour les PDF (utilise poppler)
 Comment[ga]=Inneall PDF a úsáideann poppler le haghaidh Okular
 Comment[gl]=Infraestrutura de PDF mediante poppler para Okular
+Comment[hu]=Poppler-alapú PDF-beolvasó az Okularhoz
 Comment[is]=PDF stuðningur fyrir Okular í gegnum Poppler
 Comment[it]=Backend PDF per Okular che utilizza poppler
 Comment[ja]=Okular の PDF バックエンド (poppler を使用)
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/generators/spectre/libokularGenerator_ghostview.desktop /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/generators/spectre/libokularGenerator_ghostview.desktop
--- kdegraphics-4.1.0/okular/generators/spectre/libokularGenerator_ghostview.desktop	2008-07-23 09:25:17.000000000 +0100
+++ kdegraphics-4.1.1/okular/generators/spectre/libokularGenerator_ghostview.desktop	2008-08-28 09:06:52.000000000 +0100
@@ -19,6 +19,7 @@
 Comment[fr]=Interface d'Okular pour les fichiers Ghostscript PS/PDF
 Comment[ga]=Inneall PS/PDF Ghostscript le haghaidh Okular
 Comment[gl]=Infraestrutura Ghostscript PS/PDF para Okular
+Comment[hu]=Ghostscript PS/PDF-beolvasó az Okularhoz
 Comment[is]=Ghostscript PS/PDF stuðningur fyrir Okular
 Comment[it]=Backend Ghostscript PS/PDF per Okular
 Comment[ja]=Okular の Ghostscript PS/PDF バックエンド
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/generators/spectre/rc_okular_ghostview.cpp /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/generators/spectre/rc_okular_ghostview.cpp
--- kdegraphics-4.1.0/okular/generators/spectre/rc_okular_ghostview.cpp	1970-01-01 01:00:00.000000000 +0100
+++ kdegraphics-4.1.1/okular/generators/spectre/rc_okular_ghostview.cpp	2008-09-02 01:12:16.000000000 +0100
@@ -0,0 +1,6 @@
+//i18n: tag string
+//i18n: file conf/gssettingswidget.ui line 28
+i18n("General Settings");
+//i18n: tag string
+//i18n: file conf/gssettingswidget.ui line 37
+i18n("&Use platform fonts");
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/generators/tiff/libokularGenerator_tiff.desktop /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/generators/tiff/libokularGenerator_tiff.desktop
--- kdegraphics-4.1.0/okular/generators/tiff/libokularGenerator_tiff.desktop	2008-07-23 09:25:17.000000000 +0100
+++ kdegraphics-4.1.1/okular/generators/tiff/libokularGenerator_tiff.desktop	2008-08-28 09:06:52.000000000 +0100
@@ -11,6 +11,7 @@
 Name[fr]=Librairie d'Okular pour le format TIFF
 Name[ga]=Leabharlann TIFF Okular
 Name[gl]=Biblioteca TIFF de Okular
+Name[hu]=Okular TIFF-programkönyvtár
 Name[is]=Okular TIFF skráasafn
 Name[it]=Libreria TIFF di Okular
 Name[ja]=Okular TIFF ライブラリ
@@ -42,6 +43,7 @@
 Comment[fr]=Interface d'Okular pour les fichiers TIFF
 Comment[ga]=Inneall TIFF le haghaidh Okular
 Comment[gl]=Infraestrutura de TIFF para Okular
+Comment[hu]=TIFF-beolvasó az Okularhoz
 Comment[is]=TIFF stuðningur fyrir Okular
 Comment[it]=Backend TIFF per Okular
 Comment[ja]=Okular の TIFF バックエンド
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/generators/xps/generator_xps.cpp /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/generators/xps/generator_xps.cpp
--- kdegraphics-4.1.0/okular/generators/xps/generator_xps.cpp	2008-07-03 06:05:14.000000000 +0100
+++ kdegraphics-4.1.1/okular/generators/xps/generator_xps.cpp	2008-08-28 09:06:52.000000000 +0100
@@ -981,7 +981,7 @@
         QVector<qreal> dashPattern( pieces.count() );
         bool ok = false;
         for ( int i = 0; i < pieces.count(); ++i ) {
-            double value = pieces.at( i ).toInt( &ok );
+            qreal value = pieces.at( i ).toInt( &ok );
             if ( ok ) {
                 dashPattern[i] = value;
             } else {
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/generators/xps/libokularGenerator_xps.desktop /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/generators/xps/libokularGenerator_xps.desktop
--- kdegraphics-4.1.0/okular/generators/xps/libokularGenerator_xps.desktop	2008-07-23 09:25:17.000000000 +0100
+++ kdegraphics-4.1.1/okular/generators/xps/libokularGenerator_xps.desktop	2008-08-28 09:06:53.000000000 +0100
@@ -11,6 +11,7 @@
 Name[fr]=Module externe XPS pour Okular
 Name[ga]=Breiseán XPS Okular
 Name[gl]=Extensión XPS para Okular
+Name[hu]=Okular XPS-beolvasó
 Name[is]=Okular XPS íforritið
 Name[it]=Plugin XPF per Okular
 Name[ja]=Okular XPS プラグイン
@@ -42,6 +43,7 @@
 Comment[fr]=Interface d'Okular pour les fichiers XPS
 Comment[ga]=Inneall XPS le haghaidh Okular
 Comment[gl]=Infraestrutura de XPS para Okular
+Comment[hu]=XPS-beolvasó az Okularhoz
 Comment[is]=XPS stuðningur fyrir Okular
 Comment[it]=Backend XPF per Okular
 Comment[ja]=Okular の XPS バックエンド
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/shell/shell.cpp /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/shell/shell.cpp
--- kdegraphics-4.1.0/okular/shell/shell.cpp	2008-03-13 07:47:46.000000000 +0000
+++ kdegraphics-4.1.1/okular/shell/shell.cpp	2008-08-28 09:06:53.000000000 +0100
@@ -76,8 +76,8 @@
       // tell the KParts::MainWindow that this is indeed the main widget
       setCentralWidget(m_part->widget());
       // and integrate the part's GUI with the shell's
-      setupGUI(Keys | Save);
       createGUI(m_part);
+      setupGUI(Keys | Save);
       m_showToolBarAction = static_cast<KToggleAction*>(toolBarMenuAction());
       m_doc = qobject_cast<KDocumentViewer*>(m_part);
     }
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/ui/pageview.cpp /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/ui/pageview.cpp
--- kdegraphics-4.1.0/okular/ui/pageview.cpp	2008-06-10 12:40:55.000000000 +0100
+++ kdegraphics-4.1.1/okular/ui/pageview.cpp	2008-08-28 09:06:53.000000000 +0100
@@ -153,6 +153,8 @@
     KToggleAction * aViewContinuous;
     QAction * aPrevAction;
     KAction * aToggleForms;
+    KAction * aSpeakDoc;
+    KAction * aSpeakPage;
     KAction * aSpeakStop;
     KActionCollection * actionCollection;
 
@@ -335,6 +337,8 @@
     d->aViewContinuous = 0;
     d->aPrevAction = 0;
     d->aToggleForms = 0;
+    d->aSpeakDoc = 0;
+    d->aSpeakPage = 0;
     d->aSpeakStop = 0;
     d->actionCollection = 0;
     d->aPageSizes=0;
@@ -519,16 +523,15 @@
     ta->addAction( d->aMouseTextSelect );
 
     // speak actions
-    const bool hasTTS = Okular::Settings::useKTTSD();
-    KAction *speakDoc = new KAction( KIcon( "text-speak" ), i18n( "Speak Whole Document" ), this );
-    ac->addAction( "speak_document", speakDoc );
-    speakDoc->setEnabled( hasTTS );
-    connect( speakDoc, SIGNAL( triggered() ), SLOT( slotSpeakDocument() ) );
-
-    KAction *speakPage = new KAction( KIcon( "text-speak" ), i18n( "Speak Current Page" ), this );
-    ac->addAction( "speak_current_page", speakPage );
-    speakPage->setEnabled( hasTTS );
-    connect( speakPage, SIGNAL( triggered() ), SLOT( slotSpeakCurrentPage() ) );
+    d->aSpeakDoc = new KAction( KIcon( "text-speak" ), i18n( "Speak Whole Document" ), this );
+    ac->addAction( "speak_document", d->aSpeakDoc );
+    d->aSpeakDoc->setEnabled( false );
+    connect( d->aSpeakDoc, SIGNAL( triggered() ), SLOT( slotSpeakDocument() ) );
+
+    d->aSpeakPage = new KAction( KIcon( "text-speak" ), i18n( "Speak Current Page" ), this );
+    ac->addAction( "speak_current_page", d->aSpeakPage );
+    d->aSpeakPage->setEnabled( false );
+    connect( d->aSpeakPage, SIGNAL( triggered() ), SLOT( slotSpeakCurrentPage() ) );
 
     d->aSpeakStop = new KAction( KIcon( "media-playback-stop" ), i18n( "Stop Speaking" ), this );
     ac->addAction( "speak_stop_all", d->aSpeakStop );
@@ -832,6 +835,12 @@
         }
         d->aToggleAnnotator->setEnabled( allowAnnotations );
     }
+    if ( d->aSpeakDoc )
+    {
+        const bool enablettsactions = haspages ? Okular::Settings::useKTTSD() : false;
+        d->aSpeakDoc->setEnabled( enablettsactions );
+        d->aSpeakPage->setEnabled( enablettsactions );
+    }
 }
 
 void PageView::notifyViewportChanged( bool smoothMove )
@@ -2754,6 +2763,7 @@
     // if viewport was auto-moving, stop it
     if ( d->viewportMoveActive )
     {
+        center( d->viewportMoveDest.x(), d->viewportMoveDest.y() );
         d->viewportMoveActive = false;
         d->viewportMoveTimer->stop();
         verticalScrollBar()->setEnabled( true );
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/ui/pageviewutils.cpp /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/ui/pageviewutils.cpp
--- kdegraphics-4.1.0/okular/ui/pageviewutils.cpp	2008-06-10 12:40:55.000000000 +0100
+++ kdegraphics-4.1.1/okular/ui/pageviewutils.cpp	2008-08-28 09:06:53.000000000 +0100
@@ -102,12 +102,12 @@
     return m_zoomFactor;
 }
 
-qreal PageViewItem::absToPageX( qreal absX ) const
+double PageViewItem::absToPageX( double absX ) const
 {
     return ( absX - m_uncroppedGeometry.left() ) / m_uncroppedGeometry.width();
 }
 
-qreal PageViewItem::absToPageY( qreal absY ) const
+double PageViewItem::absToPageY( double absY ) const
 {
     return ( absY - m_uncroppedGeometry.top() ) / m_uncroppedGeometry.height();
 }
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/okular/VERSION /tmp/t1fz2IbI5G/kdegraphics-4.1.1/okular/VERSION
--- kdegraphics-4.1.0/okular/VERSION	2008-07-15 20:48:48.000000000 +0100
+++ kdegraphics-4.1.1/okular/VERSION	2008-08-28 09:06:53.000000000 +0100
@@ -1 +1 @@
-okular v0.7
+Okular v0.7.1
diff -Nru /tmp/zzzotW7RB5/kdegraphics-4.1.0/strigi-analyzer/xps/kfile_xps.desktop /tmp/t1fz2IbI5G/kdegraphics-4.1.1/strigi-analyzer/xps/kfile_xps.desktop
--- kdegraphics-4.1.0/strigi-analyzer/xps/kfile_xps.desktop	2008-06-11 09:33:11.000000000 +0100
+++ kdegraphics-4.1.1/strigi-analyzer/xps/kfile_xps.desktop	2008-08-28 09:06:53.000000000 +0100
@@ -12,7 +12,7 @@
 Name[ga]=Sonraíocht Pháipéir XML
 Name[gl]=Información da especificación de artigo XML
 Name[hi]=एक्सएमएल पेपर विशेषता जानकारी
-Name[hu]=XML papírmegadási jellemzők
+Name[hu]=XML papírleíró jellemzők
 Name[is]=XML pappírar - skilgreiningar
 Name[it]=Informazioni PaperSpecification XML
 Name[ja]=XML 用紙仕様情報