diff -pruN 5.94.0-1/CMakeLists.txt 5.96.0-1/CMakeLists.txt --- 5.94.0-1/CMakeLists.txt 2022-04-18 23:29:02.000000000 +0000 +++ 5.96.0-1/CMakeLists.txt 2022-07-02 14:34:38.000000000 +0000 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.94.0") # handled by release scripts +set(KF_VERSION "5.96.0") # handled by release scripts project(KItemModels 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) @@ -12,26 +12,28 @@ feature_summary(WHAT REQUIRED_PACKAGES_N set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(KDEInstallDirs) -include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) + include(KDEGitCommitHooks) include(ECMQtDeclareLoggingCategory) +include(ECMSetupVersion) +include(ECMGenerateHeaders) +include(ECMGenerateExportHeader) +include(ECMDeprecationSettings) +include(ECMAddQch) +include(CMakePackageConfigHelpers) set(REQUIRED_QT_VERSION 5.15.2) find_package(Qt${QT_MAJOR_VERSION}Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) find_package(Qt${QT_MAJOR_VERSION}Qml ${REQUIRED_QT_VERSION} NO_MODULE) -include(ECMGenerateExportHeader) set_package_properties(Qt${QT_MAJOR_VERSION}Qml PROPERTIES TYPE OPTIONAL PURPOSE "Build QML import for KItemModels" ) -include(ECMSetupVersion) -include(ECMGenerateHeaders) -include(ECMAddQch) - set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprecated API excluded from the build [default=0].") option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) @@ -42,7 +44,10 @@ ecm_setup_version(PROJECT VARIABLE_PREFI PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ItemModelsConfigVersion.cmake" SOVERSION 5) -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) +ecm_set_disabled_deprecation_versions( + QT 5.15.2 +) + add_subdirectory(src) if (BUILD_TESTING) find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test Widgets) @@ -73,8 +78,6 @@ if (BUILD_QCH) set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KF5ItemModelsQCHTargets.cmake\")") endif() -include(CMakePackageConfigHelpers) - configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5ItemModelsConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5ItemModelsConfig.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:02.000000000 +0000 +++ 5.96.0-1/debian/changelog 2022-07-31 11:32:57.000000000 +0000 @@ -1,3 +1,12 @@ +kitemmodels (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. + * Review copyright information. + + -- Aurélien COUDERC Sun, 31 Jul 2022 13:32:57 +0200 + kitemmodels (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 21:01:53.000000000 +0000 +++ 5.96.0-1/debian/control 2022-07-31 11:32:57.000000000 +0000 @@ -7,7 +7,7 @@ Uploaders: Aurélien COUDERC = 3.16~), debhelper-compat (= 13), doxygen, - extra-cmake-modules (>= 5.93.0~), + extra-cmake-modules (>= 5.96.0~), libqt5sql5-sqlite:native, pkg-kde-tools (>= 0.15.15ubuntu1~), qml-module-qtquick-controls , @@ -17,7 +17,7 @@ Build-Depends: cmake (>= 3.16~), qttools5-dev-tools (>= 5.4), xauth, xvfb, -Standards-Version: 4.6.0 +Standards-Version: 4.6.1 Homepage: https://invent.kde.org/frameworks/kitemmodels Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kitemmodels Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kitemmodels.git diff -pruN 5.94.0-1/debian/copyright 5.96.0-1/debian/copyright --- 5.94.0-1/debian/copyright 2022-02-02 11:33:00.000000000 +0000 +++ 5.96.0-1/debian/copyright 2022-07-31 11:32:57.000000000 +0000 @@ -5,18 +5,34 @@ Upstream-Contact: kde-frameworks-devel@k Files: * Copyright: 2016, Ableton AG + 2019, Arjen Hiemstra 2013, Aurélien Gateau 2014, Christian Mollekopf + 2018-2019, David Edmundson 2014-2015, David Faure - 2010, Klarälvdalens Datakonsult AB - 2015, Klarälvdalens Datakonsult AB, a KDAB Group company + 2015-2020, Klarälvdalens Datakonsult AB, a KDAB Group company + 2010, Klarälvdalens Datakonsult AB, a KDAB Group company + 2010-2020, Marco Martin 2009-2015, Stephen Kelly - a KDAB Group company -License: LGPL-2+ +License: LGPL-2.0-or-later -Files: autotests/kdescendantsproxymodeltest.cpp +Files: autotests/proxymodeltestsuite/modeltest.cpp + autotests/proxymodeltestsuite/modeltest.h +Copyright: 2013, Digia Plc and/or its subsidiary(-ies) + 2010, Stephen Kelly +License: LGPL-2.1-only + +Files: src/qml/qmldeprecated.h +Copyright: 2020, Arjen Hiemstra +License: LGPL-2.1-only_OR_LGPL-3.0-only_OR_LicenseRef-KDE-Accepted-LGPL + +Files: autotests/kconcatenaterows_qml.cpp + autotests/kdescendantsproxymodeltest.cpp + autotests/ksortfilterproxymodel_qml.cpp tests/proxymodeltestapp/descendantpmwidget.cpp tests/proxymodeltestapp/descendantpmwidget.h + tests/proxymodeltestapp/descendantqmltree.cpp + tests/proxymodeltestapp/descendantqmltree.h tests/proxymodeltestapp/lessthanwidget.cpp tests/proxymodeltestapp/lessthanwidget.h tests/proxymodeltestapp/main.cpp @@ -24,75 +40,104 @@ Files: autotests/kdescendantsproxymodelt tests/proxymodeltestapp/mainwindow.h tests/proxymodeltestapp/proxymodeltestwidget.cpp tests/proxymodeltestapp/proxymodeltestwidget.h - tests/proxymodeltestapp/recursivefilterpmwidget.cpp - tests/proxymodeltestapp/recursivefilterpmwidget.h tests/proxymodeltestapp/reparentingpmwidget.cpp tests/proxymodeltestapp/reparentingpmwidget.h tests/proxymodeltestapp/selectioninqmlwidget.cpp tests/proxymodeltestapp/selectioninqmlwidget.h tests/proxymodeltestapp/selectionpmwidget.cpp tests/proxymodeltestapp/selectionpmwidget.h -Copyright: 1991-1999, Free Software Foundation, Inc +Copyright: 2019, David Edmundson + 2020, Marco Martin 2009-2015, Stephen Kelly 2016, Sune Vuorela -License: LGPL-2.1+ - -Files: autotests/proxymodeltestsuite/modeltest.cpp - autotests/proxymodeltestsuite/modeltest.h -Copyright: 2013, Digia Plc and/or its subsidiary(-ies) - 2010, Stephen Kelly -License: LGPL-2.1 +License: LGPL-2.1-or-later Files: debian/* -Copyright: 2014, Jonathan Riddell -License: LGPL-2+ - -License: LGPL-2+ - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. +Copyright: 2022, Debian Qt/KDE Maintainers + 2014, Jonathan Riddell +License: LGPL-2.0-or-later + +License: LGPL-2.0-or-later + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. . - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of + This library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. . - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301, USA. . On Debian systems, the complete text of the GNU Library General - Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2". + Public License version 2 can be found in + `/usr/share/common-licenses/LGPL-2’. -License: LGPL-2.1 - GNU Lesser General Public License Usage - This file may be used under the terms of the GNU Lesser - General Public License version 2.1 as published by the Free Software - Foundation and appearing in the file COPYING.LIB included in the - packaging of this file. Please review the following information to - ensure the GNU Lesser General Public License version 2.1 requirements - will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - . - On Debian systems, the complete text of the GNU Lesser General Public License - version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1". - -License: LGPL-2.1+ - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - . - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU +License: LGPL-2.1-only + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License version + 2.1 as published by the Free Software Foundation. + . + This library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA Also add information on how to contact you by + electronic and paper mail. + . + On Debian systems, the complete text of the GNU Lesser General + Public License version 2.1 can be found in + `/usr/share/common-licenses/LGPL-2.1’. + +License: LGPL-2.1-only_OR_LGPL-3.0-only_OR_LicenseRef-KDE-Accepted-LGPL + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) version 3, or any later version + accepted by the membership of KDE e.V. (or its successor approved by + the membership of KDE e.V.), which shall act as a proxy defined in + Section 6 of version 3 of the license. + . + This library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see + . + . + On Debian systems, the complete text of the GNU Lesser General + Public License version 2.1 can be found in + `/usr/share/common-licenses/LGPL-2.1’, likewise, the complete text + of the GNU Lesser General Public License version 3 can be found in + `/usr/share/common-licenses/LGPL-3’. + +License: LGPL-2.1-or-later + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + . + This library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. . You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301  USA + 02110-1301 USA Also add information on how to contact you by + electronic and paper mail. . - On Debian systems, the complete text of the GNU Lesser General Public License - version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1". + On Debian systems, the complete text of the GNU Lesser General + Public License version 2.1 can be found in + `/usr/share/common-licenses/LGPL-2.1’. diff -pruN 5.94.0-1/.kde-ci.yml 5.96.0-1/.kde-ci.yml --- 5.94.0-1/.kde-ci.yml 2022-04-18 23:29:02.000000000 +0000 +++ 5.96.0-1/.kde-ci.yml 2022-07-02 14:34:38.000000000 +0000 @@ -5,3 +5,4 @@ Dependencies: Options: test-before-installing: True + require-passing-tests-on: [ 'Linux', 'FreeBSD', 'Windows' ]