diff -Nru libkdcraw-4.12.3/CMakeLists.txt libkdcraw-4.12.90/CMakeLists.txt --- libkdcraw-4.12.3/CMakeLists.txt 2013-11-30 12:30:13.000000000 +0000 +++ libkdcraw-4.12.90/CMakeLists.txt 2013-12-10 16:26:18.000000000 +0000 @@ -37,7 +37,16 @@ # NOTE: Libraw 0.16.x is prefered version to use because it's ported to Cmake with full features supported. # Until libraw 0.16.0 is release (ends of 2013), we will support previous version (with limited support) -FIND_PACKAGE(LibRaw 0.15 REQUIRED) +FIND_PACKAGE(LibRaw 0.15) +SET_PACKAGE_PROPERTIES(LibRaw PROPERTIES DESCRIPTION "library that provides image Raw file demosaicing" URL "http://www.libraw.org" TYPE REQUIRED PURPOSE "Required to build libkdcraw") +IF(NOT LIBRAW_FOUND) + FEATURE_SUMMARY( + WHAT ALL + INCLUDE_QUIET_PACKAGES + FATAL_ON_MISSING_REQUIRED_PACKAGES + ) + RETURN() +ENDIF() # Check LibRaw config header. MESSAGE(STATUS "LibRaw version: ${LibRaw_VERSION_STRING}") @@ -133,4 +142,8 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libkdcraw.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) ENDIF(NOT WIN32) -MACRO_DISPLAY_FEATURE_LOG() +FEATURE_SUMMARY( + WHAT ALL + INCLUDE_QUIET_PACKAGES + FATAL_ON_MISSING_REQUIRED_PACKAGES +) diff -Nru libkdcraw-4.12.3/debian/changelog libkdcraw-4.12.90/debian/changelog --- libkdcraw-4.12.3/debian/changelog 2014-03-04 20:08:50.000000000 +0000 +++ libkdcraw-4.12.90/debian/changelog 2014-03-19 11:53:22.000000000 +0000 @@ -1,3 +1,14 @@ +libkdcraw (4:4.12.90-0ubuntu1) trusty; urgency=medium + + [ Philip Muškovac ] + * Drop obsolete cmake option -DENABLE_LCMS2=ON as that's now the only + supported version + + [ Jonathan Riddell ] + * New upstream beta release + + -- Jonathan Riddell Wed, 19 Mar 2014 11:53:21 +0000 + libkdcraw (4:4.12.3-0ubuntu1) trusty; urgency=medium * New upstream bugfix release diff -Nru libkdcraw-4.12.3/debian/control libkdcraw-4.12.90/debian/control --- libkdcraw-4.12.3/debian/control 2014-03-04 20:08:50.000000000 +0000 +++ libkdcraw-4.12.90/debian/control 2014-03-19 11:53:22.000000000 +0000 @@ -6,7 +6,7 @@ Uploaders: Sune Vuorela Build-Depends: kde-sc-dev-latest (>= 4:4.10), cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12), - kdelibs5-dev (>= 4:4.12.3), + kdelibs5-dev (>= 4:4.12.90), libjpeg-dev, liblcms2-dev, pkg-config, diff -Nru libkdcraw-4.12.3/debian/libkdcraw-data.install libkdcraw-4.12.90/debian/libkdcraw-data.install --- libkdcraw-4.12.3/debian/libkdcraw-data.install 2014-03-04 20:08:50.000000000 +0000 +++ libkdcraw-4.12.90/debian/libkdcraw-data.install 2014-03-19 11:53:22.000000000 +0000 @@ -5,4 +5,5 @@ usr/share/kde4/apps/libkdcraw/profiles/prophoto.icm usr/share/kde4/apps/libkdcraw/profiles/srgb-d65.icm usr/share/kde4/apps/libkdcraw/profiles/widegamut.icm +usr/share/kde4/apps/libkdcraw/profiles/compatibleWithAdobeRGB1998.icc diff -Nru libkdcraw-4.12.3/debian/rules libkdcraw-4.12.90/debian/rules --- libkdcraw-4.12.3/debian/rules 2014-03-04 20:08:50.000000000 +0000 +++ libkdcraw-4.12.90/debian/rules 2014-03-19 11:53:22.000000000 +0000 @@ -4,9 +4,6 @@ .PHONY: override_dh_auto_test -override_dh_auto_configure: - $(overridden_command) -- -DENABLE_LCMS2=ON - override_dh_makeshlibs: $(overridden_command) -- -c0 diff -Nru libkdcraw-4.12.3/libkdcraw/kdcraw.cpp libkdcraw-4.12.90/libkdcraw/kdcraw.cpp --- libkdcraw-4.12.3/libkdcraw/kdcraw.cpp 2013-11-30 12:30:13.000000000 +0000 +++ libkdcraw-4.12.90/libkdcraw/kdcraw.cpp 2013-12-10 16:26:18.000000000 +0000 @@ -36,6 +36,10 @@ #include #include +// KDE includes + +#include + // LibRaw includes #include @@ -49,6 +53,8 @@ #include "version.h" #include "rawfiles.h" +static const KCatalogLoader loader("libkdcraw"); + namespace KDcrawIface { diff -Nru libkdcraw-4.12.3/libkdcraw/squeezedcombobox.cpp libkdcraw-4.12.90/libkdcraw/squeezedcombobox.cpp --- libkdcraw-4.12.3/libkdcraw/squeezedcombobox.cpp 2013-11-30 12:30:13.000000000 +0000 +++ libkdcraw-4.12.90/libkdcraw/squeezedcombobox.cpp 2013-12-10 16:26:18.000000000 +0000 @@ -74,6 +74,7 @@ SqueezedComboBox::~SqueezedComboBox() { + d->originalItems.clear(); delete d->timer; delete d; } diff -Nru libkdcraw-4.12.3/profiles/CMakeLists.txt libkdcraw-4.12.90/profiles/CMakeLists.txt --- libkdcraw-4.12.3/profiles/CMakeLists.txt 2013-11-30 12:30:13.000000000 +0000 +++ libkdcraw-4.12.90/profiles/CMakeLists.txt 2013-12-10 16:26:18.000000000 +0000 @@ -22,7 +22,7 @@ # # ============================================================ -FILE(GLOB icmfiles *.icm) +FILE(GLOB icmfiles *.icm *.icc) INSTALL(FILES ${icmfiles} DESTINATION ${DATA_INSTALL_DIR}/libkdcraw/profiles )