diff -pruN 5.94.0-1/CMakeLists.txt 5.96.0-1/CMakeLists.txt --- 5.94.0-1/CMakeLists.txt 2022-05-07 21:25:56.000000000 +0000 +++ 5.96.0-1/CMakeLists.txt 2022-07-02 15:57:38.000000000 +0000 @@ -1,22 +1,32 @@ 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(KPty 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} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) -set(REQUIRED_QT_VERSION 5.15.2) - +# Includes include(KDEInstallDirs) -include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) + include(KDEGitCommitHooks) +include(ECMMarkNonGuiExecutable) +include(ECMSetupVersion) +include(ECMGenerateHeaders) +include(ECMQtDeclareLoggingCategory) +include(ECMDeprecationSettings) +include(ECMAddQch) +include(CMakePackageConfigHelpers) +include(GenerateExportHeader) + +set(REQUIRED_QT_VERSION 5.15.2) find_package(Qt${QT_MAJOR_VERSION} "${REQUIRED_QT_VERSION}" CONFIG REQUIRED Core) find_package(KF5CoreAddons ${KF_DEP_VERSION} REQUIRED) @@ -35,16 +45,6 @@ endif() # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Pty") -# Includes - -include(GenerateExportHeader) -include(ECMMarkNonGuiExecutable) -include(ECMSetupVersion) -include(ECMGenerateHeaders) -include(ECMQtDeclareLoggingCategory) -include(CMakePackageConfigHelpers) -include(ECMAddQch) - option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") @@ -57,8 +57,12 @@ ecm_setup_version( add_definitions(-DTRANSLATION_DOMAIN=\"kpty5\") ki18n_install(po) -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055900) + +ecm_set_disabled_deprecation_versions( + QT 5.15.2 + KF 5.95 +) + add_subdirectory( src ) if (BUILD_TESTING) add_subdirectory( autotests ) 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:04.000000000 +0000 +++ 5.96.0-1/debian/changelog 2022-07-31 11:33:03.000000000 +0000 @@ -1,3 +1,11 @@ +kpty (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. + + -- Aurélien COUDERC Sun, 31 Jul 2022 13:33:03 +0200 + kpty (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-04-29 22:13:08.000000000 +0000 +++ 5.96.0-1/debian/control 2022-07-31 11:33:03.000000000 +0000 @@ -7,16 +7,16 @@ Uploaders: Aurélien COUDERC = 3.16~), debhelper-compat (= 13), doxygen, - extra-cmake-modules (>= 5.93.0~), - libkf5coreaddons-dev (>= 5.93.0~), - libkf5i18n-dev (>= 5.93.0~), + extra-cmake-modules (>= 5.96.0~), + libkf5coreaddons-dev (>= 5.96.0~), + libkf5i18n-dev (>= 5.96.0~), libqt5sql5-sqlite, libutempter-dev, pkg-kde-tools (>= 0.15.15ubuntu1~), qtbase5-dev (>= 5.15.2~), qttools5-dev, qttools5-dev-tools (>= 5.4), -Standards-Version: 4.6.0 +Standards-Version: 4.6.1 Homepage: https://invent.kde.org/frameworks/kpty Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kpty Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kpty.git @@ -36,8 +36,8 @@ Description: Pty abstraction. Package: libkf5pty-dev Section: libdevel Architecture: any -Depends: libkf5coreaddons-dev (>= 5.93.0~), - libkf5i18n-dev (>= 5.93.0~), +Depends: libkf5coreaddons-dev (>= 5.96.0~), + libkf5i18n-dev (>= 5.96.0~), libkf5pty5 (= ${binary:Version}), ${misc:Depends}, Recommends: libkf5pty-doc (= ${source:Version}) diff -pruN 5.94.0-1/po/ca@valencia/kpty5.po 5.96.0-1/po/ca@valencia/kpty5.po --- 5.94.0-1/po/ca@valencia/kpty5.po 2022-05-07 21:25:56.000000000 +0000 +++ 5.96.0-1/po/ca@valencia/kpty5.po 2022-07-02 15:57:38.000000000 +0000 @@ -44,4 +44,4 @@ msgstr "L'operació de PTY ha excedit el #: kptydevice.cpp:464 kptydevice.cpp:478 #, kde-format msgid "Error opening PTY" -msgstr "S'ha produït un error en obri PTY" +msgstr "S'ha produït un error en obrir PTY" diff -pruN 5.94.0-1/po/zh_CN/kpty5.po 5.96.0-1/po/zh_CN/kpty5.po --- 5.94.0-1/po/zh_CN/kpty5.po 2022-05-07 21:25:56.000000000 +0000 +++ 5.96.0-1/po/zh_CN/kpty5.po 2022-07-02 15:57:38.000000000 +0000 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2021-08-14 00:14+0000\n" -"PO-Revision-Date: 2022-04-26 15:19\n" +"PO-Revision-Date: 2022-07-02 10:59\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -pruN 5.94.0-1/src/kpty.h 5.96.0-1/src/kpty.h --- 5.94.0-1/src/kpty.h 2022-05-07 21:25:56.000000000 +0000 +++ 5.96.0-1/src/kpty.h 2022-07-02 15:57:38.000000000 +0000 @@ -147,6 +147,8 @@ public: * @param height the view height in pixels * @param width the view width in pixels * @return @c true on success, false otherwise + * + * @since 5.93 */ bool setWinSize(int lines, int columns, int height, int width);