rev 9807 - in kde-extras/digikam/branches/experimental/debian: . patches
Achim Bohnet
ach-guest at alioth.debian.org
Mon Mar 17 23:34:12 UTC 2008
Author: ach-guest
Date: 2008-03-17 23:34:12 +0000 (Mon, 17 Mar 2008)
New Revision: 9807
Added:
kde-extras/digikam/branches/experimental/debian/patches/40_kdesvn785848-785852_build_with_old_libkipi_libkexiv2.diff
Removed:
kde-extras/digikam/branches/experimental/debian/patches/20_fix_ftbfs_with_libkdcraw3.diff
kde-extras/digikam/branches/experimental/debian/patches/40_kdesvn783161_fix_wrong_file-exits_check.diff
Modified:
kde-extras/digikam/branches/experimental/debian/changelog
kde-extras/digikam/branches/experimental/debian/patches/30_respect_umask.diff
kde-extras/digikam/branches/experimental/debian/patches/40_kdesvn786622_honour_scrollbar.diff
kde-extras/digikam/branches/experimental/debian/patches/series
Log:
* added patches:
+ 40_kdesvn785848-785852_build_with_old_libkipi_libkexiv2.diff:
decoupled digikam 0.9.3 -> 0.9.4 from the 2 libtransitions of
libkipi and libkexiv2
* adpated patches:
30_respect_umask.diff
* removed patches:
+ patches/20_fix_ftbfs_with_libkdcraw3.diff: obsolete
+ patches/40_kdesvn783161_fix_wrong_file-exits_check.diff: in upstream
Modified: kde-extras/digikam/branches/experimental/debian/changelog
===================================================================
--- kde-extras/digikam/branches/experimental/debian/changelog 2008-03-17 22:50:55 UTC (rev 9806)
+++ kde-extras/digikam/branches/experimental/debian/changelog 2008-03-17 23:34:12 UTC (rev 9807)
@@ -1,3 +1,22 @@
+digikam (2:0.9.4~beta1-1) UNRELEASED; urgency=low
+
+ * new upstream release
+
+ * TODO: debian/copyright
+
+ [ Achim Bohnet ]
+ * added patches:
+ + 40_kdesvn785848-785852_build_with_old_libkipi_libkexiv2.diff:
+ decoupled digikam 0.9.3 -> 0.9.4 from the 2 libtransitions of
+ libkipi and libkexiv2
+ * adpated patches:
+ 30_respect_umask.diff
+ * removed patches:
+ + patches/20_fix_ftbfs_with_libkdcraw3.diff: obsolete
+ + patches/40_kdesvn783161_fix_wrong_file-exits_check.diff: in upstream
+
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Mon, 17 Mar 2008 23:53:59 +0100
+
digikam (2:0.9.3-2) unstable; urgency=low
[ Achim Bohnet]
Deleted: kde-extras/digikam/branches/experimental/debian/patches/20_fix_ftbfs_with_libkdcraw3.diff
Modified: kde-extras/digikam/branches/experimental/debian/patches/30_respect_umask.diff
===================================================================
--- kde-extras/digikam/branches/experimental/debian/patches/30_respect_umask.diff 2008-03-17 22:50:55 UTC (rev 9806)
+++ kde-extras/digikam/branches/experimental/debian/patches/30_respect_umask.diff 2008-03-17 23:34:12 UTC (rev 9807)
@@ -2,7 +2,7 @@
===================================================================
--- digikam-0.9.3.orig/digikam/utilities/imageeditor/editor/editorwindow.cpp (revision 726776)
+++ digikam-0.9.3/digikam/utilities/imageeditor/editor/editorwindow.cpp (working copy)
-@@ -1653,8 +1653,16 @@
+@@ -1678,8 +1678,16 @@
{
QCString dstFileName = QFile::encodeName(m_savingContext->destinationURL.path());
@@ -21,7 +21,7 @@
if (m_savingContext->destinationExisted)
{
struct stat stbuf;
-@@ -1673,12 +1681,9 @@
+@@ -1698,12 +1706,9 @@
}
// restore permissions
Deleted: kde-extras/digikam/branches/experimental/debian/patches/40_kdesvn783161_fix_wrong_file-exits_check.diff
Added: kde-extras/digikam/branches/experimental/debian/patches/40_kdesvn785848-785852_build_with_old_libkipi_libkexiv2.diff
===================================================================
--- kde-extras/digikam/branches/experimental/debian/patches/40_kdesvn785848-785852_build_with_old_libkipi_libkexiv2.diff (rev 0)
+++ kde-extras/digikam/branches/experimental/debian/patches/40_kdesvn785848-785852_build_with_old_libkipi_libkexiv2.diff 2008-03-17 23:34:12 UTC (rev 9807)
@@ -0,0 +1,131 @@
+Index: digikam-0.9.4-beta1/digikam/configure.in.in
+===================================================================
+--- digikam-0.9.4-beta1.orig/digikam/configure.in.in (Revision 785848)
++++ digikam-0.9.4-beta1/digikam/configure.in.in (Revision 785852)
+@@ -169,7 +169,7 @@
+ if test "$PKGCONFIGFOUND" = "yes" ; then
+ have_libkipi=no
+
+- KDE_PKG_CHECK_MODULES(LIBKIPI, libkipi >= 0.1.6,
++ KDE_PKG_CHECK_MODULES(LIBKIPI, libkipi >= 0.1.5,
+ have_libkipi=yes, have_libkipi=no)
+
+ if test "x$have_libkipi" = "xno"; then
+@@ -200,7 +200,7 @@
+ if test "$PKGCONFIGFOUND" = "yes" ; then
+ have_libkexiv2=no
+
+- KDE_PKG_CHECK_MODULES(LIBKEXIV2, libkexiv2 >= 0.1.7,
++ KDE_PKG_CHECK_MODULES(LIBKEXIV2, libkexiv2 >= 0.1.6,
+ have_libkexiv2=yes, have_libkexiv2=no)
+
+ if test "x$have_libkexiv2" = "xno"; then
+Index: digikam-0.9.4-beta1/digikam/README
+===================================================================
+--- digikam-0.9.4-beta1.orig/README (Revision 785848)
++++ digikam-0.9.4-beta1/README (Revision 785852)
+@@ -89,8 +89,8 @@
+ libkde >= 3.4.x (>=3.5.x recommended) http://www.kde.org
+ libsqlite >= 3.x http://www.sqlite.org
+ libgphoto2 >= 2.x (>=2.4.x recommended) http://www.gphoto.org
+-libkipi >= 0.1.6 http://www.kipi-plugins.org
+-libkexiv2 >= 0.1.7 http://www.kipi-plugins.org
++libkipi >= 0.1.5 (>=0.1.6 recommended) http://www.kipi-plugins.org
++libkexiv2 >= 0.1.6 (>=0.1.7 recommended) http://www.kipi-plugins.org
+ libkdcraw >= 0.1.4 http://www.kipi-plugins.org
+ liblcms >= 1.14.x http://www.littlecms.com
+ libtiff >= 3.6.x (>=3.8.2 recommended) http://www.remotesensing.org/libtiff
+Index: digikam-0.9.4-beta1/digikam/digikam/main.cpp
+===================================================================
+--- digikam-0.9.4-beta1.orig/digikam/digikam/main.cpp (Revision 785848)
++++ digikam-0.9.4-beta1/digikam/digikam/main.cpp (Revision 785852)
+@@ -48,10 +48,12 @@
+
+ // KIPI Includes.
+
++#include <libkipi/version.h>
+ #include <libkipi/interface.h>
+
+ // Libkexiv2 includes.
+
++#include <libkexiv2/version.h>
+ #include <libkexiv2/kexiv2.h>
+
+ // Libkdcraw includes.
+@@ -90,9 +92,23 @@
+
+ QString Gphoto2Ver = QString(gp_library_version(GP_VERSION_SHORT)[0]);
+
+- QString libInfo = QString(I18N_NOOP("Using Kipi library version %1")).arg(KIPI::Interface::version()) +
++ QString KipiVer, Kexiv2Ver;
++
++#if KIPI_VERSION <= 0x000105
++ KipiVer = QString(kipi_version);
++#else
++ KipiVer = KIPI::Interface::version();
++#endif
++
++#if KEXIV2_VERSION <= 0x000106
++ Kexiv2Ver = QString(kexiv2_version);
++#else
++ Kexiv2Ver = KExiv2Iface::KExiv2::version();
++#endif
++
++ QString libInfo = QString(I18N_NOOP("Using Kipi library version %1")).arg(KipiVer) +
+ QString("\n") +
+- QString(I18N_NOOP("Using KExiv2 library version %1")).arg(KExiv2Iface::KExiv2::version()) +
++ QString(I18N_NOOP("Using KExiv2 library version %1")).arg(Kexiv2Ver) +
+ QString("\n") +
+ QString(I18N_NOOP("Using Exiv2 library version %1")).arg(Exiv2Ver) +
+ QString("\n") +
+Index: digikam-0.9.4-beta1/digikam/showfoto/main.cpp
+===================================================================
+--- digikam-0.9.4-beta1.orig/digikam/showfoto/main.cpp (Revision 785848)
++++ digikam-0.9.4-beta1/digikam/showfoto/main.cpp (Revision 785852)
+@@ -40,6 +40,7 @@
+ // Libkexiv2 includes.
+
+ #include <libkexiv2/kexiv2.h>
++#include <libkexiv2/version.h>
+
+ // Libkdcraw includes.
+
+@@ -69,7 +70,15 @@
+
+ QString Exiv2Ver = KExiv2Iface::KExiv2::Exiv2Version();
+
+- QString libInfo = QString(I18N_NOOP("Using KExiv2 library version %1")).arg(KExiv2Iface::KExiv2::version()) +
++ QString Kexiv2Ver;
++
++#if KEXIV2_VERSION <= 0x000106
++ Kexiv2Ver = QString(kexiv2_version);
++#else
++ Kexiv2Ver = KExiv2Iface::KExiv2::version();
++#endif
++
++ QString libInfo = QString(I18N_NOOP("Using KExiv2 library version %1")).arg(Kexiv2Ver) +
+ QString("\n") +
+ QString(I18N_NOOP("Using Exiv2 library version %1")).arg(Exiv2Ver) +
+ QString("\n") +
+Index: digikam-0.9.4-beta1/digikam/configure.in.bot
+===================================================================
+--- digikam-0.9.4-beta1.orig/digikam/configure.in.bot (Revision 785848)
++++ digikam-0.9.4-beta1/digikam/configure.in.bot (Revision 785852)
+@@ -29,7 +29,7 @@
+ if test "x$have_libkipi" != "xyes"; then
+ echo "-- libkipi library found.......... NO"
+ echo ""
+- echo "digiKam needs libkipi library >= 0.1.6. You need to install libkipi first"
++ echo "digiKam needs libkipi library >= 0.1.5. You need to install libkipi first"
+ echo "libkipi website is at http://www.kipi-plugins.org"
+ echo ""
+ all_tests=bad
+@@ -87,7 +87,7 @@
+ if test "x$have_libkexiv2" != "xyes"; then
+ echo "-- libkexiv2 library found........ NO"
+ echo ""
+- echo "digiKam needs libkexiv2 library >= 0.1.7. You need to install libkexiv2 first"
++ echo "digiKam needs libkexiv2 library >= 0.1.6. You need to install libkexiv2 first"
+ echo "libkexiv2 website is at http://www.kipi-plugins.org"
+ echo ""
+ all_tests=bad
Modified: kde-extras/digikam/branches/experimental/debian/patches/40_kdesvn786622_honour_scrollbar.diff
===================================================================
--- kde-extras/digikam/branches/experimental/debian/patches/40_kdesvn786622_honour_scrollbar.diff 2008-03-17 22:50:55 UTC (rev 9806)
+++ kde-extras/digikam/branches/experimental/debian/patches/40_kdesvn786622_honour_scrollbar.diff 2008-03-17 23:34:12 UTC (rev 9807)
@@ -1,5 +1,7 @@
---- digikam-0.9.3/digikam/libs/thumbbar/thumbbar.cpp.orig 2008-03-17 18:47:49.000000000 +0100
-+++ digikam-0.9.3/digikam/libs/thumbbar/thumbbar.cpp 2008-03-17 19:03:38.000000000 +0100
+Index: digikam-0.9.4-beta1/digikam/libs/thumbbar/thumbbar.cpp
+===================================================================
+--- digikam-0.9.4-beta1.orig/digikam/libs/thumbbar/thumbbar.cpp (Revision 786621)
++++ digikam-0.9.4-beta1/digikam/libs/thumbbar/thumbbar.cpp (Revision 786622)
@@ -687,9 +687,9 @@
}
@@ -9,6 +11,6 @@
else
- resizeContents(d->count*(d->tileSize+2*d->margin), height());
+ resizeContents(d->count*(d->tileSize+2*d->margin), visibleHeight());
-
+
if (!urlList.isEmpty())
{
Modified: kde-extras/digikam/branches/experimental/debian/patches/series
===================================================================
--- kde-extras/digikam/branches/experimental/debian/patches/series 2008-03-17 22:50:55 UTC (rev 9806)
+++ kde-extras/digikam/branches/experimental/debian/patches/series 2008-03-17 23:34:12 UTC (rev 9807)
@@ -1,5 +1,4 @@
-10_lp201053_fix_download_rename_race.diff
-20_fix_ftbfs_with_libkdcraw3.diff
30_respect_umask.diff
-40_kdesvn783161_fix_wrong_file-exits_check.diff
+#40_kdesvn786697_respect_umask.diff
+40_kdesvn785848-785852_build_with_old_libkipi_libkexiv2.diff
40_kdesvn786622_honour_scrollbar.diff
More information about the pkg-kde-commits
mailing list