Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2012-02-08 15:37:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digikam (Old) and /work/SRC/openSUSE:Factory/.digikam.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "digikam", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2011-12-14 14:33:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.digikam.new/digikam.changes 2012-02-08 15:37:39.000000000 +0100 @@ -1,0 +2,20 @@ +Fri Feb 3 09:56:22 UTC 2012 - [email protected] + +- Correct the license of the Documentation subpackage to the + GFDL-1.X license. +- Correct spec-file to autodetect the translations for the + additional libraries + +------------------------------------------------------------------- +Fri Jan 13 09:50:17 UTC 2012 - [email protected] + +- The digikam spec-file now builds all additional components + (kipi-plugins, libmediawiki, libkface and libkgeomap) + +------------------------------------------------------------------- +Wed Jan 4 08:56:34 UTC 2012 - [email protected] + +- Update to 2.5.0 + * a bug-fix release, including a total of 101 fixed bugs. + +------------------------------------------------------------------- Old: ---- digikam-2.4.1.tar.bz2 digikam-external-libs.patch New: ---- desktop-files.diff digikam-2.5.0.tar.bz2 digikam_no_build_vkontakte.diff fix-broken-icon-reference.diff non-executable-script.patch remove-gplv2-only.patch use_correct_libkipi.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ ++++ 651 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/digikam/digikam.spec ++++ and /work/SRC/openSUSE:Factory/.digikam.new/digikam.spec ++++++ desktop-files.diff ++++++ --- acquireimages/scangui.desktop.sav +++ acquireimages/scangui.desktop @@ -54,7 +54,6 @@ GenericName[uk]=Отримання зо� GenericName[x-test]=xxAcquire Imagesxx GenericName[zh_CN]=图像捕获 GenericName[zh_TW]=擷取影像 -Icon=scanner Name=AcquireImages Name[ast]=AcquireImages Name[bg]=Сканиране на снимки ++++++ digikam-2.4.1.tar.bz2 -> digikam-2.5.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/digikam/digikam-2.4.1.tar.bz2 /work/SRC/openSUSE:Factory/.digikam.new/digikam-2.5.0.tar.bz2 differ: char 11, line 1 ++++++ digikam_no_build_vkontakte.diff ++++++ --- CMakeLists.txt 2012-01-03 01:42:09.000000000 +0100 +++ CMakeLists.txt 2012-01-05 13:49:28.920827859 +0100 @@ -70,7 +70,6 @@ ${CMAKE_SOURCE_DIR}/extra/libkgeomap/cmake/modules ${CMAKE_SOURCE_DIR}/extra/libmediawiki/cmake/modules ${CMAKE_SOURCE_DIR}/extra/libkface/cmake/modules - ${CMAKE_SOURCE_DIR}/extra/libkvkontakte/cmake/modules ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} ) @@ -85,7 +84,6 @@ SET(KFACE_LOCAL_DIR extra/libkface) SET(KGEOMAP_LOCAL_DIR extra/libkgeomap) SET(MEDIAWIKI_LOCAL_DIR extra/libmediawiki) -SET(LIBKVKONTAKTE_LOCAL_DIR extra/libkvkontakte) ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(core) --- extra/CMakeLists.txt 2012-01-03 01:31:52.000000000 +0100 +++ extra/CMakeLists.txt 2012-01-05 13:49:38.665828606 +0100 @@ -33,7 +33,6 @@ ENDIF() MACRO_OPTIONAL_ADD_SUBDIRECTORY(libmediawiki) -MACRO_OPTIONAL_ADD_SUBDIRECTORY(libkvkontakte) ADD_SUBDIRECTORY(libkgeomap) ADD_SUBDIRECTORY(libkface) ++++++ fix-broken-icon-reference.diff ++++++ --- ./extra/kipi-plugins/panorama/plugin/panoramagui.desktop.orig 2011-10-04 09:34:29.576552045 +0200 +++ ./extra/kipi-plugins/panorama/plugin/panoramagui.desktop 2011-10-04 09:35:16.838301132 +0200 @@ -57,7 +57,6 @@ Name[x-test]=xxPanoramaxx Name[zh_TW]=Panorama StartupNotify=true -Icon=layer-visible-on Terminal=false Type=Application X-DBUS-ServiceName= ++++++ non-executable-script.patch ++++++ --- extra/kipi-plugins/expoblending/plugin/expoblending.desktop.orig 2011-07-28 02:27:35.000000000 +0300 +++ extra/kipi-plugins/expoblending/plugin/expoblending.desktop 2011-08-08 18:45:45.330000070 +0300 @@ -1,4 +1,3 @@ -#!/usr/bin/env xdg-open [Desktop Entry] Categories=Qt;KDE;Graphics; Comment=A tool to blend bracketed images --- extra/kipi-plugins/panorama/plugin/panoramagui.desktop.orig 2011-11-07 09:50:25.000000000 +0200 +++ extra/kipi-plugins/panorama/plugin/panoramagui.desktop 2011-11-12 22:14:39.809000013 +0200 @@ -1,4 +1,3 @@ -#!/usr/bin/env xdg-open [Desktop Entry] Categories=Qt;KDE;Graphics; Comment=A tool to assemble images as a panorama ++++++ remove-gplv2-only.patch ++++++ Index: extra/kipi-plugins/gpssync/CMakeLists.txt =================================================================== --- extra/kipi-plugins/gpssync/CMakeLists.txt.orig +++ extra/kipi-plugins/gpssync/CMakeLists.txt @@ -33,10 +33,8 @@ SET(kipiplugin_gpssync_PART_SRCS IF(KDE4_BUILD_TESTS) INCLUDE_DIRECTORIES(BEFORE "${CMAKE_CURRENT_SOURCE_DIR}/borrowed") - ADD_DEFINITIONS(-DGPSSYNC_MODELTEST) SET(kipiplugin_gpssync_PART_SRCS ${kipiplugin_gpssync_PART_SRCS} - ${CMAKE_CURRENT_SOURCE_DIR}/borrowed/modeltest.cpp ) ENDIF(KDE4_BUILD_TESTS) ++++++ use_correct_libkipi.patch ++++++ diff -urB digikam-2.5.0/core/utilities/setup/setupplugins.cpp new/core/utilities/setup/setupplugins.cpp --- digikam-2.5.0/core/utilities/setup/setupplugins.cpp 2012-01-03 01:32:01.000000000 +0100 +++ new/core/utilities/setup/setupplugins.cpp 2012-01-04 18:37:42.654350574 +0100 @@ -6,8 +6,8 @@ * Date : 2004-01-02 * Description : setup Kipi plugins tab. * - * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com> - * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com> + * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com> + * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com> * * This program is free software; you can redistribute it * and/or modify it under the terms of the GNU General @@ -100,6 +100,11 @@ panel->setLayout(mainLayout); +#if KIPI_VERSION < 0x010400 + d->checkAllBtn->setVisible(false); + d->clearBtn->setVisible(false); +#endif + initPlugins(); // -------------------------------------------------------- @@ -158,14 +163,18 @@ void SetupPlugins::slotCheckAll() { QApplication::setOverrideCursor(Qt::WaitCursor); +#if KIPI_VERSION >= 0x010400 d->kipiConfig->slotCheckAll(); +#endif QApplication::restoreOverrideCursor(); } void SetupPlugins::slotClear() { QApplication::setOverrideCursor(Qt::WaitCursor); +#if KIPI_VERSION >= 0x010400 d->kipiConfig->slotClear(); +#endif QApplication::restoreOverrideCursor(); } } // namespace Digikam -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
