diff -Nru kfilemetadata-kf5-5.24.0/cmake/FindXattr.cmake kfilemetadata-kf5-5.26.0/cmake/FindXattr.cmake --- kfilemetadata-kf5-5.24.0/cmake/FindXattr.cmake 1970-01-01 00:00:00.000000000 +0000 +++ kfilemetadata-kf5-5.26.0/cmake/FindXattr.cmake 2016-09-06 12:03:15.000000000 +0000 @@ -0,0 +1,41 @@ +# - Find CatDoc +# +# This module defines +# Xattr_FOUND - whether the xattr header was Xattr_FOUND + + +# XATTR_FOUND libattr found +# XATTR_INCLUDE_DIRS include directories +# XATTR_LIBRARIES libattr library + + # Already in cache? +if (XATTR_INCLUDE_DIRS AND XATTR_LIBRARIES) + set(XATTR_FOUND TRUE) +else () + + find_path(XATTR_INCLUDE attr/xattr.h + /usr/include + /usr/local/include + ${CMAKE_INCLUDE_PATH} + ${CMAKE_INSTALL_PREFIX}/usr/include + ) + + find_library(XATTR_LIB NAMES attr libattr + PATHS + ${CMAKE_LIBRARY_PATH} + ${CMAKE_INSTALL_PREFIX}/lib + ) + + if(XATTR_INCLUDE AND XATTR_LIB) + set(XATTR_FOUND TRUE) + set(XATTR_INCLUDE_DIRS ${XATTR_INCLUDE}) + set(XATTR_LIBRARIES ${XATTR_LIB}) + message(STATUS "Found xattr") + else() + set(XATTR_FOUND FALSE) + set(XATTR_LIBRARIES "") + message(STATUS "Unable to find xattr") + endif() + + mark_as_advanced(XATTR_INCLUDE_DIRS XATTR_LIBRARIES) +endif() diff -Nru kfilemetadata-kf5-5.24.0/CMakeLists.txt kfilemetadata-kf5-5.26.0/CMakeLists.txt --- kfilemetadata-kf5-5.24.0/CMakeLists.txt 2016-07-03 09:11:42.000000000 +0000 +++ kfilemetadata-kf5-5.26.0/CMakeLists.txt 2016-09-06 12:03:15.000000000 +0000 @@ -3,7 +3,7 @@ project(kfilemetadata) include(FeatureSummary) -find_package(ECM 5.24.0 NO_MODULE) +find_package(ECM 5.26.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -17,8 +17,8 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) -set(KF5_VERSION "5.24.0") # handled by release scripts -set(KF5_DEP_VERSION "5.24.0") # handled by release scripts +set(KF5_VERSION "5.26.0") # handled by release scripts +set(KF5_DEP_VERSION "5.26.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KFILEMETADATA @@ -26,7 +26,7 @@ SOVERSION 3) # Dependencies -set(REQUIRED_QT_VERSION 5.4.0) +set(REQUIRED_QT_VERSION 5.5.0) find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS Xml) find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS I18n Archive) @@ -61,6 +61,13 @@ URL "http://www.wagner.pp.ru/~vitus/software/catdoc/" TYPE RUNTIME PURPOSE "Extract text from office 98 files - RUNTIME dependency") +if ( CMAKE_SYSTEM_NAME MATCHES "Linux" ) + find_package(Xattr) + set_package_properties(Xattr PROPERTIES + URL "http://savannah.nongnu.org/projects/attr" + TYPE REQUIRED) +endif() + #find_package(QMobipocket) #set_package_properties(QMobipocket PROPERTIES DESCRIPTION "Mobipocket epub reader" # URL "https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket" diff -Nru kfilemetadata-kf5-5.24.0/debian/changelog kfilemetadata-kf5-5.26.0/debian/changelog --- kfilemetadata-kf5-5.24.0/debian/changelog 2016-07-26 08:40:42.000000000 +0000 +++ kfilemetadata-kf5-5.26.0/debian/changelog 2016-09-22 12:44:32.000000000 +0000 @@ -1,3 +1,9 @@ +kfilemetadata-kf5 (5.26.0-0ubuntu1) yakkety; urgency=low + + * New upstream release (5.26.0) + + -- Rik Mills Thu, 22 Sep 2016 13:44:32 +0100 + kfilemetadata-kf5 (5.24.0-0ubuntu1) yakkety; urgency=medium * New upstream release (5.24.0) diff -Nru kfilemetadata-kf5-5.24.0/debian/control kfilemetadata-kf5-5.26.0/debian/control --- kfilemetadata-kf5-5.24.0/debian/control 2016-07-26 08:40:42.000000000 +0000 +++ kfilemetadata-kf5-5.26.0/debian/control 2016-09-22 12:44:32.000000000 +0000 @@ -6,7 +6,7 @@ Build-Depends: catdoc, cmake (>= 2.8.12), debhelper (>= 9), - extra-cmake-modules (>= 5.24.0~), + extra-cmake-modules (>= 5.26.0~), libattr1-dev, libavcodec-dev, libavdevice-dev, @@ -14,8 +14,8 @@ libavutil-dev, libepub-dev, libexiv2-dev (>= 0.21), - libkf5archive-dev (>= 5.24.0~), - libkf5i18n-dev (>= 5.24.0~), + libkf5archive-dev (>= 5.26.0~), + libkf5i18n-dev (>= 5.26.0~), libpoppler-qt5-dev (>= 0.12.1), libpostproc-dev, libswscale-dev,