rev 6179 - in kde-extras/kipi-plugins/trunk/debian: . patches
Achim Bohnet
ach-guest at alioth.debian.org
Mon May 14 20:52:59 UTC 2007
Author: ach-guest
Date: 2007-05-14 20:52:59 +0000 (Mon, 14 May 2007)
New Revision: 6179
Added:
kde-extras/kipi-plugins/trunk/debian/patches/50_libkexiv2-0.patch
kde-extras/kipi-plugins/trunk/debian/patches/50_libkexiv2-1.patch
kde-extras/kipi-plugins/trunk/debian/patches/50_libkexiv2-2.patch
Modified:
kde-extras/kipi-plugins/trunk/debian/changelog
kde-extras/kipi-plugins/trunk/debian/control
Log:
kipi-plugins:
* Add debian/patches/50_libkexiv2-{1,2,3}.patch: Fixes FTBFS with
libexiv2 0.14. This adds also a build dependency on libkexiv2-dev
>=0.15.
Modified: kde-extras/kipi-plugins/trunk/debian/changelog
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/changelog 2007-05-14 19:42:10 UTC (rev 6178)
+++ kde-extras/kipi-plugins/trunk/debian/changelog 2007-05-14 20:52:59 UTC (rev 6179)
@@ -7,6 +7,9 @@
disparity on uploads.
* Add debian/patches/15_kdesvn_655231_fix-gallery-2.2-export.diff
Fixes export to gallery 2.2: http://bugs.kde.org/show_bug.cgi?id=142259
+ * Add debian/patches/50_libkexiv2-{1,2,3}.patch: Fixes FTBFS with
+ libexiv2 0.14. This adds also a build dependency on libkexiv2-dev
+ >=0.15.
[ Mark Purcell ]
* Include gcc4.3 patch from Martin (Closes: #417297)
Modified: kde-extras/kipi-plugins/trunk/debian/control
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/control 2007-05-14 19:42:10 UTC (rev 6178)
+++ kde-extras/kipi-plugins/trunk/debian/control 2007-05-14 20:52:59 UTC (rev 6179)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Mark Purcell <msp at debian.org>, Paul Telford <pxt at debian.org>, Achim Bohnet <ach at mpe.mpg.de>, Tom Albers <tomalbers at kde.nl>
-Build-Depends: cdbs, debhelper (>= 4.1.0), kdelibs4-dev, libexiv2-dev (>= 0.12), libexif-dev, libkipi0-dev (>= 0.1.5), libimlib2-dev, libtiff4-dev, pkg-config, libgphoto2-2-dev, libxslt1-dev, libgpod-dev
+Build-Depends: cdbs, debhelper (>= 4.1.0), kdelibs4-dev, libkexiv2-dev (>= 0.1.5), libexiv2-dev (>= 0.14), libexif-dev, libkipi0-dev (>= 0.1.5), libimlib2-dev, libtiff4-dev, pkg-config, libgphoto2-2-dev, libxslt1-dev, libgpod-dev
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kipi-plugins/branches/experimental/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kipi-plugins/branches/experimental/
Added: kde-extras/kipi-plugins/trunk/debian/patches/50_libkexiv2-0.patch
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/50_libkexiv2-0.patch (rev 0)
+++ kde-extras/kipi-plugins/trunk/debian/patches/50_libkexiv2-0.patch 2007-05-14 20:52:59 UTC (rev 6179)
@@ -0,0 +1,1781 @@
+Index: kipi-plugins/rawconverter/dcrawiface.cpp
+===================================================================
+--- kipi-plugins/rawconverter/dcrawiface.cpp (revisione 627500)
++++ kipi-plugins/rawconverter/dcrawiface.cpp (revisione 627501)
+@@ -4,7 +4,7 @@
+ * Date : 2006-12-09
+ * Description : dcraw interface (tested with dcraw 8.x releases)
+ *
+- * Copyright 2006 by Gilles Caulier and Marcel Wiesweg
++ * Copyright 2006-2007 by Gilles Caulier and Marcel Wiesweg
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -58,11 +58,14 @@
+ #include <kprocess.h>
+ #include <kstandarddirs.h>
+
++// LibKExiv2 includes.
++
++#include <libkexiv2/libkexiv2.h>
++
+ // Local includes.
+
+ #include "pluginsversion.h"
+ #include "rawfiles.h"
+-#include "exiv2iface.h"
+ #include "dcrawbinary.h"
+ #include "dcrawiface.h"
+ #include "dcrawiface.moc"
+@@ -492,7 +495,7 @@
+ fclose(f);
+
+ // Metadata restoration and update.
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.load(filePath);
+ exiv2Iface.setImageProgramId(QString("Kipi Raw Converter"), QString(kipiplugins_version));
+ exiv2Iface.setImageDimensions(QSize(d->width, d->height));
+@@ -547,7 +550,7 @@
+ png_set_text(png_ptr, info_ptr, &(text), 1);
+
+ // Metadata restoration and update.
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.load(filePath);
+ exiv2Iface.setImageProgramId(QString("Kipi Raw Converter"), QString(kipiplugins_version));
+ exiv2Iface.setImageDimensions(QSize(d->width, d->height));
+@@ -624,7 +627,7 @@
+
+
+ // Metadata restoration and update.
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.load(filePath);
+ exiv2Iface.setImageProgramId(QString("Kipi Raw Converter"), QString(kipiplugins_version));
+ exiv2Iface.setImageDimensions(QSize(d->width, d->height));
+Index: kipi-plugins/rawconverter/Makefile.am
+===================================================================
+--- kipi-plugins/rawconverter/Makefile.am (revisione 627500)
++++ kipi-plugins/rawconverter/Makefile.am (revisione 627501)
+@@ -5,23 +5,21 @@
+ METASOURCES = AUTO
+ SUBDIRS = profiles
+
+-INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
++INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(LIBKEXIV2_CFLAGS) $(all_includes)
+
+ # Install this plugin in the KDE modules directory
+ kde_module_LTLIBRARIES = kipiplugin_rawconverter.la
+
+-kipiplugin_rawconverter_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) \
+- $(top_builddir)/kipi-plugins/common/exiv2iface/libexiv2iface.la
++kipiplugin_rawconverter_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) $(LIBKEXIV2_LIBS_DEP)
+
+ # Srcs for the plugin
+ kipiplugin_rawconverter_la_SOURCES = plugin_rawconverter.cpp dcrawiface.cpp savesettingswidget.cpp \
+- batchdialog.cpp actionthread.cpp dcrawsettingswidget.cpp \
+- singledialog.cpp previewwidget.cpp iccjpeg.c dcrawbinary.cpp
++ batchdialog.cpp actionthread.cpp dcrawsettingswidget.cpp \
++ singledialog.cpp previewwidget.cpp iccjpeg.c dcrawbinary.cpp
+
+ # Libs needed by the plugin
+-kipiplugin_rawconverter_la_LIBADD = -ljpeg -lpng \
+- $(top_builddir)/kipi-plugins/common/exiv2iface/libexiv2iface.la \
+- $(LIB_TIFF) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
++kipiplugin_rawconverter_la_LIBADD = -ljpeg -lpng $(LIBKEXIV2_LIBS) \
++ $(LIB_TIFF) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+
+ # LD flags for the plugin
+ kipiplugin_rawconverter_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
+Index: kipi-plugins/rawconverter/dcrawiface.h
+===================================================================
+--- kipi-plugins/rawconverter/dcrawiface.h (revisione 627500)
++++ kipi-plugins/rawconverter/dcrawiface.h (revisione 627501)
+@@ -4,7 +4,7 @@
+ * Date : 2006-12-09
+ * Description : dcraw interface (tested with dcraw 8.x releases)
+ *
+- * Copyright 2006 by Gilles Caulier and Marcel Wiesweg
++ * Copyright 2006-2007 by Gilles Caulier and Marcel Wiesweg
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+Index: kipi-plugins/metadataedit/iptcstatus.cpp
+===================================================================
+--- kipi-plugins/metadataedit/iptcstatus.cpp (revisione 627500)
++++ kipi-plugins/metadataedit/iptcstatus.cpp (revisione 627501)
+@@ -3,7 +3,7 @@
+ * Date : 2006-10-12
+ * Description : IPTC status settings page.
+ *
+- * Copyright 2006 by Gilles Caulier
++ * Copyright 2006-2007 by Gilles Caulier
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -34,11 +34,14 @@
+ #include <kapplication.h>
+ #include <kaboutdata.h>
+
++// LibKExiv2 includes.
++
++#include <libkexiv2/libkexiv2.h>
++
+ // Local includes.
+
+ #include "metadatacheckbox.h"
+ #include "pluginsversion.h"
+-#include "exiv2iface.h"
+ #include "iptcstatus.h"
+ #include "iptcstatus.moc"
+
+@@ -291,7 +294,7 @@
+ void IPTCStatus::readMetadata(QByteArray& iptcData)
+ {
+ blockSignals(true);
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.setIptc(iptcData);
+ QString data;
+ int val;
+@@ -408,7 +411,7 @@
+
+ void IPTCStatus::applyMetadata(QByteArray& iptcData)
+ {
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.setIptc(iptcData);
+
+ if (d->statusCheck->isChecked())
+Index: kipi-plugins/metadataedit/plugin_metadataedit.cpp
+===================================================================
+--- kipi-plugins/metadataedit/plugin_metadataedit.cpp (revisione 627500)
++++ kipi-plugins/metadataedit/plugin_metadataedit.cpp (revisione 627501)
+@@ -3,7 +3,7 @@
+ * Date : 2006-10-11
+ * Description : a plugin to edit pictures metadata
+ *
+- * Copyright 2006 by Gilles Caulier
++ * Copyright 2006-2007 by Gilles Caulier
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -36,9 +36,12 @@
+
+ #include <libkipi/imagecollection.h>
+
++// LibKExiv2 includes.
++
++#include <libkexiv2/libkexiv2.h>
++
+ // Local includes.
+
+-#include "exiv2iface.h"
+ #include "exifeditdialog.h"
+ #include "iptceditdialog.h"
+ #include "commenteditdialog.h"
+@@ -186,10 +189,10 @@
+ KURL url = *it;
+ bool ret = false;
+
+- if (!KIPIPlugins::Exiv2Iface::isReadOnly(url.path()))
++ if (!KExiv2Library::LibKExiv2::isReadOnly(url.path()))
+ {
+ ret = true;
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ ret &= exiv2Iface.load(url.path());
+ ret &= exiv2Iface.clearExif();
+ ret &= exiv2Iface.save(url.path());
+@@ -229,7 +232,7 @@
+ if( importEXIFFile.isEmpty() )
+ return;
+
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ if (!exiv2Iface.load(importEXIFFile.path()))
+ {
+ KMessageBox::error(kapp->activeWindow(),
+@@ -266,10 +269,10 @@
+ KURL url = *it;
+ bool ret = false;
+
+- if (!KIPIPlugins::Exiv2Iface::isReadOnly(url.path()))
++ if (!KExiv2Library::LibKExiv2::isReadOnly(url.path()))
+ {
+ ret = true;
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ ret &= exiv2Iface.load(url.path());
+ ret &= exiv2Iface.setExif(exifData);
+ ret &= exiv2Iface.save(url.path());
+@@ -332,10 +335,10 @@
+ KURL url = *it;
+ bool ret = false;
+
+- if (!KIPIPlugins::Exiv2Iface::isReadOnly(url.path()))
++ if (!KExiv2Library::LibKExiv2::isReadOnly(url.path()))
+ {
+ ret = true;
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ ret &= exiv2Iface.load(url.path());
+ ret &= exiv2Iface.clearIptc();
+ ret &= exiv2Iface.save(url.path());
+@@ -375,7 +378,7 @@
+ if( importIPTCFile.isEmpty() )
+ return;
+
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ if (!exiv2Iface.load(importIPTCFile.path()))
+ {
+ KMessageBox::error(kapp->activeWindow(),
+@@ -412,10 +415,10 @@
+ KURL url = *it;
+ bool ret = false;
+
+- if (!KIPIPlugins::Exiv2Iface::isReadOnly(url.path()))
++ if (!KExiv2Library::LibKExiv2::isReadOnly(url.path()))
+ {
+ ret = true;
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ ret &= exiv2Iface.load(url.path());
+ ret &= exiv2Iface.setIptc(iptcData);
+ ret &= exiv2Iface.save(url.path());
+@@ -467,10 +470,10 @@
+ KIPI::ImageInfo info = m_interface->info(url);
+ info.setDescription(dlg.getComments());
+
+- if (!KIPIPlugins::Exiv2Iface::isReadOnly(url.path()))
++ if (!KExiv2Library::LibKExiv2::isReadOnly(url.path()))
+ {
+ ret = true;
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ ret &= exiv2Iface.load(url.path());
+
+ if (dlg.syncEXIFCommentIsChecked())
+@@ -534,10 +537,10 @@
+ info.setDescription(QString::null);
+ }
+
+- if (!KIPIPlugins::Exiv2Iface::isReadOnly(url.path()))
++ if (!KExiv2Library::LibKExiv2::isReadOnly(url.path()))
+ {
+ ret = true;
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ ret &= exiv2Iface.load(url.path());
+
+ if (dlg.removeEXIFCommentIsChecked())
+Index: kipi-plugins/metadataedit/iptccategories.cpp
+===================================================================
+--- kipi-plugins/metadataedit/iptccategories.cpp (revisione 627500)
++++ kipi-plugins/metadataedit/iptccategories.cpp (revisione 627501)
+@@ -3,7 +3,7 @@
+ * Date : 2006-10-15
+ * Description : IPTC categories settings page.
+ *
+- * Copyright 2006 by Gilles Caulier
++ * Copyright 2006-2007 by Gilles Caulier
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -34,9 +34,12 @@
+ #include <klistbox.h>
+ #include <klineedit.h>
+
++// LibKExiv2 includes.
++
++#include <libkexiv2/libkexiv2.h>
++
+ // Local includes.
+
+-#include "exiv2iface.h"
+ #include "iptccategories.h"
+ #include "iptccategories.moc"
+
+@@ -236,7 +239,7 @@
+ void IPTCCategories::readMetadata(QByteArray& iptcData)
+ {
+ blockSignals(true);
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.setIptc(iptcData);
+ QString data;
+
+@@ -270,7 +273,7 @@
+ void IPTCCategories::applyMetadata(QByteArray& iptcData)
+ {
+ QStringList newCategories;
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.setIptc(iptcData);
+
+ if (d->categoryCheck->isChecked())
+Index: kipi-plugins/metadataedit/exifdatetime.cpp
+===================================================================
+--- kipi-plugins/metadataedit/exifdatetime.cpp (revisione 627500)
++++ kipi-plugins/metadataedit/exifdatetime.cpp (revisione 627501)
+@@ -3,7 +3,7 @@
+ * Date : 2006-10-18
+ * Description : EXIF date and time settings page.
+ *
+- * Copyright 2006 by Gilles Caulier
++ * Copyright 2006-2007 by Gilles Caulier
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -36,9 +36,12 @@
+ #include <kaboutdata.h>
+ #include <kseparator.h>
+
++// LibKExiv2 includes.
++
++#include <libkexiv2/libkexiv2.h>
++
+ // Local includes.
+
+-#include "exiv2iface.h"
+ #include "exifdatetime.h"
+ #include "exifdatetime.moc"
+
+@@ -258,7 +261,7 @@
+ void EXIFDateTime::readMetadata(QByteArray& exifData)
+ {
+ blockSignals(true);
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.setExif(exifData);
+
+ QDateTime datetime;
+@@ -358,7 +361,7 @@
+
+ void EXIFDateTime::applyMetadata(QByteArray& exifData, QByteArray& iptcData)
+ {
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.setExif(exifData);
+ exiv2Iface.setIptc(iptcData);
+
+Index: kipi-plugins/metadataedit/exifcaption.cpp
+===================================================================
+--- kipi-plugins/metadataedit/exifcaption.cpp (revisione 627500)
++++ kipi-plugins/metadataedit/exifcaption.cpp (revisione 627501)
+@@ -3,7 +3,7 @@
+ * Date : 2006-10-12
+ * Description : EXIF caption settings page.
+ *
+- * Copyright 2006 by Gilles Caulier
++ * Copyright 2006-2007 by Gilles Caulier
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -37,10 +37,13 @@
+ #include <kapplication.h>
+ #include <kaboutdata.h>
+
++// LibKExiv2 includes.
++
++#include <libkexiv2/libkexiv2.h>
++
+ // Local includes.
+
+ #include "pluginsversion.h"
+-#include "exiv2iface.h"
+ #include "exifcaption.h"
+ #include "exifcaption.moc"
+
+@@ -267,7 +270,7 @@
+ void EXIFCaption::readMetadata(QByteArray& exifData)
+ {
+ blockSignals(true);
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.setExif(exifData);
+ QString data;
+
+@@ -329,7 +332,7 @@
+
+ void EXIFCaption::applyMetadata(QByteArray& exifData, QByteArray& iptcData)
+ {
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.setExif(exifData);
+ exiv2Iface.setIptc(iptcData);
+
+Index: kipi-plugins/metadataedit/exiflens.cpp
+===================================================================
+--- kipi-plugins/metadataedit/exiflens.cpp (revisione 627500)
++++ kipi-plugins/metadataedit/exiflens.cpp (revisione 627501)
+@@ -3,7 +3,7 @@
+ * Date : 2006-10-18
+ * Description : EXIF lens settings page.
+ *
+- * Copyright 2006 by Gilles Caulier
++ * Copyright 2006-2007 by Gilles Caulier
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -35,10 +35,13 @@
+ #include <kdialog.h>
+ #include <knuminput.h>
+
++// LibKExiv2 includes.
++
++#include <libkexiv2/libkexiv2.h>
++
+ // Local includes.
+
+ #include "metadatacheckbox.h"
+-#include "exiv2iface.h"
+ #include "exiflens.h"
+ #include "exiflens.moc"
+
+@@ -258,7 +261,7 @@
+ void EXIFLens::readMetadata(QByteArray& exifData)
+ {
+ blockSignals(true);
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.setExif(exifData);
+ long int num=1, den=1;
+ long val=0;
+@@ -362,7 +365,7 @@
+
+ void EXIFLens::applyMetadata(QByteArray& exifData)
+ {
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.setExif(exifData);
+ long int num=1, den=1;
+
+Index: kipi-plugins/metadataedit/exiflight.cpp
+===================================================================
+--- kipi-plugins/metadataedit/exiflight.cpp (revisione 627500)
++++ kipi-plugins/metadataedit/exiflight.cpp (revisione 627501)
+@@ -3,7 +3,7 @@
+ * Date : 2006-10-18
+ * Description : EXIF light settings page.
+ *
+- * Copyright 2006 by Gilles Caulier
++ * Copyright 2006-2007 by Gilles Caulier
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -36,10 +36,13 @@
+ #include <kdialog.h>
+ #include <knuminput.h>
+
++// LibKExiv2 includes.
++
++#include <libkexiv2/libkexiv2.h>
++
+ // Local includes.
+
+ #include "metadatacheckbox.h"
+-#include "exiv2iface.h"
+ #include "exiflight.h"
+ #include "exiflight.moc"
+
+@@ -247,7 +250,7 @@
+ void EXIFLight::readMetadata(QByteArray& exifData)
+ {
+ blockSignals(true);
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.setExif(exifData);
+ long int num=1, den=1;
+ long val=0;
+@@ -323,7 +326,7 @@
+
+ void EXIFLight::applyMetadata(QByteArray& exifData)
+ {
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.setExif(exifData);
+ long int num=1, den=1;
+
+Index: kipi-plugins/metadataedit/iptceditdialog.cpp
+===================================================================
+--- kipi-plugins/metadataedit/iptceditdialog.cpp (revisione 627500)
++++ kipi-plugins/metadataedit/iptceditdialog.cpp (revisione 627501)
+@@ -3,7 +3,7 @@
+ * Date : 2006-10-12
+ * Description : a dialog to edit IPTC metadata
+ *
+- * Copyright 2006 by Gilles Caulier
++ * Copyright 2006-2007 by Gilles Caulier
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -41,11 +41,14 @@
+ #include <libkipi/imagecollection.h>
+ #include <libkipi/plugin.h>
+
++// LibKExiv2 includes.
++
++#include <libkexiv2/libkexiv2.h>
++
+ // Local includes.
+
+ #include "kpaboutdata.h"
+ #include "pluginsversion.h"
+-#include "exiv2iface.h"
+ #include "iptccaption.h"
+ #include "iptccredits.h"
+ #include "iptcstatus.h"
+@@ -271,7 +274,7 @@
+
+ void IPTCEditDialog::slotItemChanged()
+ {
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.load((*d->currItem).path());
+ d->exifData = exiv2Iface.getExif();
+ d->iptcData = exiv2Iface.getIptc();
+@@ -284,7 +287,7 @@
+ d->statusPage->readMetadata(d->iptcData);
+ d->originPage->readMetadata(d->iptcData);
+
+- d->isReadOnly = KIPIPlugins::Exiv2Iface::isReadOnly((*d->currItem).path());
++ d->isReadOnly = KExiv2Library::LibKExiv2::isReadOnly((*d->currItem).path());
+ d->page_caption->setEnabled(!d->isReadOnly);
+ d->page_datetime->setEnabled(!d->isReadOnly);
+ d->page_subjects->setEnabled(!d->isReadOnly);
+@@ -330,7 +333,7 @@
+ d->creditsPage->applyMetadata(d->iptcData);
+ d->statusPage->applyMetadata(d->iptcData);
+ d->originPage->applyMetadata(d->iptcData);
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.load((*d->currItem).path());
+ exiv2Iface.setExif(d->exifData);
+ exiv2Iface.setIptc(d->iptcData);
+Index: kipi-plugins/metadataedit/iptckeywords.cpp
+===================================================================
+--- kipi-plugins/metadataedit/iptckeywords.cpp (revisione 627500)
++++ kipi-plugins/metadataedit/iptckeywords.cpp (revisione 627501)
+@@ -3,7 +3,7 @@
+ * Date : 2006-10-15
+ * Description : IPTC keywords settings page.
+ *
+- * Copyright 2006 by Gilles Caulier
++ * Copyright 2006-2007 by Gilles Caulier
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -34,9 +34,12 @@
+ #include <klistbox.h>
+ #include <klineedit.h>
+
++// LibKExiv2 includes.
++
++#include <libkexiv2/libkexiv2.h>
++
+ // Local includes.
+
+-#include "exiv2iface.h"
+ #include "iptckeywords.h"
+ #include "iptckeywords.moc"
+
+@@ -194,7 +197,7 @@
+ void IPTCKeywords::readMetadata(QByteArray& iptcData)
+ {
+ blockSignals(true);
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.setIptc(iptcData);
+ d->oldKeywords = exiv2Iface.getImageKeywords();
+
+@@ -215,7 +218,7 @@
+
+ void IPTCKeywords::applyMetadata(QByteArray& iptcData)
+ {
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.setIptc(iptcData);
+ QStringList newKeywords;
+
+Index: kipi-plugins/metadataedit/iptcsubjects.cpp
+===================================================================
+--- kipi-plugins/metadataedit/iptcsubjects.cpp (revisione 627500)
++++ kipi-plugins/metadataedit/iptcsubjects.cpp (revisione 627501)
+@@ -34,9 +34,12 @@
+ #include <klistbox.h>
+ #include <klineedit.h>
+
++// LibKExiv2 includes.
++
++#include <libkexiv2/libkexiv2.h>
++
+ // Local includes.
+
+-#include "exiv2iface.h"
+ #include "iptcsubjects.h"
+ #include "iptcsubjects.moc"
+
+@@ -194,7 +197,7 @@
+ void IPTCSubjects::readMetadata(QByteArray& iptcData)
+ {
+ blockSignals(true);
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.setIptc(iptcData);
+ d->oldSubjects = exiv2Iface.getImageSubjects();
+
+@@ -215,7 +218,7 @@
+
+ void IPTCSubjects::applyMetadata(QByteArray& iptcData)
+ {
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.setIptc(iptcData);
+ QStringList newSubjects;
+
+Index: kipi-plugins/metadataedit/exifadjust.cpp
+===================================================================
+--- kipi-plugins/metadataedit/exifadjust.cpp (revisione 627500)
++++ kipi-plugins/metadataedit/exifadjust.cpp (revisione 627501)
+@@ -3,7 +3,7 @@
+ * Date : 2006-10-18
+ * Description : EXIF adjustments settings page.
+ *
+- * Copyright 2006 by Gilles Caulier
++ * Copyright 2006-2007 by Gilles Caulier
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -35,10 +35,13 @@
+ #include <kdialog.h>
+ #include <knuminput.h>
+
++// LibKExiv2 includes.
++
++#include <libkexiv2/libkexiv2.h>
++
+ // Local includes.
+
+ #include "metadatacheckbox.h"
+-#include "exiv2iface.h"
+ #include "exifadjust.h"
+ #include "exifadjust.moc"
+
+@@ -231,7 +234,7 @@
+ void EXIFAdjust::readMetadata(QByteArray& exifData)
+ {
+ blockSignals(true);
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.setExif(exifData);
+ long int num=1, den=1;
+ long val=0;
+@@ -320,7 +323,7 @@
+
+ void EXIFAdjust::applyMetadata(QByteArray& exifData)
+ {
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.setExif(exifData);
+ long int num=1, den=1;
+
+Index: kipi-plugins/metadataedit/iptcorigin.cpp
+===================================================================
+--- kipi-plugins/metadataedit/iptcorigin.cpp (revisione 627500)
++++ kipi-plugins/metadataedit/iptcorigin.cpp (revisione 627501)
+@@ -3,7 +3,7 @@
+ * Date : 2006-10-13
+ * Description : IPTC origin settings page.
+ *
+- * Copyright 2006 by Gilles Caulier
++ * Copyright 2006-2007 by Gilles Caulier
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -34,10 +34,13 @@
+ #include <kdialog.h>
+ #include <klineedit.h>
+
++// LibKExiv2 includes.
++
++#include <libkexiv2/libkexiv2.h>
++
+ // Local includes.
+
+ #include "metadatacheckbox.h"
+-#include "exiv2iface.h"
+ #include "iptcorigin.h"
+ #include "iptcorigin.moc"
+
+@@ -524,7 +527,7 @@
+ void IPTCOrigin::readMetadata(QByteArray& iptcData)
+ {
+ blockSignals(true);
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.setIptc(iptcData);
+ QString data;
+
+@@ -635,7 +638,7 @@
+
+ void IPTCOrigin::applyMetadata(QByteArray& iptcData)
+ {
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.setIptc(iptcData);
+
+ if (d->objectNameCheck->isChecked())
+Index: kipi-plugins/metadataedit/exifdevice.cpp
+===================================================================
+--- kipi-plugins/metadataedit/exifdevice.cpp (revisione 627500)
++++ kipi-plugins/metadataedit/exifdevice.cpp (revisione 627501)
+@@ -3,7 +3,7 @@
+ * Date : 2006-10-18
+ * Description : EXIF device settings page.
+ *
+- * Copyright 2006 by Gilles Caulier
++ * Copyright 2006-2007 by Gilles Caulier
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -38,10 +38,13 @@
+ #include <klineedit.h>
+ #include <kseparator.h>
+
++// LibKExiv2 includes.
++
++#include <libkexiv2/libkexiv2.h>
++
+ // Local includes.
+
+ #include "metadatacheckbox.h"
+-#include "exiv2iface.h"
+ #include "exifdevice.h"
+ #include "exifdevice.moc"
+
+@@ -463,7 +466,7 @@
+ void EXIFDevice::readMetadata(QByteArray& exifData)
+ {
+ blockSignals(true);
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.setExif(exifData);
+ long int num=1, den=1;
+ long val=0;
+@@ -660,7 +663,7 @@
+
+ void EXIFDevice::applyMetadata(QByteArray& exifData)
+ {
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.setExif(exifData);
+ long int num=1, den=1;
+
+Index: kipi-plugins/metadataedit/iptcdatetime.cpp
+===================================================================
+--- kipi-plugins/metadataedit/iptcdatetime.cpp (revisione 627500)
++++ kipi-plugins/metadataedit/iptcdatetime.cpp (revisione 627501)
+@@ -3,7 +3,7 @@
+ * Date : 2006-10-12
+ * Description : IPTC date and time settings page.
+ *
+- * Copyright 2006 by Gilles Caulier
++ * Copyright 2006-2007 by Gilles Caulier
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -37,9 +37,12 @@
+ #include <kaboutdata.h>
+ #include <kseparator.h>
+
++// LibKExiv2 includes.
++
++#include <libkexiv2/libkexiv2.h>
++
+ // Local includes.
+
+-#include "exiv2iface.h"
+ #include "iptcdatetime.h"
+ #include "iptcdatetime.moc"
+
+@@ -299,7 +302,7 @@
+ void IPTCDateTime::readMetadata(QByteArray& iptcData)
+ {
+ blockSignals(true);
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.setIptc(iptcData);
+
+ QDate date;
+@@ -429,7 +432,7 @@
+
+ void IPTCDateTime::applyMetadata(QByteArray& exifData, QByteArray& iptcData)
+ {
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.setExif(exifData);
+ exiv2Iface.setIptc(iptcData);
+
+Index: kipi-plugins/metadataedit/iptccredits.cpp
+===================================================================
+--- kipi-plugins/metadataedit/iptccredits.cpp (revisione 627500)
++++ kipi-plugins/metadataedit/iptccredits.cpp (revisione 627501)
+@@ -3,7 +3,7 @@
+ * Date : 2006-10-12
+ * Description : IPTC credits settings page.
+ *
+- * Copyright 2006 by Gilles Caulier
++ * Copyright 2006-2007 by Gilles Caulier
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -34,9 +34,12 @@
+ #include <kdialog.h>
+ #include <klineedit.h>
+
++// LibKExiv2 includes.
++
++#include <libkexiv2/libkexiv2.h>
++
+ // Local includes.
+
+-#include "exiv2iface.h"
+ #include "iptccredits.h"
+ #include "iptccredits.moc"
+
+@@ -230,7 +233,7 @@
+ void IPTCCredits::readMetadata(QByteArray& iptcData)
+ {
+ blockSignals(true);
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.setIptc(iptcData);
+ QString data;
+
+@@ -299,7 +302,7 @@
+
+ void IPTCCredits::applyMetadata(QByteArray& iptcData)
+ {
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.setIptc(iptcData);
+
+ if (d->copyrightCheck->isChecked())
+Index: kipi-plugins/metadataedit/iptccaption.cpp
+===================================================================
+--- kipi-plugins/metadataedit/iptccaption.cpp (revisione 627500)
++++ kipi-plugins/metadataedit/iptccaption.cpp (revisione 627501)
+@@ -3,7 +3,7 @@
+ * Date : 2006-10-12
+ * Description : IPTC caption settings page.
+ *
+- * Copyright 2006 by Gilles Caulier
++ * Copyright 2006-2007 by Gilles Caulier
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -38,9 +38,12 @@
+ #include <kaboutdata.h>
+ #include <kseparator.h>
+
++// LibKExiv2 includes.
++
++#include <libkexiv2/libkexiv2.h>
++
+ // Local includes.
+
+-#include "exiv2iface.h"
+ #include "iptccaption.h"
+ #include "iptccaption.moc"
+
+@@ -248,7 +251,7 @@
+ void IPTCCaption::readMetadata(QByteArray& iptcData)
+ {
+ blockSignals(true);
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.setIptc(iptcData);
+ QString data;
+
+@@ -300,7 +303,7 @@
+
+ void IPTCCaption::applyMetadata(QByteArray& exifData, QByteArray& iptcData)
+ {
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.setExif(exifData);
+ exiv2Iface.setIptc(iptcData);
+
+Index: kipi-plugins/metadataedit/exifeditdialog.cpp
+===================================================================
+--- kipi-plugins/metadataedit/exifeditdialog.cpp (revisione 627500)
++++ kipi-plugins/metadataedit/exifeditdialog.cpp (revisione 627501)
+@@ -3,7 +3,7 @@
+ * Date : 2006-10-12
+ * Description : a dialog to edit EXIF metadata
+ *
+- * Copyright 2006 by Gilles Caulier
++ * Copyright 2006-2007 by Gilles Caulier
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -41,11 +41,14 @@
+ #include <libkipi/imagecollection.h>
+ #include <libkipi/plugin.h>
+
++// LibKExiv2 includes.
++
++#include <libkexiv2/libkexiv2.h>
++
+ // Local includes.
+
+ #include "kpaboutdata.h"
+ #include "pluginsversion.h"
+-#include "exiv2iface.h"
+ #include "exifcaption.h"
+ #include "exifdatetime.h"
+ #include "exiflens.h"
+@@ -251,7 +254,7 @@
+
+ void EXIFEditDialog::slotItemChanged()
+ {
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.load((*d->currItem).path());
+ d->exifData = exiv2Iface.getExif();
+ d->iptcData = exiv2Iface.getIptc();
+@@ -262,7 +265,7 @@
+ d->lightPage->readMetadata(d->exifData);
+ d->adjustPage->readMetadata(d->exifData);
+
+- d->isReadOnly = KIPIPlugins::Exiv2Iface::isReadOnly((*d->currItem).path());
++ d->isReadOnly = KExiv2Library::LibKExiv2::isReadOnly((*d->currItem).path());
+ d->page_caption->setEnabled(!d->isReadOnly);
+ d->page_datetime->setEnabled(!d->isReadOnly);
+ d->page_lens->setEnabled(!d->isReadOnly);
+@@ -304,7 +307,7 @@
+ d->devicePage->applyMetadata(d->exifData);
+ d->lightPage->applyMetadata(d->exifData);
+ d->adjustPage->applyMetadata(d->exifData);
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.load((*d->currItem).path());
+ exiv2Iface.setExif(d->exifData);
+ exiv2Iface.setIptc(d->iptcData);
+Index: kipi-plugins/metadataedit/Makefile.am
+===================================================================
+--- kipi-plugins/metadataedit/Makefile.am (revisione 627500)
++++ kipi-plugins/metadataedit/Makefile.am (revisione 627501)
+@@ -1,12 +1,11 @@
+-INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
++INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKEXIV2_CFLAGS) $(LIBKIPI_CFLAGS) $(all_includes)
+
+ METASOURCES = AUTO
+
+ # Install this plugin in the KDE modules directory
+ kde_module_LTLIBRARIES = kipiplugin_metadataedit.la
+
+-kipiplugin_metadataedit_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) \
+- $(top_builddir)/kipi-plugins/common/exiv2iface/libexiv2iface.la
++kipiplugin_metadataedit_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) $(LIBKEXIV2_LIBS_DEP)
+
+ # Srcs for the plugin
+ kipiplugin_metadataedit_la_SOURCES = plugin_metadataedit.cpp metadatacheckbox.cpp \
+@@ -19,7 +18,7 @@
+ commenteditdialog.cpp commentremovedialog.cpp
+
+ # Libs needed by the plugin
+-kipiplugin_metadataedit_la_LIBADD = $(top_builddir)/kipi-plugins/common/exiv2iface/libexiv2iface.la \
++kipiplugin_metadataedit_la_LIBADD = $(LIBKEXIV2_LIBS) \
+ -lkipiplugins $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+
+ # LD flags for the plugin
+Index: kipi-plugins/galleryexport/gallerytalker.cpp
+===================================================================
+--- kipi-plugins/galleryexport/gallerytalker.cpp (revisione 627500)
++++ kipi-plugins/galleryexport/gallerytalker.cpp (revisione 627501)
+@@ -34,10 +34,13 @@
+ #include <cstring>
+ #include <cstdio>
+
++// LibKExiv2 includes.
++
++#include <libkexiv2/libkexiv2.h>
++
+ #include "galleryitem.h"
+ #include "gallerympform.h"
+ #include "gallerytalker.h"
+-#include "exiv2iface.h"
+
+ namespace KIPIGalleryExportPlugin
+ {
+@@ -219,7 +222,7 @@
+
+ if ("JPEG" == QString(QImageIO::imageFormat(photoPath)).upper())
+ {
+- KIPIPlugins::Exiv2Iface exiv2;
++ KExiv2Library::LibKExiv2 exiv2;
+ if (exiv2.load(photoPath))
+ {
+ exiv2.save(path);
+Index: kipi-plugins/galleryexport/Makefile.am
+===================================================================
+--- kipi-plugins/galleryexport/Makefile.am (revisione 627500)
++++ kipi-plugins/galleryexport/Makefile.am (revisione 627501)
+@@ -1,12 +1,11 @@
+-INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
++INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKEXIV2_CFLAGS) $(LIBKIPI_CFLAGS) $(all_includes)
+
+ METASOURCES = AUTO
+
+ # Install this plugin in the KDE modules directory
+ kde_module_LTLIBRARIES = kipiplugin_galleryexport.la
+
+-kipiplugin_galleryexport_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) \
+- $(top_builddir)/kipi-plugins/common/exiv2iface/libexiv2iface.la
++kipiplugin_galleryexport_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) $(LIBKEXIV2_LIBS_DEP)
+
+ kipiplugin_galleryexport_la_SOURCES = plugin_galleryexport.cpp \
+ galleries.cpp gallerylist.cpp galleryconfig.cpp \
+@@ -14,7 +13,7 @@
+ gallerywidget.cpp gallerympform.cpp galleryalbumdialog.ui \
+ galleryviewitem.cpp
+
+-kipiplugin_galleryexport_la_LIBADD = $(top_builddir)/kipi-plugins/common/exiv2iface/libexiv2iface.la \
++kipiplugin_galleryexport_la_LIBADD = $(LIBKEXIV2_LIBS) \
+ -lkwalletclient $(LIB_KHTML) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+
+ kipiplugin_galleryexport_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
+Index: kipi-plugins/timeadjust/timeadjustdialog.h
+===================================================================
+--- kipi-plugins/timeadjust/timeadjustdialog.h (revisione 627500)
++++ kipi-plugins/timeadjust/timeadjustdialog.h (revisione 627501)
+@@ -5,7 +5,7 @@
+ * Description : a plugin to set time stamp of picture files.
+ *
+ * Copyright 2003-2005 by Jesper Pedersen
+- * Copyright 2006 by Gilles Caulier
++ * Copyright 2006-2007 by Gilles Caulier
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+Index: kipi-plugins/timeadjust/Makefile.am
+===================================================================
+--- kipi-plugins/timeadjust/Makefile.am (revisione 627500)
++++ kipi-plugins/timeadjust/Makefile.am (revisione 627501)
+@@ -1,19 +1,17 @@
+-INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
++INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKEXIV2_CFLAGS) $(LIBKIPI_CFLAGS) $(all_includes)
+
+ METASOURCES = AUTO
+
+ # Install this plugin in the KDE modules directory
+ kde_module_LTLIBRARIES = kipiplugin_timeadjust.la
+
+-kipiplugin_timeadjust_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) \
+- $(top_builddir)/kipi-plugins/common/exiv2iface/libexiv2iface.la
++kipiplugin_timeadjust_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) $(LIBKEXIV2_LIBS_DEP)
+
+ # Srcs for the plugin
+ kipiplugin_timeadjust_la_SOURCES = plugin_timeadjust.cpp timeadjustdialog.cpp
+
+ # Libs needed by the plugin
+-kipiplugin_timeadjust_la_LIBADD = $(top_builddir)/kipi-plugins/common/exiv2iface/libexiv2iface.la \
+- $(LIBKIPI_LIBS) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
++kipiplugin_timeadjust_la_LIBADD = $(LIBKEXIV2_LIBS) $(LIBKIPI_LIBS) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+
+ # LD flags for the plugin
+ kipiplugin_timeadjust_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
+Index: kipi-plugins/timeadjust/timeadjustdialog.cpp
+===================================================================
+--- kipi-plugins/timeadjust/timeadjustdialog.cpp (revisione 627500)
++++ kipi-plugins/timeadjust/timeadjustdialog.cpp (revisione 627501)
+@@ -5,7 +5,7 @@
+ * Description : a plugin to set time stamp of picture files.
+ *
+ * Copyright 2003-2005 by Jesper Pedersen
+- * Copyright 2006 by Gilles Caulier
++ * Copyright 2006-2007 by Gilles Caulier
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -54,11 +54,14 @@
+ #include <libkipi/interface.h>
+ #include <libkipi/imageinfo.h>
+
++// LibKExiv2 includes.
++
++#include <libkexiv2/libkexiv2.h>
++
+ // Local includes.
+
+ #include "kpaboutdata.h"
+ #include "pluginsversion.h"
+-#include "exiv2iface.h"
+ #include "timeadjustdialog.h"
+ #include "timeadjustdialog.moc"
+
+@@ -435,10 +438,10 @@
+ {
+ if (d->syncEXIFDateCheck->isChecked() || d->syncIPTCDateCheck->isChecked())
+ {
+- if (!KIPIPlugins::Exiv2Iface::isReadOnly(url.path()))
++ if (!KExiv2Library::LibKExiv2::isReadOnly(url.path()))
+ {
+ ret = true;
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+
+ ret &= exiv2Iface.load(url.path());
+ if (ret)
+@@ -494,7 +497,7 @@
+ }
+ else if (d->exif->isChecked())
+ {
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ if ( !exiv2Iface.load(url.path()) )
+ return time;
+
+Index: NEWS
+===================================================================
+--- NEWS (revisione 627500)
++++ NEWS (revisione 627501)
+@@ -5,6 +5,9 @@
+
+ Kipi-plugins NEW FEATURES
+
++General : Moved Exiv2Iface class to a new shared library named libkexiv2 used by
++ kipi-plugins and digiKam.
++
+ Kipi-plugins BUG FIXING from B.K.O (http://bugs.kde.org):
+ 001 ==> 139264 : General : Prefer Exif DateTimeOriginal for image date/time (DateTimeDigitized and DateTime only used as fallback)
+
+@@ -23,7 +26,7 @@
+
+ Kipi-plugins NEW FEATURES
+
+-Slideshow : Show image comments (configurable)
++Slideshow : Show image comments (configurable)
+
+
+ Kipi-plugins BUG FIXING from B.K.O (http://bugs.kde.org):
+Index: kipi-plugins/sync/gallerytalker.cpp
+===================================================================
+--- kipi-plugins/sync/gallerytalker.cpp (revisione 627500)
++++ kipi-plugins/sync/gallerytalker.cpp (revisione 627501)
+@@ -34,10 +34,13 @@
+ #include <cstring>
+ #include <cstdio>
+
++// LibKExiv2 includes.
++
++#include <libkexiv2/libkexiv2.h>
++
+ #include "galleryitem.h"
+ #include "gallerympform.h"
+ #include "gallerytalker.h"
+-#include "exiv2iface.h"
+
+ namespace KIPIGalleryExportPlugin
+ {
+@@ -219,7 +222,7 @@
+
+ if ("JPEG" == QString(QImageIO::imageFormat(photoPath)).upper())
+ {
+- KIPIPlugins::Exiv2Iface exiv2;
++ KExiv2Library::LibKExiv2 exiv2;
+ if (exiv2.load(photoPath))
+ {
+ exiv2.save(path);
+Index: kipi-plugins/sync/Makefile.am
+===================================================================
+--- kipi-plugins/sync/Makefile.am (revisione 627500)
++++ kipi-plugins/sync/Makefile.am (revisione 627501)
+@@ -1,18 +1,17 @@
+-INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
++INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKEXIV2_CFLAGS) $(LIBKIPI_CFLAGS) $(all_includes)
+
+ METASOURCES = AUTO
+
+ # Install this plugin in the KDE modules directory
+ kde_module_LTLIBRARIES = kipiplugin_sync.la
+
+-kipiplugin_sync_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) \
+- $(top_builddir)/kipi-plugins/common/exiv2iface/libexiv2iface.la
++kipiplugin_sync_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) $(LIBKEXIV2_LIBS_DEP)
+
+ kipiplugin_sync_la_SOURCES = plugin_sync.cpp \
+ sink.cpp sinkfactory.cpp sinks.cpp \
+ sinklist.cpp sinklistbase.ui
+
+-kipiplugin_sync_la_LIBADD = $(top_builddir)/kipi-plugins/common/exiv2iface/libexiv2iface.la \
++kipiplugin_sync_la_LIBADD = $(LIBKEXIV2_LIBS) \
+ -lkwalletclient $(LIB_KHTML) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+
+ kipiplugin_sync_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
+Index: kipi-plugins/sendimages/sendimages.cpp
+===================================================================
+--- kipi-plugins/sendimages/sendimages.cpp (revisione 627500)
++++ kipi-plugins/sendimages/sendimages.cpp (revisione 627501)
+@@ -3,7 +3,7 @@
+ * Date : 2004-02-25
+ * Description : a kipi plugin to e-mailing images
+ *
+- * Copyright 2004-2005 by Gilles Caulier
++ * Copyright 2004-2007 by Gilles Caulier
+ * Copyright 2006 by Tom Albers
+ *
+ * This program is free software; you can redistribute it
+@@ -50,11 +50,14 @@
+ #include <knuminput.h>
+ #include <kurlrequester.h>
+
++// LibKExiv2 includes.
++
++#include <libkexiv2/libkexiv2.h>
++
+ // Local include files
+
+ #include "sendimagesdialog.h"
+ #include "listimageserrordialog.h"
+-#include "exiv2iface.h"
+ #include "actions.h"
+ #include "pluginsversion.h"
+ #include "sendimages.h"
+@@ -193,7 +196,7 @@
+ m_imageFormat.upper() == "JPEG")
+ {
+ QString targetFile = m_tmp + imageNameFormat;
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+
+ if (exiv2Iface.load(imageName))
+ {
+Index: kipi-plugins/sendimages/sendimages.h
+===================================================================
+--- kipi-plugins/sendimages/sendimages.h (revisione 627500)
++++ kipi-plugins/sendimages/sendimages.h (revisione 627501)
+@@ -3,7 +3,7 @@
+ * Date : 2004-02-25
+ * Description : a kipi plugin to e-mailing images
+ *
+- * Copyright 2004-2005 by Gilles Caulier
++ * Copyright 2004-2007 by Gilles Caulier
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+Index: kipi-plugins/sendimages/Makefile.am
+===================================================================
+--- kipi-plugins/sendimages/Makefile.am (revisione 627500)
++++ kipi-plugins/sendimages/Makefile.am (revisione 627501)
+@@ -1,23 +1,22 @@
+-INCLUDES = -I$(top_srcdir)/kipi-plugins/common/exiv2iface \
+- $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
++INCLUDES = $(LIBKEXIV2_CFLAGS) $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
+
+ METASOURCES = AUTO
+
+ # Install this plugin in the KDE modules directory
+ kde_module_LTLIBRARIES = kipiplugin_sendimages.la
+-kipiplugin_sendimages_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
++kipiplugin_sendimages_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) $(LIBKEXIV2_LIBS_DEP)
+
+ # Srcs for the plugin
+ kipiplugin_sendimages_la_SOURCES = plugin_sendimages.cpp sendimagesdialog.cpp \
+ listimageserrordialog.cpp sendimages.cpp
+
+ # Libs needed by the plugin
+-kipiplugin_sendimages_la_LIBADD = $(top_builddir)/kipi-plugins/common/exiv2iface/libexiv2iface.la \
+- $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
++kipiplugin_sendimages_la_LIBADD = $(LIBKEXIV2_LIBS) $(LIBKIPI_LIBS) $(LIB_KIO) \
++ $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+
+ # LD flags for the plugin
+ kipiplugin_sendimages_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) \
+- -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
++ -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
+
+ # Install the desktop file needed to detect the plugin
+ kde_services_DATA = kipiplugin_sendimages.desktop
+Index: kipi-plugins/gpssync/gpslistviewitem.cpp
+===================================================================
+--- kipi-plugins/gpssync/gpslistviewitem.cpp (revisione 627500)
++++ kipi-plugins/gpssync/gpslistviewitem.cpp (revisione 627501)
+@@ -3,7 +3,7 @@
+ * Date : 2006-09-19
+ * Description : GPS file list view item.
+ *
+- * Copyright 2006 by Gilles Caulier
++ * Copyright 2006-2007 by Gilles Caulier
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -29,9 +29,12 @@
+ #include <kio/previewjob.h>
+ #include <kiconloader.h>
+
++// LibKExiv2 includes.
++
++#include <libkexiv2/libkexiv2.h>
++
+ // Local includes.
+
+-#include "exiv2iface.h"
+ #include "gpslistviewitem.h"
+ #include "gpslistviewitem.moc"
+
+@@ -85,7 +88,7 @@
+ d->readOnly = true;
+ }
+
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.load(d->url.path());
+ setDateTime(exiv2Iface.getImageDateTime());
+ double alt, lat, lng;
+@@ -189,7 +192,7 @@
+ if (isEnabled() && isDirty() && !isReadOnly())
+ {
+ setPixmap(1, SmallIcon("run"));
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ bool ret = exiv2Iface.load(d->url.path());
+
+ if (d->erase)
+Index: kipi-plugins/gpssync/gpslistviewitem.h
+===================================================================
+--- kipi-plugins/gpssync/gpslistviewitem.h (revisione 627500)
++++ kipi-plugins/gpssync/gpslistviewitem.h (revisione 627501)
+@@ -3,7 +3,7 @@
+ * Date : 2006-09-19
+ * Description : GPS file list view item.
+ *
+- * Copyright 2006 by Gilles Caulier
++ * Copyright 2006-2007 by Gilles Caulier
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+Index: kipi-plugins/gpssync/plugin_gpssync.cpp
+===================================================================
+--- kipi-plugins/gpssync/plugin_gpssync.cpp (revisione 627500)
++++ kipi-plugins/gpssync/plugin_gpssync.cpp (revisione 627501)
+@@ -4,7 +4,7 @@
+ * Description : a plugin to synchronize pictures with
+ * a GPS device.
+ *
+- * Copyright 2006 by Gilles Caulier
++ * Copyright 2006-2007 by Gilles Caulier
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -38,9 +38,12 @@
+
+ #include <libkipi/imagecollection.h>
+
++// LibKExiv2 includes.
++
++#include <libkexiv2/libkexiv2.h>
++
+ // Local includes.
+
+-#include "exiv2iface.h"
+ #include "gpsbabelbinary.h"
+ #include "gpsdatacontainer.h"
+ #include "gpseditdialog.h"
+@@ -181,7 +184,7 @@
+ return;
+
+ KURL img = images.images().first();
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.load(img.path());
+ double alt, lat, lng;
+ bool hasGPSInfo = exiv2Iface.getGPSInfo(alt, lat, lng);
+@@ -275,7 +278,7 @@
+ if (ext == QString("JPG") || ext == QString("JPEG") || ext == QString("JPE"))
+ {
+ ret = true;
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ ret &= exiv2Iface.load(url.path());
+ ret &= exiv2Iface.removeGPSInfo();
+ ret &= exiv2Iface.save(url.path());
+Index: kipi-plugins/gpssync/plugin_gpssync.h
+===================================================================
+--- kipi-plugins/gpssync/plugin_gpssync.h (revisione 627500)
++++ kipi-plugins/gpssync/plugin_gpssync.h (revisione 627501)
+@@ -4,7 +4,7 @@
+ * Description : a plugin to synchronize pictures with
+ * a GPS device.
+ *
+- * Copyright 2006 by Gilles Caulier
++ * Copyright 2006-2007 by Gilles Caulier
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+Index: kipi-plugins/gpssync/Makefile.am
+===================================================================
+--- kipi-plugins/gpssync/Makefile.am (revisione 627500)
++++ kipi-plugins/gpssync/Makefile.am (revisione 627501)
+@@ -1,21 +1,20 @@
+-INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
++INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKEXIV2_CFLAGS) $(LIBKIPI_CFLAGS) $(all_includes)
+
+ METASOURCES = AUTO
+
+ # Install this plugin in the KDE modules directory
+ kde_module_LTLIBRARIES = kipiplugin_gpssync.la
+
+-kipiplugin_gpssync_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) \
+- $(top_builddir)/kipi-plugins/common/exiv2iface/libexiv2iface.la
++kipiplugin_gpssync_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) $(LIBKEXIV2_LIBS_DEP)
+
+ # Srcs for the plugin
+ kipiplugin_gpssync_la_SOURCES = plugin_gpssync.cpp gpssyncdialog.cpp gpslistviewitem.cpp \
+- gpsbabelbinary.cpp gpsdataparser.cpp gpseditdialog.cpp \
+- gpsmapwidget.cpp
++ gpsbabelbinary.cpp gpsdataparser.cpp gpseditdialog.cpp \
++ gpsmapwidget.cpp
+
+ # Libs needed by the plugin
+-kipiplugin_gpssync_la_LIBADD = $(top_builddir)/kipi-plugins/common/exiv2iface/libexiv2iface.la \
+- -lkipiplugins $(LIBKIPI_LIBS) $(LIB_KHTML) $(LIB_KPARTS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
++kipiplugin_gpssync_la_LIBADD = $(LIBKEXIV2_LIBS) -lkipiplugins $(LIBKIPI_LIBS) $(LIB_KHTML) \
++ $(LIB_KPARTS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+
+ # LD flags for the plugin
+ kipiplugin_gpssync_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries)
+Index: kipi-plugins/common/Makefile.am
+===================================================================
+--- kipi-plugins/common/Makefile.am (revisione 627500)
++++ kipi-plugins/common/Makefile.am (revisione 627501)
+@@ -1,2 +1,2 @@
+-SUBDIRS = exiv2iface libkipiplugins
++SUBDIRS = libkipiplugins
+
+Index: kipi-plugins/configure.in.in
+===================================================================
+--- kipi-plugins/configure.in.in (revisione 627500)
++++ kipi-plugins/configure.in.in (revisione 627501)
+@@ -60,8 +60,55 @@
+ DO_NOT_COMPILE="$DO_NOT_COMPILE kipi-plugins"
+ fi
+
++# --------------------------------------------------------------------
++# Check for libkexiv2
++# --------------------------------------------------------------------
++
++AC_MSG_CHECKING([for libkexiv2 in our sources])
++if test -d $srcdir/libkexiv2; then
++ have_libkexiv2=yes
++ LIBKEXIV2_CFLAGS='-I$(top_srcdir)'
++ LIBKEXIV2_LIBS='$(top_builddir)/libkexiv2/libkexiv2.la'
++ LIBKEXIV2_LIBS_DEP='$(LIBKEXIV2_LIBS)'
++ AC_MSG_RESULT([found])
++ AC_SUBST(LIBKEXIV2_CFLAGS)
++ AC_SUBST(LIBKEXIV2_LIBS)
++ AC_SUBST(LIBKEXIV2_LIBS_DEP)
++else
++
++ if test "$PKGCONFIGFOUND" = "yes" ; then
++ # check for libkexiv2
++ have_libkexiv2=no
++
++ KDE_PKG_CHECK_MODULES(LIBKEXIV2, libkexiv2 >= 0.1,
++ have_libkexiv2=yes, have_libkexiv2=no)
++
++ if test "x$have_libkexiv2" = "xno"; then
++ LIBKEXIV2_CFLAGS=""
++ LIBKEXIV2_LIBS=""
++ AC_MSG_RESULT([not found])
++ else
++ AC_MSG_RESULT([found])
++ fi
++ else
++ LIBKEXIV2_CFLAGS=""
++ LIBKEXIV2_LIBS=""
++ AC_MSG_RESULT([not found])
++ fi
++ AC_SUBST(LIBKEXIV2_CFLAGS)
++ AC_SUBST(LIBKEXIV2_LIBS)
++ AM_CONDITIONAL(compile_LIBKEXIV2, true)
++fi
++
++if test x$have_libkexiv2 != xyes; then
++ AC_MSG_ERROR([libkexiv2 library is required by kipi-plugins.])
++ DO_NOT_COMPILE="$DO_NOT_COMPILE kipi-plugins"
++fi
++
+ #------------------------------------------------------------------
++#
+ # Check for libtiff
++#
+ #------------------------------------------------------------------
+
+ have_tiff=no
+@@ -129,21 +176,9 @@
+ AM_CONDITIONAL(compile_HTMLEXPORT, test -n "${XSLT_CONFIG}")
+
+ #------------------------------------------------------------------
+-# Check for Exiv2 library
+-#------------------------------------------------------------------
+-have_exiv2='no'
+-if test "$PKGCONFIGFOUND" = "yes" ; then
+- KDE_PKG_CHECK_MODULES(EXIV2, exiv2 >= 0.12, have_exiv2=yes,have_exiv2=no)
+-fi
+-
+-if test "x$have_exiv2" != "xyes"; then
+- AC_MSG_ERROR([Exiv2 library is required by kipi-plugins.])
+- DO_NOT_COMPILE="$DO_NOT_COMPILE kipi-plugins"
+-fi
+-
+-
+-#------------------------------------------------------------------
++#
+ # Check for libgpod (ipod export plugin)
++#
+ #------------------------------------------------------------------
+
+
+@@ -234,7 +269,9 @@
+ ###############################################################################
+
+ #---------------------------------------------------------
++#
+ # imlib2-detection
++#
+ #---------------------------------------------------------
+ # checking for Imlib2...
+
+Index: README
+===================================================================
+--- README (revisione 627500)
++++ README (revisione 627501)
+@@ -1,11 +1,11 @@
+-KIPIPLUGINS
++KIPIPLUGINS PROJECT
+
+ Note: Most of the LibKipiPlugins have previously been Digikamplugins.
+
+ kipi-plugins is based in part on the work of the Independent
+ JPEG Group.
+
+-Please visit this url: http://www.kipi-plugins.org/
++Please visit this url: http://www.kipi-plugins.org
+
+ Summary:
+ ----------------------------------------------------------------------
+@@ -110,7 +110,7 @@
+ imlib2 >= 1.1.0
+ libgphoto2 >= 2.x
+ libtiff >= 3.5.x
+-libexiv2 >= 0.12
++libkexiv2 >= 0.1
+ libxslt >= 1.1
+ libgpod > 0.4.0 (fails to build with 0.4.0)
+
+Index: kipi-plugins/configure.in.bot
+===================================================================
+--- kipi-plugins/configure.in.bot (revisione 627500)
++++ kipi-plugins/configure.in.bot (revisione 627501)
+@@ -20,22 +20,22 @@
+ echo "-- libkipi found.................. NO"
+ echo ""
+ echo "Kipi-Plugins needs libkipi >= 0.1.5. You need to install libkipi first"
+- echo "libkipi website is at http://extragear.kde.org/apps/kipi"
++ echo "libkipi website is at http://www.kipi-plugins.org"
+ echo ""
+ all_tests=bad
+ else
+ echo "-- libkipi found.................. YES"
+ fi
+
+-if test "x$have_exiv2" != "xyes"; then
+- echo "-- Exiv2 library found............ NO"
++if test "x$have_libkexiv2" != "xyes"; then
++ echo "-- libkexiv2 library found............ NO"
+ echo ""
+- echo "Kipi-Plugins needs Exiv2 library >= 0.12. You need to install Exiv2 first"
+- echo "Exiv2 website is at http://www.exiv2.org"
++ echo "Kipi-Plugins needs libkexiv2 library >= 0.1. You need to install libkexiv2 first"
++ echo "libkexiv2 website is at http://www.kipi-plugins.org"
+ echo ""
+ all_tests=bad
+ else
+- echo "-- Exiv2 library found............ YES"
++ echo "-- libkexiv2 library found............ YES"
+ fi
+
+ if test "x$have_tiff" != "xyes"; then
+Index: kipi-plugins/jpeglossless/jpegtransform.cpp
+===================================================================
+--- kipi-plugins/jpeglossless/jpegtransform.cpp (revisione 627500)
++++ kipi-plugins/jpeglossless/jpegtransform.cpp (revisione 627501)
+@@ -6,7 +6,7 @@
+ *
+ * Copyright 2004 by Ralf Hoelzer
+ * Copyright 2004-2005 by Marcel Wiesweg
+- * Copyright 2006 by Gilles Caulier
++ * Copyright 2006-2007 by Gilles Caulier
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -186,7 +186,7 @@
+ (void) jpeg_read_header(&srcinfo, true);
+
+ // Get Exif orientation action to do.
+- KIPIPlugins::Exiv2Iface exiv2Iface;
++ KExiv2Library::LibKExiv2 exiv2Iface;
+ exiv2Iface.load(src);
+ getExifAction(exifAction, exiv2Iface.getImageOrientation());
+
+@@ -334,7 +334,7 @@
+ QImage img(destGiven);
+ QImage exifThumbnail = img.scale(160, 120, QImage::ScaleMin);
+ exiv2Iface.load(destGiven);
+- exiv2Iface.setImageOrientation(KIPIPlugins::Exiv2Iface::ORIENTATION_NORMAL);
++ exiv2Iface.setImageOrientation(KExiv2Library::LibKExiv2::ORIENTATION_NORMAL);
+ exiv2Iface.setImageProgramId(QString("Kipi JPEGLossLess"), QString(kipiplugins_version));
+ exiv2Iface.setImageDimensions(img.size());
+ exiv2Iface.setExifThumbnail(exifThumbnail);
+@@ -385,42 +385,42 @@
+ }
+ }
+
+-void getExifAction(Matrix &action, KIPIPlugins::Exiv2Iface::ImageOrientation exifOrientation)
++void getExifAction(Matrix &action, KExiv2Library::LibKExiv2::ImageOrientation exifOrientation)
+ {
+ switch (exifOrientation)
+ {
+- case KIPIPlugins::Exiv2Iface::ORIENTATION_NORMAL:
++ case KExiv2Library::LibKExiv2::ORIENTATION_NORMAL:
+ break;
+
+- case KIPIPlugins::Exiv2Iface::ORIENTATION_HFLIP:
++ case KExiv2Library::LibKExiv2::ORIENTATION_HFLIP:
+ action*=Matrix::flipHorizontal;
+ break;
+
+- case KIPIPlugins::Exiv2Iface::ORIENTATION_ROT_180:
++ case KExiv2Library::LibKExiv2::ORIENTATION_ROT_180:
+ action*=Matrix::rotate180;
+ break;
+
+- case KIPIPlugins::Exiv2Iface::ORIENTATION_VFLIP:
++ case KExiv2Library::LibKExiv2::ORIENTATION_VFLIP:
+ action*=Matrix::flipVertical;
+ break;
+
+- case KIPIPlugins::Exiv2Iface::ORIENTATION_ROT_90_HFLIP:
++ case KExiv2Library::LibKExiv2::ORIENTATION_ROT_90_HFLIP:
+ action*=Matrix::rotate90flipHorizontal;
+ break;
+
+- case KIPIPlugins::Exiv2Iface::ORIENTATION_ROT_90:
++ case KExiv2Library::LibKExiv2::ORIENTATION_ROT_90:
+ action*=Matrix::rotate90;
+ break;
+
+- case KIPIPlugins::Exiv2Iface::ORIENTATION_ROT_90_VFLIP:
++ case KExiv2Library::LibKExiv2::ORIENTATION_ROT_90_VFLIP:
+ action*=Matrix::rotate90flipVertical;
+ break;
+
+- case KIPIPlugins::Exiv2Iface::ORIENTATION_ROT_270:
++ case KExiv2Library::LibKExiv2::ORIENTATION_ROT_270:
+ action*=Matrix::rotate270;
+ break;
+
+- case KIPIPlugins::Exiv2Iface::ORIENTATION_UNSPECIFIED:
++ case KExiv2Library::LibKExiv2::ORIENTATION_UNSPECIFIED:
+ action*=Matrix::none;
+ break;
+ }
+Index: kipi-plugins/jpeglossless/jpegtransform.h
+===================================================================
+--- kipi-plugins/jpeglossless/jpegtransform.h (revisione 627500)
++++ kipi-plugins/jpeglossless/jpegtransform.h (revisione 627501)
+@@ -6,7 +6,7 @@
+ *
+ * Copyright 2004 by Ralf Hoelzer
+ * Copyright 2004-2005 by Marcel Wiesweg
+- * Copyright 2006 by Gilles Caulier
++ * Copyright 2006-2006 by Gilles Caulier
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -28,9 +28,9 @@
+
+ #include <qstring.h>
+
+-// Local includes.
++// LibKExiv2 includes.
+
+-#include "exiv2iface.h"
++#include <libkexiv2/libkexiv2.h>
+
+ namespace KIPIJPEGLossLessPlugin
+ {
+@@ -40,7 +40,7 @@
+ the user will request rotating operations relative to what he sees,
+ and that is the picture rotated according to the EXIF tag.
+ So the operation requested and the given EXIF angle must be combined.
+- E.g. if orientation is "6" (rotate 90° clockwiseto show correctly)
++ E.g. if orientation is "6" (rotate 90 clockwiseto show correctly)
+ and the user selects 180 clockwise, the operation is 270.
+ If the user selected 270, the operation would be None (and clearing the exif tag).
+
+@@ -52,7 +52,7 @@
+ All transformations needed here - rotate 90, 180, 270, flipV, flipH -
+ can be described in a 2x2 matrix with the values 0,1,-1
+ (because flipping is expressed by changing the sign only,
+- and sine and cosine of 90°, 180° and 270° are either 0,1 or -1).
++ and sine and cosine of 90, 180 and 270 are either 0,1 or -1).
+
+ x' = m11 x + m12 y
+ y' = m21 x + m22 y
+@@ -124,7 +124,7 @@
+
+ void convertTransform(Matrix &action, JXFORM_CODE &flip, JXFORM_CODE &rotate);
+
+-void getExifAction(Matrix &action, KIPIPlugins::Exiv2Iface::ImageOrientation exifOrientation);
++void getExifAction(Matrix &action, KExiv2Library::LibKExiv2::ImageOrientation exifOrientation);
+
+ } // NameSpace KIPIJPEGLossLessPlugin
+
+Index: kipi-plugins/jpeglossless/Makefile.am
+===================================================================
+--- kipi-plugins/jpeglossless/Makefile.am (revisione 627500)
++++ kipi-plugins/jpeglossless/Makefile.am (revisione 627501)
+@@ -1,5 +1,5 @@
+ METASOURCES = AUTO
+-INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
++INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKEXIV2_CFLAGS) $(LIBKIPI_CFLAGS) $(all_includes)
+
+ # --enable-final triggers: http://bugs.kde.org/show_bug.cgi?id=126326
+ # digikam: camera download: auto-rotated images loose EXIF info ...
+@@ -9,15 +9,14 @@
+ # Install this plugin in the KDE modules directory
+ kde_module_LTLIBRARIES = kipiplugin_jpeglossless.la
+
+-kipiplugin_jpeglossless_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) \
+- $(top_builddir)/kipi-plugins/common/exiv2iface/libexiv2iface.la
++kipiplugin_jpeglossless_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) $(LIBKEXIV2_LIBS_DEP)
+
+ kipiplugin_jpeglossless_la_SOURCES = plugin_jpeglossless.cpp jpegtransform.cpp \
+- actionthread.cpp utils.cpp transupp.cpp \
+- imagerotate.cpp convert2grayscale.cpp imageflip.cpp
++ actionthread.cpp utils.cpp transupp.cpp \
++ imagerotate.cpp convert2grayscale.cpp imageflip.cpp
+
+-kipiplugin_jpeglossless_la_LIBADD = $(top_builddir)/kipi-plugins/common/exiv2iface/libexiv2iface.la \
+- -ljpeg $(LIBKIPI_LIBS) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
++kipiplugin_jpeglossless_la_LIBADD = -ljpeg $(LIBKIPI_LIBS) $(LIBKEXIV2_LIBS) $(LIB_KDEUI) \
++ $(LIB_KDECORE) $(LIB_QT)
+
+
+ kipiplugin_jpeglossless_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
Added: kde-extras/kipi-plugins/trunk/debian/patches/50_libkexiv2-1.patch
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/50_libkexiv2-1.patch (rev 0)
+++ kde-extras/kipi-plugins/trunk/debian/patches/50_libkexiv2-1.patch 2007-05-14 20:52:59 UTC (rev 6179)
@@ -0,0 +1,685 @@
+Index: kipi-plugins/rawconverter/dcrawiface.cpp
+===================================================================
+--- kipi-plugins/rawconverter/dcrawiface.cpp (revisione 628535)
++++ kipi-plugins/rawconverter/dcrawiface.cpp (revisione 628536)
+@@ -495,7 +495,7 @@
+ fclose(f);
+
+ // Metadata restoration and update.
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.load(filePath);
+ exiv2Iface.setImageProgramId(QString("Kipi Raw Converter"), QString(kipiplugins_version));
+ exiv2Iface.setImageDimensions(QSize(d->width, d->height));
+@@ -550,7 +550,7 @@
+ png_set_text(png_ptr, info_ptr, &(text), 1);
+
+ // Metadata restoration and update.
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.load(filePath);
+ exiv2Iface.setImageProgramId(QString("Kipi Raw Converter"), QString(kipiplugins_version));
+ exiv2Iface.setImageDimensions(QSize(d->width, d->height));
+@@ -627,7 +627,7 @@
+
+
+ // Metadata restoration and update.
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.load(filePath);
+ exiv2Iface.setImageProgramId(QString("Kipi Raw Converter"), QString(kipiplugins_version));
+ exiv2Iface.setImageDimensions(QSize(d->width, d->height));
+Index: kipi-plugins/metadataedit/iptcstatus.cpp
+===================================================================
+--- kipi-plugins/metadataedit/iptcstatus.cpp (revisione 628535)
++++ kipi-plugins/metadataedit/iptcstatus.cpp (revisione 628536)
+@@ -294,7 +294,7 @@
+ void IPTCStatus::readMetadata(QByteArray& iptcData)
+ {
+ blockSignals(true);
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.setIptc(iptcData);
+ QString data;
+ int val;
+@@ -411,7 +411,7 @@
+
+ void IPTCStatus::applyMetadata(QByteArray& iptcData)
+ {
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.setIptc(iptcData);
+
+ if (d->statusCheck->isChecked())
+Index: kipi-plugins/metadataedit/plugin_metadataedit.cpp
+===================================================================
+--- kipi-plugins/metadataedit/plugin_metadataedit.cpp (revisione 628535)
++++ kipi-plugins/metadataedit/plugin_metadataedit.cpp (revisione 628536)
+@@ -189,10 +189,10 @@
+ KURL url = *it;
+ bool ret = false;
+
+- if (!KExiv2Library::LibKExiv2::isReadOnly(url.path()))
++ if (!KExiv2Iface::KExiv2::isReadOnly(url.path()))
+ {
+ ret = true;
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ ret &= exiv2Iface.load(url.path());
+ ret &= exiv2Iface.clearExif();
+ ret &= exiv2Iface.save(url.path());
+@@ -232,7 +232,7 @@
+ if( importEXIFFile.isEmpty() )
+ return;
+
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ if (!exiv2Iface.load(importEXIFFile.path()))
+ {
+ KMessageBox::error(kapp->activeWindow(),
+@@ -269,10 +269,10 @@
+ KURL url = *it;
+ bool ret = false;
+
+- if (!KExiv2Library::LibKExiv2::isReadOnly(url.path()))
++ if (!KExiv2Iface::KExiv2::isReadOnly(url.path()))
+ {
+ ret = true;
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ ret &= exiv2Iface.load(url.path());
+ ret &= exiv2Iface.setExif(exifData);
+ ret &= exiv2Iface.save(url.path());
+@@ -335,10 +335,10 @@
+ KURL url = *it;
+ bool ret = false;
+
+- if (!KExiv2Library::LibKExiv2::isReadOnly(url.path()))
++ if (!KExiv2Iface::KExiv2::isReadOnly(url.path()))
+ {
+ ret = true;
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ ret &= exiv2Iface.load(url.path());
+ ret &= exiv2Iface.clearIptc();
+ ret &= exiv2Iface.save(url.path());
+@@ -378,7 +378,7 @@
+ if( importIPTCFile.isEmpty() )
+ return;
+
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ if (!exiv2Iface.load(importIPTCFile.path()))
+ {
+ KMessageBox::error(kapp->activeWindow(),
+@@ -415,10 +415,10 @@
+ KURL url = *it;
+ bool ret = false;
+
+- if (!KExiv2Library::LibKExiv2::isReadOnly(url.path()))
++ if (!KExiv2Iface::KExiv2::isReadOnly(url.path()))
+ {
+ ret = true;
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ ret &= exiv2Iface.load(url.path());
+ ret &= exiv2Iface.setIptc(iptcData);
+ ret &= exiv2Iface.save(url.path());
+@@ -470,10 +470,10 @@
+ KIPI::ImageInfo info = m_interface->info(url);
+ info.setDescription(dlg.getComments());
+
+- if (!KExiv2Library::LibKExiv2::isReadOnly(url.path()))
++ if (!KExiv2Iface::KExiv2::isReadOnly(url.path()))
+ {
+ ret = true;
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ ret &= exiv2Iface.load(url.path());
+
+ if (dlg.syncEXIFCommentIsChecked())
+@@ -537,10 +537,10 @@
+ info.setDescription(QString::null);
+ }
+
+- if (!KExiv2Library::LibKExiv2::isReadOnly(url.path()))
++ if (!KExiv2Iface::KExiv2::isReadOnly(url.path()))
+ {
+ ret = true;
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ ret &= exiv2Iface.load(url.path());
+
+ if (dlg.removeEXIFCommentIsChecked())
+Index: kipi-plugins/metadataedit/iptccategories.cpp
+===================================================================
+--- kipi-plugins/metadataedit/iptccategories.cpp (revisione 628535)
++++ kipi-plugins/metadataedit/iptccategories.cpp (revisione 628536)
+@@ -239,7 +239,7 @@
+ void IPTCCategories::readMetadata(QByteArray& iptcData)
+ {
+ blockSignals(true);
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.setIptc(iptcData);
+ QString data;
+
+@@ -273,7 +273,7 @@
+ void IPTCCategories::applyMetadata(QByteArray& iptcData)
+ {
+ QStringList newCategories;
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.setIptc(iptcData);
+
+ if (d->categoryCheck->isChecked())
+Index: kipi-plugins/metadataedit/exifdatetime.cpp
+===================================================================
+--- kipi-plugins/metadataedit/exifdatetime.cpp (revisione 628535)
++++ kipi-plugins/metadataedit/exifdatetime.cpp (revisione 628536)
+@@ -261,7 +261,7 @@
+ void EXIFDateTime::readMetadata(QByteArray& exifData)
+ {
+ blockSignals(true);
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.setExif(exifData);
+
+ QDateTime datetime;
+@@ -361,7 +361,7 @@
+
+ void EXIFDateTime::applyMetadata(QByteArray& exifData, QByteArray& iptcData)
+ {
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.setExif(exifData);
+ exiv2Iface.setIptc(iptcData);
+
+Index: kipi-plugins/metadataedit/exifcaption.cpp
+===================================================================
+--- kipi-plugins/metadataedit/exifcaption.cpp (revisione 628535)
++++ kipi-plugins/metadataedit/exifcaption.cpp (revisione 628536)
+@@ -270,7 +270,7 @@
+ void EXIFCaption::readMetadata(QByteArray& exifData)
+ {
+ blockSignals(true);
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.setExif(exifData);
+ QString data;
+
+@@ -332,7 +332,7 @@
+
+ void EXIFCaption::applyMetadata(QByteArray& exifData, QByteArray& iptcData)
+ {
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.setExif(exifData);
+ exiv2Iface.setIptc(iptcData);
+
+Index: kipi-plugins/metadataedit/exiflens.cpp
+===================================================================
+--- kipi-plugins/metadataedit/exiflens.cpp (revisione 628535)
++++ kipi-plugins/metadataedit/exiflens.cpp (revisione 628536)
+@@ -261,7 +261,7 @@
+ void EXIFLens::readMetadata(QByteArray& exifData)
+ {
+ blockSignals(true);
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.setExif(exifData);
+ long int num=1, den=1;
+ long val=0;
+@@ -365,7 +365,7 @@
+
+ void EXIFLens::applyMetadata(QByteArray& exifData)
+ {
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.setExif(exifData);
+ long int num=1, den=1;
+
+Index: kipi-plugins/metadataedit/exiflight.cpp
+===================================================================
+--- kipi-plugins/metadataedit/exiflight.cpp (revisione 628535)
++++ kipi-plugins/metadataedit/exiflight.cpp (revisione 628536)
+@@ -250,7 +250,7 @@
+ void EXIFLight::readMetadata(QByteArray& exifData)
+ {
+ blockSignals(true);
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.setExif(exifData);
+ long int num=1, den=1;
+ long val=0;
+@@ -326,7 +326,7 @@
+
+ void EXIFLight::applyMetadata(QByteArray& exifData)
+ {
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.setExif(exifData);
+ long int num=1, den=1;
+
+Index: kipi-plugins/metadataedit/iptceditdialog.cpp
+===================================================================
+--- kipi-plugins/metadataedit/iptceditdialog.cpp (revisione 628535)
++++ kipi-plugins/metadataedit/iptceditdialog.cpp (revisione 628536)
+@@ -274,7 +274,7 @@
+
+ void IPTCEditDialog::slotItemChanged()
+ {
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.load((*d->currItem).path());
+ d->exifData = exiv2Iface.getExif();
+ d->iptcData = exiv2Iface.getIptc();
+@@ -287,7 +287,7 @@
+ d->statusPage->readMetadata(d->iptcData);
+ d->originPage->readMetadata(d->iptcData);
+
+- d->isReadOnly = KExiv2Library::LibKExiv2::isReadOnly((*d->currItem).path());
++ d->isReadOnly = KExiv2Iface::KExiv2::isReadOnly((*d->currItem).path());
+ d->page_caption->setEnabled(!d->isReadOnly);
+ d->page_datetime->setEnabled(!d->isReadOnly);
+ d->page_subjects->setEnabled(!d->isReadOnly);
+@@ -333,7 +333,7 @@
+ d->creditsPage->applyMetadata(d->iptcData);
+ d->statusPage->applyMetadata(d->iptcData);
+ d->originPage->applyMetadata(d->iptcData);
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.load((*d->currItem).path());
+ exiv2Iface.setExif(d->exifData);
+ exiv2Iface.setIptc(d->iptcData);
+Index: kipi-plugins/metadataedit/iptckeywords.cpp
+===================================================================
+--- kipi-plugins/metadataedit/iptckeywords.cpp (revisione 628535)
++++ kipi-plugins/metadataedit/iptckeywords.cpp (revisione 628536)
+@@ -197,7 +197,7 @@
+ void IPTCKeywords::readMetadata(QByteArray& iptcData)
+ {
+ blockSignals(true);
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.setIptc(iptcData);
+ d->oldKeywords = exiv2Iface.getImageKeywords();
+
+@@ -218,7 +218,7 @@
+
+ void IPTCKeywords::applyMetadata(QByteArray& iptcData)
+ {
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.setIptc(iptcData);
+ QStringList newKeywords;
+
+Index: kipi-plugins/metadataedit/iptcsubjects.cpp
+===================================================================
+--- kipi-plugins/metadataedit/iptcsubjects.cpp (revisione 628535)
++++ kipi-plugins/metadataedit/iptcsubjects.cpp (revisione 628536)
+@@ -197,7 +197,7 @@
+ void IPTCSubjects::readMetadata(QByteArray& iptcData)
+ {
+ blockSignals(true);
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.setIptc(iptcData);
+ d->oldSubjects = exiv2Iface.getImageSubjects();
+
+@@ -218,7 +218,7 @@
+
+ void IPTCSubjects::applyMetadata(QByteArray& iptcData)
+ {
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.setIptc(iptcData);
+ QStringList newSubjects;
+
+Index: kipi-plugins/metadataedit/exifadjust.cpp
+===================================================================
+--- kipi-plugins/metadataedit/exifadjust.cpp (revisione 628535)
++++ kipi-plugins/metadataedit/exifadjust.cpp (revisione 628536)
+@@ -234,7 +234,7 @@
+ void EXIFAdjust::readMetadata(QByteArray& exifData)
+ {
+ blockSignals(true);
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.setExif(exifData);
+ long int num=1, den=1;
+ long val=0;
+@@ -323,7 +323,7 @@
+
+ void EXIFAdjust::applyMetadata(QByteArray& exifData)
+ {
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.setExif(exifData);
+ long int num=1, den=1;
+
+Index: kipi-plugins/metadataedit/iptcorigin.cpp
+===================================================================
+--- kipi-plugins/metadataedit/iptcorigin.cpp (revisione 628535)
++++ kipi-plugins/metadataedit/iptcorigin.cpp (revisione 628536)
+@@ -527,7 +527,7 @@
+ void IPTCOrigin::readMetadata(QByteArray& iptcData)
+ {
+ blockSignals(true);
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.setIptc(iptcData);
+ QString data;
+
+@@ -638,7 +638,7 @@
+
+ void IPTCOrigin::applyMetadata(QByteArray& iptcData)
+ {
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.setIptc(iptcData);
+
+ if (d->objectNameCheck->isChecked())
+Index: kipi-plugins/metadataedit/exifdevice.cpp
+===================================================================
+--- kipi-plugins/metadataedit/exifdevice.cpp (revisione 628535)
++++ kipi-plugins/metadataedit/exifdevice.cpp (revisione 628536)
+@@ -466,7 +466,7 @@
+ void EXIFDevice::readMetadata(QByteArray& exifData)
+ {
+ blockSignals(true);
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.setExif(exifData);
+ long int num=1, den=1;
+ long val=0;
+@@ -663,7 +663,7 @@
+
+ void EXIFDevice::applyMetadata(QByteArray& exifData)
+ {
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.setExif(exifData);
+ long int num=1, den=1;
+
+Index: kipi-plugins/metadataedit/iptcdatetime.cpp
+===================================================================
+--- kipi-plugins/metadataedit/iptcdatetime.cpp (revisione 628535)
++++ kipi-plugins/metadataedit/iptcdatetime.cpp (revisione 628536)
+@@ -302,7 +302,7 @@
+ void IPTCDateTime::readMetadata(QByteArray& iptcData)
+ {
+ blockSignals(true);
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.setIptc(iptcData);
+
+ QDate date;
+@@ -432,7 +432,7 @@
+
+ void IPTCDateTime::applyMetadata(QByteArray& exifData, QByteArray& iptcData)
+ {
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.setExif(exifData);
+ exiv2Iface.setIptc(iptcData);
+
+Index: kipi-plugins/metadataedit/iptccredits.cpp
+===================================================================
+--- kipi-plugins/metadataedit/iptccredits.cpp (revisione 628535)
++++ kipi-plugins/metadataedit/iptccredits.cpp (revisione 628536)
+@@ -233,7 +233,7 @@
+ void IPTCCredits::readMetadata(QByteArray& iptcData)
+ {
+ blockSignals(true);
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.setIptc(iptcData);
+ QString data;
+
+@@ -302,7 +302,7 @@
+
+ void IPTCCredits::applyMetadata(QByteArray& iptcData)
+ {
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.setIptc(iptcData);
+
+ if (d->copyrightCheck->isChecked())
+Index: kipi-plugins/metadataedit/iptccaption.cpp
+===================================================================
+--- kipi-plugins/metadataedit/iptccaption.cpp (revisione 628535)
++++ kipi-plugins/metadataedit/iptccaption.cpp (revisione 628536)
+@@ -251,7 +251,7 @@
+ void IPTCCaption::readMetadata(QByteArray& iptcData)
+ {
+ blockSignals(true);
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.setIptc(iptcData);
+ QString data;
+
+@@ -303,7 +303,7 @@
+
+ void IPTCCaption::applyMetadata(QByteArray& exifData, QByteArray& iptcData)
+ {
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.setExif(exifData);
+ exiv2Iface.setIptc(iptcData);
+
+Index: kipi-plugins/metadataedit/exifeditdialog.cpp
+===================================================================
+--- kipi-plugins/metadataedit/exifeditdialog.cpp (revisione 628535)
++++ kipi-plugins/metadataedit/exifeditdialog.cpp (revisione 628536)
+@@ -254,7 +254,7 @@
+
+ void EXIFEditDialog::slotItemChanged()
+ {
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.load((*d->currItem).path());
+ d->exifData = exiv2Iface.getExif();
+ d->iptcData = exiv2Iface.getIptc();
+@@ -265,7 +265,7 @@
+ d->lightPage->readMetadata(d->exifData);
+ d->adjustPage->readMetadata(d->exifData);
+
+- d->isReadOnly = KExiv2Library::LibKExiv2::isReadOnly((*d->currItem).path());
++ d->isReadOnly = KExiv2Iface::KExiv2::isReadOnly((*d->currItem).path());
+ d->page_caption->setEnabled(!d->isReadOnly);
+ d->page_datetime->setEnabled(!d->isReadOnly);
+ d->page_lens->setEnabled(!d->isReadOnly);
+@@ -307,7 +307,7 @@
+ d->devicePage->applyMetadata(d->exifData);
+ d->lightPage->applyMetadata(d->exifData);
+ d->adjustPage->applyMetadata(d->exifData);
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.load((*d->currItem).path());
+ exiv2Iface.setExif(d->exifData);
+ exiv2Iface.setIptc(d->iptcData);
+Index: kipi-plugins/galleryexport/gallerytalker.cpp
+===================================================================
+--- kipi-plugins/galleryexport/gallerytalker.cpp (revisione 628535)
++++ kipi-plugins/galleryexport/gallerytalker.cpp (revisione 628536)
+@@ -222,7 +222,7 @@
+
+ if ("JPEG" == QString(QImageIO::imageFormat(photoPath)).upper())
+ {
+- KExiv2Library::LibKExiv2 exiv2;
++ KExiv2Iface::KExiv2 exiv2;
+ if (exiv2.load(photoPath))
+ {
+ exiv2.save(path);
+Index: kipi-plugins/timeadjust/timeadjustdialog.cpp
+===================================================================
+--- kipi-plugins/timeadjust/timeadjustdialog.cpp (revisione 628535)
++++ kipi-plugins/timeadjust/timeadjustdialog.cpp (revisione 628536)
+@@ -438,10 +438,10 @@
+ {
+ if (d->syncEXIFDateCheck->isChecked() || d->syncIPTCDateCheck->isChecked())
+ {
+- if (!KExiv2Library::LibKExiv2::isReadOnly(url.path()))
++ if (!KExiv2Iface::KExiv2::isReadOnly(url.path()))
+ {
+ ret = true;
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+
+ ret &= exiv2Iface.load(url.path());
+ if (ret)
+@@ -497,7 +497,7 @@
+ }
+ else if (d->exif->isChecked())
+ {
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ if ( !exiv2Iface.load(url.path()) )
+ return time;
+
+Index: kipi-plugins/sendimages/sendimages.cpp
+===================================================================
+--- kipi-plugins/sendimages/sendimages.cpp (revisione 628535)
++++ kipi-plugins/sendimages/sendimages.cpp (revisione 628536)
+@@ -196,7 +197,7 @@
+ m_imageFormat.upper() == "JPEG")
+ {
+ QString targetFile = m_tmp + imageNameFormat;
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+
+ if (exiv2Iface.load(imageName))
+ {
+Index: kipi-plugins/gpssync/gpslistviewitem.cpp
+===================================================================
+--- kipi-plugins/gpssync/gpslistviewitem.cpp (revisione 628535)
++++ kipi-plugins/gpssync/gpslistviewitem.cpp (revisione 628536)
+@@ -88,7 +88,7 @@
+ d->readOnly = true;
+ }
+
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.load(d->url.path());
+ setDateTime(exiv2Iface.getImageDateTime());
+ double alt, lat, lng;
+@@ -192,7 +192,7 @@
+ if (isEnabled() && isDirty() && !isReadOnly())
+ {
+ setPixmap(1, SmallIcon("run"));
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ bool ret = exiv2Iface.load(d->url.path());
+
+ if (d->erase)
+Index: kipi-plugins/gpssync/plugin_gpssync.cpp
+===================================================================
+--- kipi-plugins/gpssync/plugin_gpssync.cpp (revisione 628535)
++++ kipi-plugins/gpssync/plugin_gpssync.cpp (revisione 628536)
+@@ -184,7 +184,7 @@
+ return;
+
+ KURL img = images.images().first();
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.load(img.path());
+ double alt, lat, lng;
+ bool hasGPSInfo = exiv2Iface.getGPSInfo(alt, lat, lng);
+@@ -278,7 +278,7 @@
+ if (ext == QString("JPG") || ext == QString("JPEG") || ext == QString("JPE"))
+ {
+ ret = true;
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ ret &= exiv2Iface.load(url.path());
+ ret &= exiv2Iface.removeGPSInfo();
+ ret &= exiv2Iface.save(url.path());
+Index: kipi-plugins/jpeglossless/jpegtransform.cpp
+===================================================================
+--- kipi-plugins/jpeglossless/jpegtransform.cpp (revisione 628535)
++++ kipi-plugins/jpeglossless/jpegtransform.cpp (revisione 628536)
+@@ -186,7 +186,7 @@
+ (void) jpeg_read_header(&srcinfo, true);
+
+ // Get Exif orientation action to do.
+- KExiv2Library::LibKExiv2 exiv2Iface;
++ KExiv2Iface::KExiv2 exiv2Iface;
+ exiv2Iface.load(src);
+ getExifAction(exifAction, exiv2Iface.getImageOrientation());
+
+@@ -334,7 +334,7 @@
+ QImage img(destGiven);
+ QImage exifThumbnail = img.scale(160, 120, QImage::ScaleMin);
+ exiv2Iface.load(destGiven);
+- exiv2Iface.setImageOrientation(KExiv2Library::LibKExiv2::ORIENTATION_NORMAL);
++ exiv2Iface.setImageOrientation(KExiv2Iface::KExiv2::ORIENTATION_NORMAL);
+ exiv2Iface.setImageProgramId(QString("Kipi JPEGLossLess"), QString(kipiplugins_version));
+ exiv2Iface.setImageDimensions(img.size());
+ exiv2Iface.setExifThumbnail(exifThumbnail);
+@@ -385,42 +385,42 @@
+ }
+ }
+
+-void getExifAction(Matrix &action, KExiv2Library::LibKExiv2::ImageOrientation exifOrientation)
++void getExifAction(Matrix &action, KExiv2Iface::KExiv2::ImageOrientation exifOrientation)
+ {
+ switch (exifOrientation)
+ {
+- case KExiv2Library::LibKExiv2::ORIENTATION_NORMAL:
++ case KExiv2Iface::KExiv2::ORIENTATION_NORMAL:
+ break;
+
+- case KExiv2Library::LibKExiv2::ORIENTATION_HFLIP:
++ case KExiv2Iface::KExiv2::ORIENTATION_HFLIP:
+ action*=Matrix::flipHorizontal;
+ break;
+
+- case KExiv2Library::LibKExiv2::ORIENTATION_ROT_180:
++ case KExiv2Iface::KExiv2::ORIENTATION_ROT_180:
+ action*=Matrix::rotate180;
+ break;
+
+- case KExiv2Library::LibKExiv2::ORIENTATION_VFLIP:
++ case KExiv2Iface::KExiv2::ORIENTATION_VFLIP:
+ action*=Matrix::flipVertical;
+ break;
+
+- case KExiv2Library::LibKExiv2::ORIENTATION_ROT_90_HFLIP:
++ case KExiv2Iface::KExiv2::ORIENTATION_ROT_90_HFLIP:
+ action*=Matrix::rotate90flipHorizontal;
+ break;
+
+- case KExiv2Library::LibKExiv2::ORIENTATION_ROT_90:
++ case KExiv2Iface::KExiv2::ORIENTATION_ROT_90:
+ action*=Matrix::rotate90;
+ break;
+
+- case KExiv2Library::LibKExiv2::ORIENTATION_ROT_90_VFLIP:
++ case KExiv2Iface::KExiv2::ORIENTATION_ROT_90_VFLIP:
+ action*=Matrix::rotate90flipVertical;
+ break;
+
+- case KExiv2Library::LibKExiv2::ORIENTATION_ROT_270:
++ case KExiv2Iface::KExiv2::ORIENTATION_ROT_270:
+ action*=Matrix::rotate270;
+ break;
+
+- case KExiv2Library::LibKExiv2::ORIENTATION_UNSPECIFIED:
++ case KExiv2Iface::KExiv2::ORIENTATION_UNSPECIFIED:
+ action*=Matrix::none;
+ break;
+ }
+Index: kipi-plugins/jpeglossless/jpegtransform.h
+===================================================================
+--- kipi-plugins/jpeglossless/jpegtransform.h (revisione 628535)
++++ kipi-plugins/jpeglossless/jpegtransform.h (revisione 628536)
+@@ -124,7 +124,7 @@
+
+ void convertTransform(Matrix &action, JXFORM_CODE &flip, JXFORM_CODE &rotate);
+
+-void getExifAction(Matrix &action, KExiv2Library::LibKExiv2::ImageOrientation exifOrientation);
++void getExifAction(Matrix &action, KExiv2Iface::KExiv2::ImageOrientation exifOrientation);
+
+ } // NameSpace KIPIJPEGLossLessPlugin
+
Added: kde-extras/kipi-plugins/trunk/debian/patches/50_libkexiv2-2.patch
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/50_libkexiv2-2.patch (rev 0)
+++ kde-extras/kipi-plugins/trunk/debian/patches/50_libkexiv2-2.patch 2007-05-14 20:52:59 UTC (rev 6179)
@@ -0,0 +1,312 @@
+Index: kipi-plugins/rawconverter/dcrawiface.cpp
+===================================================================
+--- kipi-plugins/rawconverter/dcrawiface.cpp (revisione 628539)
++++ kipi-plugins/rawconverter/dcrawiface.cpp (revisione 628540)
+@@ -60,7 +60,7 @@
+
+ // LibKExiv2 includes.
+
+-#include <libkexiv2/libkexiv2.h>
++#include <libkexiv2/kexiv2.h>
+
+ // Local includes.
+
+Index: kipi-plugins/metadataedit/iptcstatus.cpp
+===================================================================
+--- kipi-plugins/metadataedit/iptcstatus.cpp (revisione 628539)
++++ kipi-plugins/metadataedit/iptcstatus.cpp (revisione 628540)
+@@ -36,7 +36,7 @@
+
+ // LibKExiv2 includes.
+
+-#include <libkexiv2/libkexiv2.h>
++#include <libkexiv2/kexiv2.h>
+
+ // Local includes.
+
+Index: kipi-plugins/metadataedit/plugin_metadataedit.cpp
+===================================================================
+--- kipi-plugins/metadataedit/plugin_metadataedit.cpp (revisione 628539)
++++ kipi-plugins/metadataedit/plugin_metadataedit.cpp (revisione 628540)
+@@ -38,7 +38,7 @@
+
+ // LibKExiv2 includes.
+
+-#include <libkexiv2/libkexiv2.h>
++#include <libkexiv2/kexiv2.h>
+
+ // Local includes.
+
+Index: kipi-plugins/metadataedit/iptccategories.cpp
+===================================================================
+--- kipi-plugins/metadataedit/iptccategories.cpp (revisione 628539)
++++ kipi-plugins/metadataedit/iptccategories.cpp (revisione 628540)
+@@ -36,7 +36,7 @@
+
+ // LibKExiv2 includes.
+
+-#include <libkexiv2/libkexiv2.h>
++#include <libkexiv2/kexiv2.h>
+
+ // Local includes.
+
+Index: kipi-plugins/metadataedit/exifdatetime.cpp
+===================================================================
+--- kipi-plugins/metadataedit/exifdatetime.cpp (revisione 628539)
++++ kipi-plugins/metadataedit/exifdatetime.cpp (revisione 628540)
+@@ -38,7 +38,7 @@
+
+ // LibKExiv2 includes.
+
+-#include <libkexiv2/libkexiv2.h>
++#include <libkexiv2/kexiv2.h>
+
+ // Local includes.
+
+Index: kipi-plugins/metadataedit/exifcaption.cpp
+===================================================================
+--- kipi-plugins/metadataedit/exifcaption.cpp (revisione 628539)
++++ kipi-plugins/metadataedit/exifcaption.cpp (revisione 628540)
+@@ -39,7 +39,7 @@
+
+ // LibKExiv2 includes.
+
+-#include <libkexiv2/libkexiv2.h>
++#include <libkexiv2/kexiv2.h>
+
+ // Local includes.
+
+Index: kipi-plugins/metadataedit/exiflens.cpp
+===================================================================
+--- kipi-plugins/metadataedit/exiflens.cpp (revisione 628539)
++++ kipi-plugins/metadataedit/exiflens.cpp (revisione 628540)
+@@ -37,7 +37,7 @@
+
+ // LibKExiv2 includes.
+
+-#include <libkexiv2/libkexiv2.h>
++#include <libkexiv2/kexiv2.h>
+
+ // Local includes.
+
+Index: kipi-plugins/metadataedit/exiflight.cpp
+===================================================================
+--- kipi-plugins/metadataedit/exiflight.cpp (revisione 628539)
++++ kipi-plugins/metadataedit/exiflight.cpp (revisione 628540)
+@@ -38,7 +38,7 @@
+
+ // LibKExiv2 includes.
+
+-#include <libkexiv2/libkexiv2.h>
++#include <libkexiv2/kexiv2.h>
+
+ // Local includes.
+
+Index: kipi-plugins/metadataedit/iptceditdialog.cpp
+===================================================================
+--- kipi-plugins/metadataedit/iptceditdialog.cpp (revisione 628539)
++++ kipi-plugins/metadataedit/iptceditdialog.cpp (revisione 628540)
+@@ -43,7 +43,7 @@
+
+ // LibKExiv2 includes.
+
+-#include <libkexiv2/libkexiv2.h>
++#include <libkexiv2/kexiv2.h>
+
+ // Local includes.
+
+Index: kipi-plugins/metadataedit/iptckeywords.cpp
+===================================================================
+--- kipi-plugins/metadataedit/iptckeywords.cpp (revisione 628539)
++++ kipi-plugins/metadataedit/iptckeywords.cpp (revisione 628540)
+@@ -36,7 +36,7 @@
+
+ // LibKExiv2 includes.
+
+-#include <libkexiv2/libkexiv2.h>
++#include <libkexiv2/kexiv2.h>
+
+ // Local includes.
+
+Index: kipi-plugins/metadataedit/iptcsubjects.cpp
+===================================================================
+--- kipi-plugins/metadataedit/iptcsubjects.cpp (revisione 628539)
++++ kipi-plugins/metadataedit/iptcsubjects.cpp (revisione 628540)
+@@ -36,7 +36,7 @@
+
+ // LibKExiv2 includes.
+
+-#include <libkexiv2/libkexiv2.h>
++#include <libkexiv2/kexiv2.h>
+
+ // Local includes.
+
+Index: kipi-plugins/metadataedit/exifadjust.cpp
+===================================================================
+--- kipi-plugins/metadataedit/exifadjust.cpp (revisione 628539)
++++ kipi-plugins/metadataedit/exifadjust.cpp (revisione 628540)
+@@ -37,7 +37,7 @@
+
+ // LibKExiv2 includes.
+
+-#include <libkexiv2/libkexiv2.h>
++#include <libkexiv2/kexiv2.h>
+
+ // Local includes.
+
+Index: kipi-plugins/metadataedit/iptcorigin.cpp
+===================================================================
+--- kipi-plugins/metadataedit/iptcorigin.cpp (revisione 628539)
++++ kipi-plugins/metadataedit/iptcorigin.cpp (revisione 628540)
+@@ -36,7 +36,7 @@
+
+ // LibKExiv2 includes.
+
+-#include <libkexiv2/libkexiv2.h>
++#include <libkexiv2/kexiv2.h>
+
+ // Local includes.
+
+Index: kipi-plugins/metadataedit/exifdevice.cpp
+===================================================================
+--- kipi-plugins/metadataedit/exifdevice.cpp (revisione 628539)
++++ kipi-plugins/metadataedit/exifdevice.cpp (revisione 628540)
+@@ -40,7 +40,7 @@
+
+ // LibKExiv2 includes.
+
+-#include <libkexiv2/libkexiv2.h>
++#include <libkexiv2/kexiv2.h>
+
+ // Local includes.
+
+Index: kipi-plugins/metadataedit/iptcdatetime.cpp
+===================================================================
+--- kipi-plugins/metadataedit/iptcdatetime.cpp (revisione 628539)
++++ kipi-plugins/metadataedit/iptcdatetime.cpp (revisione 628540)
+@@ -39,7 +39,7 @@
+
+ // LibKExiv2 includes.
+
+-#include <libkexiv2/libkexiv2.h>
++#include <libkexiv2/kexiv2.h>
+
+ // Local includes.
+
+Index: kipi-plugins/metadataedit/iptccredits.cpp
+===================================================================
+--- kipi-plugins/metadataedit/iptccredits.cpp (revisione 628539)
++++ kipi-plugins/metadataedit/iptccredits.cpp (revisione 628540)
+@@ -36,7 +36,7 @@
+
+ // LibKExiv2 includes.
+
+-#include <libkexiv2/libkexiv2.h>
++#include <libkexiv2/kexiv2.h>
+
+ // Local includes.
+
+Index: kipi-plugins/metadataedit/iptccaption.cpp
+===================================================================
+--- kipi-plugins/metadataedit/iptccaption.cpp (revisione 628539)
++++ kipi-plugins/metadataedit/iptccaption.cpp (revisione 628540)
+@@ -40,7 +40,7 @@
+
+ // LibKExiv2 includes.
+
+-#include <libkexiv2/libkexiv2.h>
++#include <libkexiv2/kexiv2.h>
+
+ // Local includes.
+
+Index: kipi-plugins/metadataedit/exifeditdialog.cpp
+===================================================================
+--- kipi-plugins/metadataedit/exifeditdialog.cpp (revisione 628539)
++++ kipi-plugins/metadataedit/exifeditdialog.cpp (revisione 628540)
+@@ -43,7 +43,7 @@
+
+ // LibKExiv2 includes.
+
+-#include <libkexiv2/libkexiv2.h>
++#include <libkexiv2/kexiv2.h>
+
+ // Local includes.
+
+Index: kipi-plugins/galleryexport/gallerytalker.cpp
+===================================================================
+--- kipi-plugins/galleryexport/gallerytalker.cpp (revisione 628539)
++++ kipi-plugins/galleryexport/gallerytalker.cpp (revisione 628540)
+@@ -36,7 +36,7 @@
+
+ // LibKExiv2 includes.
+
+-#include <libkexiv2/libkexiv2.h>
++#include <libkexiv2/kexiv2.h>
+
+ #include "galleryitem.h"
+ #include "gallerympform.h"
+Index: kipi-plugins/timeadjust/timeadjustdialog.cpp
+===================================================================
+--- kipi-plugins/timeadjust/timeadjustdialog.cpp (revisione 628539)
++++ kipi-plugins/timeadjust/timeadjustdialog.cpp (revisione 628540)
+@@ -56,7 +56,7 @@
+
+ // LibKExiv2 includes.
+
+-#include <libkexiv2/libkexiv2.h>
++#include <libkexiv2/kexiv2.h>
+
+ // Local includes.
+
+Index: kipi-plugins/sendimages/sendimages.cpp
+===================================================================
+--- kipi-plugins/sendimages/sendimages.cpp (revisione 628539)
++++ kipi-plugins/sendimages/sendimages.cpp (revisione 628540)
+@@ -53,7 +53,7 @@
+
+ // LibKExiv2 includes.
+
+-#include <libkexiv2/libkexiv2.h>
++#include <libkexiv2/kexiv2.h>
+
+ // Local include files
+
+Index: kipi-plugins/gpssync/gpslistviewitem.cpp
+===================================================================
+--- kipi-plugins/gpssync/gpslistviewitem.cpp (revisione 628539)
++++ kipi-plugins/gpssync/gpslistviewitem.cpp (revisione 628540)
+@@ -31,7 +31,7 @@
+
+ // LibKExiv2 includes.
+
+-#include <libkexiv2/libkexiv2.h>
++#include <libkexiv2/kexiv2.h>
+
+ // Local includes.
+
+Index: kipi-plugins/gpssync/plugin_gpssync.cpp
+===================================================================
+--- kipi-plugins/gpssync/plugin_gpssync.cpp (revisione 628539)
++++ kipi-plugins/gpssync/plugin_gpssync.cpp (revisione 628540)
+@@ -40,7 +40,7 @@
+
+ // LibKExiv2 includes.
+
+-#include <libkexiv2/libkexiv2.h>
++#include <libkexiv2/kexiv2.h>
+
+ // Local includes.
+
+Index: kipi-plugins/jpeglossless/jpegtransform.h
+===================================================================
+--- kipi-plugins/jpeglossless/jpegtransform.h (revisione 628539)
++++ kipi-plugins/jpeglossless/jpegtransform.h (revisione 628540)
+@@ -30,7 +30,7 @@
+
+ // LibKExiv2 includes.
+
+-#include <libkexiv2/libkexiv2.h>
++#include <libkexiv2/kexiv2.h>
+
+ namespace KIPIJPEGLossLessPlugin
+ {
More information about the pkg-kde-commits
mailing list