diff -pruN 5.94.0-1/CMakeLists.txt 5.96.0-1/CMakeLists.txt --- 5.94.0-1/CMakeLists.txt 2022-05-07 21:24:26.000000000 +0000 +++ 5.96.0-1/CMakeLists.txt 2022-07-02 15:55:50.000000000 +0000 @@ -1,27 +1,28 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.94.0") # handled by release scripts -set(KF_DEP_VERSION "5.93.0") # handled by release scripts +set(KF_VERSION "5.96.0") # handled by release scripts +set(KF_DEP_VERSION "5.96.0") # handled by release scripts project(KJsEmbed VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.93.0 NO_MODULE) +find_package(ECM 5.96.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) -set(REQUIRED_QT_VERSION 5.15.2) -find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED UiTools Widgets Xml Svg) include(KDEInstallDirs) -include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) -include(GenerateExportHeader) -include(CMakePackageConfigHelpers) include(ECMSetupVersion) include(ECMGenerateHeaders) +include(ECMDeprecationSettings) +include(GenerateExportHeader) +include(CMakePackageConfigHelpers) +set(REQUIRED_QT_VERSION 5.15.2) +find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED UiTools Widgets Xml Svg) ecm_setup_version(PROJECT VARIABLE_PREFIX KJSEMBED #VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kjsembed_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5JsEmbedConfigVersion.cmake" @@ -31,8 +32,11 @@ find_package(KF5JS ${KF_DEP_VERSION} REQ find_package(KF5I18n ${KF_DEP_VERSION} REQUIRED) find_package(KF5DocTools ${KF_DEP_VERSION}) -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100) +ecm_set_disabled_deprecation_versions( + QT 4.99 + KF 5.95 +) + # remove definitions set by KDEFrameworkCompilerSettings which we fail to meet remove_definitions(-DQT_NO_KEYWORDS) remove_definitions(-DQT_NO_FOREACH) @@ -55,8 +59,6 @@ add_subdirectory(examples/kjsconsole) # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5JsEmbed") -include(CMakePackageConfigHelpers) - configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5JsEmbedConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5JsEmbedConfig.cmake" diff -pruN 5.94.0-1/debian/changelog 5.96.0-1/debian/changelog --- 5.94.0-1/debian/changelog 2022-05-19 21:59:06.000000000 +0000 +++ 5.96.0-1/debian/changelog 2022-07-31 11:33:06.000000000 +0000 @@ -1,3 +1,12 @@ +kjsembed (5.96.0-1) unstable; urgency=medium + + [ Aurélien COUDERC ] + * New upstream release (5.96.0). + * Bump Standards-Version to 4.6.1, no change required. + * Refresh lintian overrides. + + -- Aurélien COUDERC Sun, 31 Jul 2022 13:33:06 +0200 + kjsembed (5.94.0-1) unstable; urgency=medium [ Aurélien COUDERC ] diff -pruN 5.94.0-1/debian/control 5.96.0-1/debian/control --- 5.94.0-1/debian/control 2022-05-05 14:36:04.000000000 +0000 +++ 5.96.0-1/debian/control 2022-07-31 11:33:06.000000000 +0000 @@ -6,16 +6,16 @@ Uploaders: Aurélien COUDERC , Build-Depends: cmake (>= 3.16~), debhelper-compat (= 13), - extra-cmake-modules (>= 5.93.0~), + extra-cmake-modules (>= 5.96.0~), gettext, - libkf5doctools-dev (>= 5.93.0~), - libkf5i18n-dev (>= 5.93.0~), - libkf5kjs-dev (>= 5.93.0~), + libkf5doctools-dev (>= 5.96.0~), + libkf5i18n-dev (>= 5.96.0~), + libkf5kjs-dev (>= 5.96.0~), libqt5svg5-dev (>= 5.15.2~), pkg-kde-tools (>= 0.15.15ubuntu1~), qtbase5-dev (>= 5.15.2~), qttools5-dev (>= 5.15.2~), -Standards-Version: 4.6.0 +Standards-Version: 4.6.1 Homepage: https://invent.kde.org/frameworks/kjsembed Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kjsembed Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kjsembed.git @@ -33,9 +33,9 @@ Description: Embedded JS library for Qt Package: libkf5jsembed-dev Section: libdevel Architecture: any -Depends: libkf5i18n-dev (>= 5.93.0~), +Depends: libkf5i18n-dev (>= 5.96.0~), libkf5jsembed5 (= ${binary:Version}), - libkf5kjs-dev (>= 5.93.0~), + libkf5kjs-dev (>= 5.96.0~), ${misc:Depends}, ${shlibs:Depends}, Description: Embedded JS library for Qt diff -pruN 5.94.0-1/debian/libkf5jsembed-dev.lintian-overrides 5.96.0-1/debian/libkf5jsembed-dev.lintian-overrides --- 5.94.0-1/debian/libkf5jsembed-dev.lintian-overrides 2022-02-02 13:21:35.000000000 +0000 +++ 5.96.0-1/debian/libkf5jsembed-dev.lintian-overrides 2022-07-31 11:33:06.000000000 +0000 @@ -1,3 +1,3 @@ -libkf5jsembed-dev: no-manual-page usr/bin/kjsconsole +libkf5jsembed-dev: no-manual-page [usr/bin/kjsconsole] # shipped like this from upstream libkf5jsembed-dev: repeated-path-segment diff -pruN 5.94.0-1/po/ca@valencia/kjsembed5.po 5.96.0-1/po/ca@valencia/kjsembed5.po --- 5.94.0-1/po/ca@valencia/kjsembed5.po 2022-05-07 21:24:26.000000000 +0000 +++ 5.96.0-1/po/ca@valencia/kjsembed5.po 2022-07-02 15:55:50.000000000 +0000 @@ -71,7 +71,7 @@ msgstr "Excepció en cridar la funció  #: kjsembed/fileio.cpp:69 #, kde-format msgid "Could not open file '%1'" -msgstr "No s'ha pogut obri el fitxer «%1»" +msgstr "No s'ha pogut obrir el fitxer «%1»" #: kjsembed/fileio.cpp:106 #, kde-format @@ -173,7 +173,7 @@ msgstr "No s'ha pogut convertir el valor #: kjsembed/qobject_binding.cpp:660 #, kde-format msgid "No such method '%1'." -msgstr "No existeix el mètode «%1»." +msgstr "No existix el mètode «%1»." #: kjsembed/qobject_binding.cpp:689 #, kde-format @@ -229,7 +229,7 @@ msgstr "No s'ha pogut crear el giny." #: kjsembed/quiloader_binding.cpp:128 #, kde-format msgid "Could not open file '%1': %2" -msgstr "No s'ha pogut obri el fitxer «%1»: %2" +msgstr "No s'ha pogut obrir el fitxer «%1»: %2" #: kjsembed/quiloader_binding.cpp:136 #, kde-format diff -pruN 5.94.0-1/po/zh_CN/kjsembed5.po 5.96.0-1/po/zh_CN/kjsembed5.po --- 5.94.0-1/po/zh_CN/kjsembed5.po 2022-05-07 21:24:26.000000000 +0000 +++ 5.96.0-1/po/zh_CN/kjsembed5.po 2022-07-02 15:55:50.000000000 +0000 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2020-10-24 02:12+0200\n" -"PO-Revision-Date: 2022-04-26 15:18\n" +"PO-Revision-Date: 2022-07-02 10:59\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n"