Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat:upgrade to 5.103 #1

Merged
merged 1 commit into from
Jun 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 19 additions & 13 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,27 @@
cmake_minimum_required(VERSION 3.16)

set(KF_VERSION "5.90.0") # handled by release scripts
set(KF_VERSION "5.103.0") # handled by release scripts
project(KDNSSD VERSION ${KF_VERSION})

include(FeatureSummary)
find_package(ECM 5.90.0 NO_MODULE)
find_package(ECM 5.103.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_SOURCE_DIR}/cmake/modules) #TODO: remove cmake/modules when extra-cmake-modules is done

include(KDEInstallDirs)
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
include(KDEGitCommitHooks)
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)

include(KDEGitCommitHooks)
include(ECMPoQmTools)
include(ECMAddQch)
include(ECMGenerateExportHeader)
include(ECMSetupVersion)
include(ECMGenerateHeaders)
include(ECMDeprecationSettings)
include(CMakePackageConfigHelpers)

set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprecated API excluded from the build [default=0].")

Expand All @@ -28,17 +33,15 @@ find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Networ

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)


include(ECMGenerateExportHeader)
include(ECMSetupVersion)
include(ECMGenerateHeaders)
include(CMakePackageConfigHelpers)

ecm_setup_version(PROJECT VARIABLE_PREFIX KDNSSD
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kdnssd_version.h"
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5DNSSDConfigVersion.cmake"
SOVERSION 5)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdnssd_version.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF} COMPONENT Devel)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/kdnssd_version.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KDNSSD
COMPONENT Devel
)

configure_file(config-kdnssd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdnssd.h )

Expand All @@ -63,10 +66,13 @@ if(AVAHI_FOUND OR DNSSD_FOUND)
find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus)
endif()

ecm_install_po_files_as_qm(po)
ecm_install_po_files_as_qm(poqm)

remove_definitions(-DQT_NO_CAST_FROM_ASCII)
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02)
ecm_set_disabled_deprecation_versions(
QT 5.15.2
)

add_subdirectory(src)

set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5DNSSD")
Expand Down
77 changes: 76 additions & 1 deletion debian/changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,79 @@
kdnssd-kf5 (5.90.0-1) experimental; urgency=medium
kdnssd-kf5 (5.103.0-1) unstable; urgency=medium

[ Aurélien COUDERC ]
* New upstream release (5.103.0).
* Update build-deps and deps with the info from cmake.

-- Aurélien COUDERC <coucouf@debian.org> Sun, 12 Feb 2023 21:44:22 +0100

kdnssd-kf5 (5.102.0-1) unstable; urgency=medium

[ Aurélien COUDERC ]
* New upstream release (5.102.0).
* Update build-deps and deps with the info from cmake.
* Bump Standards-Version to 4.6.2, no change required.

-- Aurélien COUDERC <coucouf@debian.org> Sun, 22 Jan 2023 21:35:00 +0100

kdnssd-kf5 (5.101.0-1) unstable; urgency=medium

[ Aurélien COUDERC ]
* New upstream release (5.101.0).
* Update build-deps and deps with the info from cmake.

-- Aurélien COUDERC <coucouf@debian.org> Tue, 13 Dec 2022 07:40:21 +0100

kdnssd-kf5 (5.100.0-1) unstable; urgency=medium

[ Aurélien COUDERC ]
* New upstream release (5.99.0).
* Update build-deps and deps with the info from cmake.
* New upstream release (5.100.0).
* Update build-deps and deps with the info from cmake.
* Refresh copyright information.

-- Aurélien COUDERC <coucouf@debian.org> Sat, 19 Nov 2022 23:18:56 +0100

kdnssd-kf5 (5.98.0-1) unstable; urgency=medium

[ Aurélien COUDERC ]
* New upstream release (5.98.0).
* Update build-deps and deps with the info from cmake.

-- Aurélien COUDERC <coucouf@debian.org> Sun, 18 Sep 2022 23:11:35 +0200

kdnssd-kf5 (5.97.0-1) unstable; urgency=medium

[ Aurélien COUDERC ]
* New upstream release (5.97.0).

-- Aurélien COUDERC <coucouf@debian.org> Sun, 14 Aug 2022 18:55:27 +0200

kdnssd-kf5 (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 <coucouf@debian.org> Sun, 31 Jul 2022 13:32:56 +0200

kdnssd-kf5 (5.94.0-1) unstable; urgency=medium

[ Aurélien COUDERC ]
* New upstream release (5.94.0).

-- Aurélien COUDERC <coucouf@debian.org> Thu, 19 May 2022 23:59:02 +0200

kdnssd-kf5 (5.93.0-1) unstable; urgency=medium

[ Aurélien COUDERC ]
* New upstream release (5.92.0).
* Update the list of installed files.
* New upstream release (5.93.0).

-- Aurélien COUDERC <coucouf@debian.org> Wed, 11 May 2022 23:22:43 +0200

kdnssd-kf5 (5.90.0-1) unstable; urgency=medium

[ Norbert Preining ]
* New upstream release (5.89.0).
Expand Down
12 changes: 6 additions & 6 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,22 @@ Uploaders: Aurélien COUDERC <coucouf@debian.org>,
Build-Depends: cmake (>= 3.16~),
debhelper-compat (= 13),
doxygen,
extra-cmake-modules (>= 5.90.0~),
extra-cmake-modules (>= 5.103.0~),
libavahi-common-dev,
libqt5sql5-sqlite,
pkg-kde-tools (>= 0.15.15ubuntu1~),
qtbase5-dev (>= 5.15.2~),
qttools5-dev (>= 5.4),
qttools5-dev-tools (>= 5.4),
Standards-Version: 4.6.0
Standards-Version: 4.6.2
Homepage: https://invent.kde.org/frameworks/kdnssd
Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kdnssd
Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kdnssd.git
Rules-Requires-Root: no

Package: libkf5dnssd-data
Architecture: all
Depends: ${misc:Depends}, ${shlibs:Depends}
Depends: ${misc:Depends}, ${shlibs:Depends},
Multi-Arch: foreign
Description: Abstraction to system DNSSD features.
KDNSSD is a library for handling the DNS-based
Expand All @@ -37,19 +37,19 @@ Architecture: any
Depends: libkf5dnssd5 (= ${binary:Version}),
qtbase5-dev (>= 5.15.2~),
${misc:Depends},
Recommends: libkf5dnssd-doc (= ${source:Version})
Recommends: libkf5dnssd-doc (= ${source:Version}),
Description: development files for kdnssd
KDNSSD is a library for handling the DNS-based
Service Discovery Protocol (DNS-SD), the layer of
Zeroconf that allows network services.
.
Contains development files for kdnssd.
Breaks: libkf5kdelibs4support-dev (<< 5.54)
Breaks: libkf5kdelibs4support-dev (<< 5.54),

Package: libkf5dnssd-doc
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}
Depends: ${misc:Depends},
Description: Abstraction to system DNSSD features (documentation)
KDNSSD is a library for handling the DNS-based
Service Discovery Protocol (DNS-SD), the layer of
Expand Down
6 changes: 3 additions & 3 deletions debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ Copyright: 2007, Jakub Stachowski <qbast@go2.pl>
2006, Laurent Montel <montel@kde.org>
License: BSD-3-clause

Files: po/ca/*
po/ca@valencia/*
po/uk/*
Files: poqm/ca/*
poqm/ca@valencia/*
poqm/uk/*
Copyright: 2014, This_file_is_part_of_KDE
License: LGPL-2.1+3+KDEeV

Expand Down
1 change: 0 additions & 1 deletion debian/libkf5dnssd-dev.install
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
usr/include/KF5/KDNSSD/
usr/include/KF5/kdnssd_version.h
usr/lib/*/cmake/KF5DNSSD/
usr/lib/*/libKF5DNSSD.so
usr/lib/*/qt5/mkspecs/modules/qt_KDNSSD.pri
36 changes: 0 additions & 36 deletions po/af/kdnssd5_qt.po

This file was deleted.

41 changes: 0 additions & 41 deletions po/as/kdnssd5_qt.po

This file was deleted.

29 changes: 0 additions & 29 deletions po/ast/kdnssd5_qt.po

This file was deleted.

48 changes: 0 additions & 48 deletions po/be/kdnssd5_qt.po

This file was deleted.

Loading