diff -Nru libkubuntu-14.10ubuntu1/autotests/CMakeLists.txt libkubuntu-15.04ubuntu2/autotests/CMakeLists.txt --- libkubuntu-14.10ubuntu1/autotests/CMakeLists.txt 2014-07-15 00:17:45.000000000 +0000 +++ libkubuntu-15.04ubuntu2/autotests/CMakeLists.txt 2015-01-20 16:08:38.000000000 +0000 @@ -1,31 +1,13 @@ -enable_testing() +include(ECMAddTests) -################################### LANGUAGE ################################### +find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) -set(unit_language_SRCS languagetest.cpp) - -kde4_add_unit_test(languagetest - TESTNAME languagetest - ${unit_language_SRCS} -) - -target_link_libraries(languagetest - ${KDE4_KDECORE_LIBS} - ${QT_QTTEST_LIBRARY} - Kubuntu -) - -#################################### Locale #################################### - -set(unit_locale_SRCS localetest.cpp) - -kde4_add_unit_test(localetest - TESTNAME localetest - ${unit_locale_SRCS} -) - -target_link_libraries(localetest - ${KDE4_KDECORE_LIBS} - ${QT_QTTEST_LIBRARY} - Kubuntu -) +ecm_add_test(languagetest.cpp + LINK_LIBRARIES + Qt5::Test + Kubuntu) + +ecm_add_test(localetest.cpp + LINK_LIBRARIES + Qt5::Test + Kubuntu) diff -Nru libkubuntu-14.10ubuntu1/CMakeLists.txt libkubuntu-15.04ubuntu2/CMakeLists.txt --- libkubuntu-14.10ubuntu1/CMakeLists.txt 2014-07-15 00:17:45.000000000 +0000 +++ libkubuntu-15.04ubuntu2/CMakeLists.txt 2015-01-20 16:08:38.000000000 +0000 @@ -1,57 +1,59 @@ project(libkubuntu) -cmake_minimum_required(VERSION 2.8) -include(CMakePackageConfigHelpers) +cmake_minimum_required(VERSION 2.8.12) -find_package(KDE4 REQUIRED) -include(KDE4Defaults) +find_package(ECM 1.6.0 REQUIRED NO_MODULE) +set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -find_package(QApt REQUIRED) +include(ECMGenerateHeaders) +include(ECMGeneratePriFile) +include(ECMPackageConfigHelpers) +include(ECMPoQmTools) +include(ECMSetupVersion) +include(FeatureSummary) +include(KDEInstallDirs) +include(KDECMakeSettings) +include(KDECompilerSettings) -include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) -include_directories(${KDE4_INCLUDES}) -include_directories(${QAPT_INCLUDE_DIR}) -add_definitions(-std=c++11) - -set(KUBUNTU_VERSION_MAJOR 0) -set(KUBUNTU_VERSION_MINOR 0) -set(KUBUNTU_VERSION_PATCH 0) -set(KUBUNTU_VERSION ${KUBUNTU_VERSION_MAJOR}.${KUBUNTU_VERSION_MINOR}.${KUBUNTU_VERSION_PATCH}) +include(CMakePackageConfigHelpers) -# -------------------------- +set(REQUIRED_QT_VERSION 5.2.0) # Used in QAptConfig +find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets) -add_subdirectory(kconf_update) -add_subdirectory(src) +find_package(KF5 REQUIRED + COMPONENTS + I18n + KIO) + +find_package(QApt 3.0.0 REQUIRED) + +ecm_setup_version(1.0.0 VARIABLE_PREFIX KUBUNTU + SOVERSION 1 + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KubuntuConfigVersion.cmake" + COMPATIBILITY SameMajorVersion) # -------------------------- -if(KDE4_BUILD_TESTS) - add_subdirectory(autotests) -endif() +add_subdirectory(autotests) +add_subdirectory(src) # -------------------------- -set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/Kubuntu) +set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/Kubuntu") -configure_package_config_file(KubuntuConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/KubuntuConfig.cmake - INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} - PATH_VARS INCLUDE_INSTALL_DIR -) - -write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/KubuntuConfigVersion.cmake - VERSION ${KUBUNTU_VERSION} - COMPATIBILITY SameMajorVersion -) +ecm_configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/KubuntuConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KubuntuConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}) + +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KubuntuConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/KubuntuConfigVersion.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + COMPONENT Devel) -install(EXPORT LibKubuntuTargets +install(EXPORT KubuntuTargets DESTINATION ${CMAKECONFIG_INSTALL_DIR} NAMESPACE Kubuntu:: - FILE KubuntuTargets.cmake -) + FILE KubuntuTargets.cmake) -install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/KubuntuConfig.cmake -# ${CMAKE_CURRENT_BINARY_DIR}/KubuntuTargets.cmake - ${CMAKE_CURRENT_BINARY_DIR}/KubuntuConfigVersion.cmake - DESTINATION ${CMAKECONFIG_INSTALL_DIR} -) +feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -Nru libkubuntu-14.10ubuntu1/debian/changelog libkubuntu-15.04ubuntu2/debian/changelog --- libkubuntu-14.10ubuntu1/debian/changelog 2014-07-15 00:17:45.000000000 +0000 +++ libkubuntu-15.04ubuntu2/debian/changelog 2015-01-20 16:08:38.000000000 +0000 @@ -1,3 +1,17 @@ +libkubuntu (15.04ubuntu2) vivid; urgency=medium + + * Run tests in openbox + + -- Harald Sitter Tue, 20 Jan 2015 17:08:06 +0100 + +libkubuntu (15.04ubuntu1) vivid; urgency=medium + + * Port to KDE Frameworks 5 + * SO version is now 1 + * Drop now useless kconf updaters + + -- Harald Sitter Tue, 20 Jan 2015 13:45:21 +0100 + libkubuntu (14.10ubuntu1) utopic; urgency=medium * Fix comment typo diff -Nru libkubuntu-14.10ubuntu1/debian/control libkubuntu-15.04ubuntu2/debian/control --- libkubuntu-14.10ubuntu1/debian/control 2014-07-15 00:17:45.000000000 +0000 +++ libkubuntu-15.04ubuntu2/debian/control 2015-01-20 16:08:38.000000000 +0000 @@ -2,15 +2,22 @@ Section: libs Priority: extra Maintainer: Kubuntu Developers -XSBC-Original-Maintainer: Harald Sitter -Build-Depends: debhelper (>= 9), pkg-kde-tools, cmake, kdelibs5-dev, libqapt-dev, - language-pack-en +Build-Depends: cmake, + debhelper (>= 9), + extra-cmake-modules (>= 1.6.0), + kio-dev, + language-pack-en, + libkf5i18n-dev, + libqapt-dev (>= 3.0.0), + pkg-kde-tools, + xauth, + xvfb Standards-Version: 3.9.5 Vcs-Git: git://anongit.kde.org/scratch/sitter/libkubuntu.git -Package: libkubuntu0 +Package: libkubuntu1 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Description: library for Kubuntu platform integration This library bundles logic required for convenient Kubuntu specific integration of Qt and KDE software, such as localization handling and on-demand capability @@ -19,7 +26,7 @@ Package: libkubuntu-dev Section: libdevel Architecture: any -Depends: ${misc:Depends}, libkubuntu0 (= ${binary:Version}) +Depends: libkubuntu1 (= ${binary:Version}), ${misc:Depends} Description: library for Kubuntu platform integration - development files This library bundles logic required for convenient Kubuntu specific integration of Qt and KDE software, such as localization handling and on-demand capability @@ -30,8 +37,7 @@ Package: libkubuntu-dbg Section: debug Architecture: any -Recommends: libqt4-dbg, libqapt-dbg -Depends: ${misc:Depends}, libkubuntu0 (= ${binary:Version}) +Depends: libkubuntu1 (= ${binary:Version}), ${misc:Depends} Description: library for Kubuntu platform integration - debugging files This library bundles logic required for convenient Kubuntu specific integration of Qt and KDE software, such as localization handling and on-demand capability diff -Nru libkubuntu-14.10ubuntu1/debian/libkubuntu0.install libkubuntu-15.04ubuntu2/debian/libkubuntu0.install --- libkubuntu-14.10ubuntu1/debian/libkubuntu0.install 2014-07-15 00:17:45.000000000 +0000 +++ libkubuntu-15.04ubuntu2/debian/libkubuntu0.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -usr/lib/libKubuntu.so.0.* -usr/lib/libKubuntu.so.0 -usr/lib/kconf_update_bin/libkubuntu-force-setlocale-rewrite -usr/share/kde4/apps/kconf_update/libkubuntu-force-setlocale-rewrite-14-04.upd diff -Nru libkubuntu-14.10ubuntu1/debian/libkubuntu0.symbols libkubuntu-15.04ubuntu2/debian/libkubuntu0.symbols --- libkubuntu-14.10ubuntu1/debian/libkubuntu0.symbols 2014-07-15 00:17:45.000000000 +0000 +++ libkubuntu-15.04ubuntu2/debian/libkubuntu0.symbols 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -# SymbolsHelper-Confirmed: 14.10ubuntu1 amd64 -libKubuntu.so.0 libkubuntu0 #MINVER# - _ZN7Kubuntu11BusyOverlay11eventFilterEP7QObjectP6QEvent@Base 14.04ubuntu1 - _ZN7Kubuntu11BusyOverlay11qt_metacallEN11QMetaObject4CallEiPPv@Base 14.04ubuntu1 - _ZN7Kubuntu11BusyOverlay11qt_metacastEPKc@Base 14.04ubuntu1 - _ZN7Kubuntu11BusyOverlay11setProgressEi@Base 14.04ubuntu1 - _ZN7Kubuntu11BusyOverlay16staticMetaObjectE@Base 14.04ubuntu1 - _ZN7Kubuntu11BusyOverlay9throwAwayEv@Base 14.04ubuntu1 - _ZN7Kubuntu11BusyOverlayC1EP7QWidgetS2_@Base 14.04ubuntu1 - _ZN7Kubuntu11BusyOverlayC2EP7QWidgetS2_@Base 14.04ubuntu1 - _ZN7Kubuntu11BusyOverlayD0Ev@Base 14.04ubuntu1 - _ZN7Kubuntu11BusyOverlayD1Ev@Base 14.04ubuntu1 - _ZN7Kubuntu11BusyOverlayD2Ev@Base 14.04ubuntu1 - _ZN7Kubuntu18LanguageCollection11qt_metacallEN11QMetaObject4CallEiPPv@Base 14.04ubuntu1 - _ZN7Kubuntu18LanguageCollection11qt_metacastEPKc@Base 14.04ubuntu1 - _ZN7Kubuntu18LanguageCollection14updateProgressEi@Base 14.04ubuntu1 - _ZN7Kubuntu18LanguageCollection16staticMetaObjectE@Base 14.04ubuntu1 - _ZN7Kubuntu18LanguageCollection6updateEv@Base 14.04ubuntu1 - _ZN7Kubuntu18LanguageCollection7updatedEv@Base 14.04ubuntu1 - _ZN7Kubuntu18LanguageCollection9isUpdatedEv@Base 14.04ubuntu1 - _ZN7Kubuntu18LanguageCollection9languagesEv@Base 14.04ubuntu1 - _ZN7Kubuntu18LanguageCollectionC1EP7QObject@Base 14.04ubuntu1 - _ZN7Kubuntu18LanguageCollectionC2EP7QObject@Base 14.04ubuntu1 - _ZN7Kubuntu18LanguageCollectionD0Ev@Base 14.04ubuntu1 - _ZN7Kubuntu18LanguageCollectionD1Ev@Base 14.04ubuntu1 - _ZN7Kubuntu18LanguageCollectionD2Ev@Base 14.04ubuntu1 - _ZN7Kubuntu6Locale11writeToFileERK7QString@Base 14.04ubuntu1 - _ZN7Kubuntu6LocaleC1ERK5QListI7QStringERKS2_@Base 14.04ubuntu1 - _ZN7Kubuntu6LocaleC1ERK5QListIPNS_8LanguageEERK7QString@Base 14.04ubuntu1 - _ZN7Kubuntu6LocaleC1Ev@Base 14.04ubuntu1 - _ZN7Kubuntu6LocaleC2ERK5QListI7QStringERKS2_@Base 14.04ubuntu1 - _ZN7Kubuntu6LocaleC2ERK5QListIPNS_8LanguageEERK7QString@Base 14.04ubuntu1 - _ZN7Kubuntu6LocaleC2Ev@Base 14.04ubuntu1 - _ZN7Kubuntu6LocaleD1Ev@Base 14.04ubuntu1 - _ZN7Kubuntu6LocaleD2Ev@Base 14.04ubuntu1 - _ZN7Kubuntu8Language11qt_metacallEN11QMetaObject4CallEiPPv@Base 14.04ubuntu1 - _ZN7Kubuntu8Language11qt_metacastEPKc@Base 14.04ubuntu1 - _ZN7Kubuntu8Language15completeSupportEv@Base 14.04ubuntu1 - _ZN7Kubuntu8Language15supportCompleteEv@Base 14.04ubuntu1 - _ZN7Kubuntu8Language16staticMetaObjectE@Base 14.04ubuntu1 - _ZN7Kubuntu8Language17isSupportCompleteEv@Base 14.04ubuntu1 - _ZN7Kubuntu8Language23supportCompletionFailedEv@Base 14.04ubuntu1 - _ZN7Kubuntu8Language25supportCompletionProgressEi@Base 14.04ubuntu1 - _ZN7Kubuntu8Language27ubuntuPackageCodeForKdeCodeERK7QString@Base 14.04ubuntu1 - _ZN7Kubuntu8Language32kdeLanguageCodeForKdePackageCodeERK7QString@Base 14.04ubuntu1 - _ZN7Kubuntu8Language32kdePackageCodeForKdeLanguageCodeERK7QString@Base 14.04ubuntu1 - _ZN7Kubuntu8LanguageC1E7QStringP7QObject@Base 14.04ubuntu1 - _ZN7Kubuntu8LanguageC1Ev@Base 14.04ubuntu1 - _ZN7Kubuntu8LanguageC2E7QStringP7QObject@Base 14.04ubuntu1 - _ZN7Kubuntu8LanguageC2Ev@Base 14.04ubuntu1 - _ZN7Kubuntu8LanguageD0Ev@Base 14.04ubuntu1 - _ZN7Kubuntu8LanguageD1Ev@Base 14.04ubuntu1 - _ZN7Kubuntu8LanguageD2Ev@Base 14.04ubuntu1 - _ZNK7Kubuntu11BusyOverlay10metaObjectEv@Base 14.04ubuntu1 - _ZNK7Kubuntu18LanguageCollection10metaObjectEv@Base 14.04ubuntu1 - _ZNK7Kubuntu6Locale15systemLanguagesEv@Base 14.04ubuntu1 - _ZNK7Kubuntu6Locale18systemLocaleStringEv@Base 14.04ubuntu1 - _ZNK7Kubuntu6Locale21systemLanguagesStringEv@Base 14.04ubuntu1 - _ZNK7Kubuntu8Language10metaObjectEv@Base 14.04ubuntu1 - _ZNK7Kubuntu8Language14kdePackageCodeEv@Base 14.04ubuntu1 - _ZNK7Kubuntu8Language15kdeLanguageCodeEv@Base 14.04ubuntu1 - _ZNK7Kubuntu8Language15missingPackagesEv@Base 14.10ubuntu1 - _ZNK7Kubuntu8Language17ubuntuPackageCodeEv@Base 14.04ubuntu1 - _ZNK7Kubuntu8Language18systemLanguageCodeEv@Base 14.04ubuntu1 - _ZTIN7Kubuntu11BusyOverlayE@Base 14.04ubuntu1 - _ZTIN7Kubuntu18LanguageCollectionE@Base 14.04ubuntu1 - _ZTIN7Kubuntu8LanguageE@Base 14.04ubuntu1 - _ZTSN7Kubuntu11BusyOverlayE@Base 14.04ubuntu1 - _ZTSN7Kubuntu18LanguageCollectionE@Base 14.04ubuntu1 - _ZTSN7Kubuntu8LanguageE@Base 14.04ubuntu1 - _ZTVN7Kubuntu11BusyOverlayE@Base 14.04ubuntu1 - _ZTVN7Kubuntu18LanguageCollectionE@Base 14.04ubuntu1 - _ZTVN7Kubuntu8LanguageE@Base 14.04ubuntu1 - (c++)"non-virtual thunk to Kubuntu::BusyOverlay::~BusyOverlay()@Base" 14.04ubuntu1 diff -Nru libkubuntu-14.10ubuntu1/debian/libkubuntu1.install libkubuntu-15.04ubuntu2/debian/libkubuntu1.install --- libkubuntu-14.10ubuntu1/debian/libkubuntu1.install 1970-01-01 00:00:00.000000000 +0000 +++ libkubuntu-15.04ubuntu2/debian/libkubuntu1.install 2015-01-20 16:08:38.000000000 +0000 @@ -0,0 +1,2 @@ +usr/lib/*/libKubuntu.so.1 +usr/lib/*/libKubuntu.so.1.* diff -Nru libkubuntu-14.10ubuntu1/debian/libkubuntu1.symbols libkubuntu-15.04ubuntu2/debian/libkubuntu1.symbols --- libkubuntu-14.10ubuntu1/debian/libkubuntu1.symbols 1970-01-01 00:00:00.000000000 +0000 +++ libkubuntu-15.04ubuntu2/debian/libkubuntu1.symbols 2015-01-20 16:08:38.000000000 +0000 @@ -0,0 +1,74 @@ +# SymbolsHelper-Confirmed: 15.04ubuntu1 amd64 +libKubuntu.so.1 libkubuntu1 #MINVER# + _ZN7Kubuntu11BusyOverlay11eventFilterEP7QObjectP6QEvent@Base 15.04ubuntu1 + _ZN7Kubuntu11BusyOverlay11qt_metacallEN11QMetaObject4CallEiPPv@Base 15.04ubuntu1 + _ZN7Kubuntu11BusyOverlay11qt_metacastEPKc@Base 15.04ubuntu1 + _ZN7Kubuntu11BusyOverlay11setProgressEi@Base 15.04ubuntu1 + _ZN7Kubuntu11BusyOverlay16staticMetaObjectE@Base 15.04ubuntu1 + _ZN7Kubuntu11BusyOverlay9throwAwayEv@Base 15.04ubuntu1 + _ZN7Kubuntu11BusyOverlayC1EP7QWidgetS2_@Base 15.04ubuntu1 + _ZN7Kubuntu11BusyOverlayC2EP7QWidgetS2_@Base 15.04ubuntu1 + _ZN7Kubuntu11BusyOverlayD0Ev@Base 15.04ubuntu1 + _ZN7Kubuntu11BusyOverlayD1Ev@Base 15.04ubuntu1 + _ZN7Kubuntu11BusyOverlayD2Ev@Base 15.04ubuntu1 + _ZN7Kubuntu18LanguageCollection11qt_metacallEN11QMetaObject4CallEiPPv@Base 15.04ubuntu1 + _ZN7Kubuntu18LanguageCollection11qt_metacastEPKc@Base 15.04ubuntu1 + _ZN7Kubuntu18LanguageCollection14updateProgressEi@Base 15.04ubuntu1 + _ZN7Kubuntu18LanguageCollection16staticMetaObjectE@Base 15.04ubuntu1 + _ZN7Kubuntu18LanguageCollection6updateEv@Base 15.04ubuntu1 + _ZN7Kubuntu18LanguageCollection7updatedEv@Base 15.04ubuntu1 + _ZN7Kubuntu18LanguageCollection9isUpdatedEv@Base 15.04ubuntu1 + _ZN7Kubuntu18LanguageCollection9languagesEv@Base 15.04ubuntu1 + _ZN7Kubuntu18LanguageCollectionC1EP7QObject@Base 15.04ubuntu1 + _ZN7Kubuntu18LanguageCollectionC2EP7QObject@Base 15.04ubuntu1 + _ZN7Kubuntu18LanguageCollectionD0Ev@Base 15.04ubuntu1 + _ZN7Kubuntu18LanguageCollectionD1Ev@Base 15.04ubuntu1 + _ZN7Kubuntu18LanguageCollectionD2Ev@Base 15.04ubuntu1 + _ZN7Kubuntu6Locale11writeToFileERK7QString@Base 15.04ubuntu1 + _ZN7Kubuntu6LocaleC1ERK5QListI7QStringERKS2_@Base 15.04ubuntu1 + _ZN7Kubuntu6LocaleC1ERK5QListIPNS_8LanguageEERK7QString@Base 15.04ubuntu1 + _ZN7Kubuntu6LocaleC1Ev@Base 15.04ubuntu1 + _ZN7Kubuntu6LocaleC2ERK5QListI7QStringERKS2_@Base 15.04ubuntu1 + _ZN7Kubuntu6LocaleC2ERK5QListIPNS_8LanguageEERK7QString@Base 15.04ubuntu1 + _ZN7Kubuntu6LocaleC2Ev@Base 15.04ubuntu1 + _ZN7Kubuntu6LocaleD1Ev@Base 15.04ubuntu1 + _ZN7Kubuntu6LocaleD2Ev@Base 15.04ubuntu1 + _ZN7Kubuntu8Language11qt_metacallEN11QMetaObject4CallEiPPv@Base 15.04ubuntu1 + _ZN7Kubuntu8Language11qt_metacastEPKc@Base 15.04ubuntu1 + _ZN7Kubuntu8Language15completeSupportEv@Base 15.04ubuntu1 + _ZN7Kubuntu8Language15supportCompleteEv@Base 15.04ubuntu1 + _ZN7Kubuntu8Language16staticMetaObjectE@Base 15.04ubuntu1 + _ZN7Kubuntu8Language17isSupportCompleteEv@Base 15.04ubuntu1 + _ZN7Kubuntu8Language23supportCompletionFailedEv@Base 15.04ubuntu1 + _ZN7Kubuntu8Language25supportCompletionProgressEi@Base 15.04ubuntu1 + _ZN7Kubuntu8Language27ubuntuPackageCodeForKdeCodeERK7QString@Base 15.04ubuntu1 + _ZN7Kubuntu8Language32kdeLanguageCodeForKdePackageCodeERK7QString@Base 15.04ubuntu1 + _ZN7Kubuntu8Language32kdePackageCodeForKdeLanguageCodeERK7QString@Base 15.04ubuntu1 + _ZN7Kubuntu8LanguageC1E7QStringP7QObject@Base 15.04ubuntu1 + _ZN7Kubuntu8LanguageC1Ev@Base 15.04ubuntu1 + _ZN7Kubuntu8LanguageC2E7QStringP7QObject@Base 15.04ubuntu1 + _ZN7Kubuntu8LanguageC2Ev@Base 15.04ubuntu1 + _ZN7Kubuntu8LanguageD0Ev@Base 15.04ubuntu1 + _ZN7Kubuntu8LanguageD1Ev@Base 15.04ubuntu1 + _ZN7Kubuntu8LanguageD2Ev@Base 15.04ubuntu1 + _ZNK7Kubuntu11BusyOverlay10metaObjectEv@Base 15.04ubuntu1 + _ZNK7Kubuntu18LanguageCollection10metaObjectEv@Base 15.04ubuntu1 + _ZNK7Kubuntu6Locale15systemLanguagesEv@Base 15.04ubuntu1 + _ZNK7Kubuntu6Locale18systemLocaleStringEv@Base 15.04ubuntu1 + _ZNK7Kubuntu6Locale21systemLanguagesStringEv@Base 15.04ubuntu1 + _ZNK7Kubuntu8Language10metaObjectEv@Base 15.04ubuntu1 + _ZNK7Kubuntu8Language14kdePackageCodeEv@Base 15.04ubuntu1 + _ZNK7Kubuntu8Language15kdeLanguageCodeEv@Base 15.04ubuntu1 + _ZNK7Kubuntu8Language15missingPackagesEv@Base 15.04ubuntu1 + _ZNK7Kubuntu8Language17ubuntuPackageCodeEv@Base 15.04ubuntu1 + _ZNK7Kubuntu8Language18systemLanguageCodeEv@Base 15.04ubuntu1 + _ZTIN7Kubuntu11BusyOverlayE@Base 15.04ubuntu1 + _ZTIN7Kubuntu18LanguageCollectionE@Base 15.04ubuntu1 + _ZTIN7Kubuntu8LanguageE@Base 15.04ubuntu1 + _ZTSN7Kubuntu11BusyOverlayE@Base 15.04ubuntu1 + _ZTSN7Kubuntu18LanguageCollectionE@Base 15.04ubuntu1 + _ZTSN7Kubuntu8LanguageE@Base 15.04ubuntu1 + _ZTVN7Kubuntu11BusyOverlayE@Base 15.04ubuntu1 + _ZTVN7Kubuntu18LanguageCollectionE@Base 15.04ubuntu1 + _ZTVN7Kubuntu8LanguageE@Base 15.04ubuntu1 + (c++)"non-virtual thunk to Kubuntu::BusyOverlay::~BusyOverlay()@Base" 15.04ubuntu1 diff -Nru libkubuntu-14.10ubuntu1/debian/libkubuntu-dev.install libkubuntu-15.04ubuntu2/debian/libkubuntu-dev.install --- libkubuntu-14.10ubuntu1/debian/libkubuntu-dev.install 2014-07-15 00:17:45.000000000 +0000 +++ libkubuntu-15.04ubuntu2/debian/libkubuntu-dev.install 2015-01-20 16:08:38.000000000 +0000 @@ -1,3 +1,3 @@ -usr/lib/libKubuntu.so -usr/lib/cmake/* -usr/include/* +usr/include/Kubuntu/ +usr/lib/*/cmake/Kubuntu/ +usr/lib/*/libKubuntu.so diff -Nru libkubuntu-14.10ubuntu1/debian/rules libkubuntu-15.04ubuntu2/debian/rules --- libkubuntu-14.10ubuntu1/debian/rules 2014-07-15 00:17:45.000000000 +0000 +++ libkubuntu-15.04ubuntu2/debian/rules 2015-01-20 16:08:38.000000000 +0000 @@ -1,10 +1,13 @@ #!/usr/bin/make -f -include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk -include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk +include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk override_dh_auto_configure: $(overridden_command) -- -DKDE4_BUILD_TESTS=ON override_dh_strip: $(overridden_command) --dbg-package=libkubuntu-dbg + +override_dh_auto_test: + dh_installwm openbox \ + xvfb-run -a dh_auto_test diff -Nru libkubuntu-14.10ubuntu1/kconf_update/CMakeLists.txt libkubuntu-15.04ubuntu2/kconf_update/CMakeLists.txt --- libkubuntu-14.10ubuntu1/kconf_update/CMakeLists.txt 2014-07-15 00:17:45.000000000 +0000 +++ libkubuntu-15.04ubuntu2/kconf_update/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -kde4_add_executable(libkubuntu-force-setlocale-rewrite libkubuntu-force-setlocale-rewrite.cpp) -target_link_libraries(libkubuntu-force-setlocale-rewrite - ${KDE4_KDECORE_LIBS} - Kubuntu) -install(TARGETS libkubuntu-force-setlocale-rewrite DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin/) - -install(FILES libkubuntu-force-setlocale-rewrite-14-04.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR}) diff -Nru libkubuntu-14.10ubuntu1/kconf_update/libkubuntu-force-setlocale-rewrite-14-04.upd libkubuntu-15.04ubuntu2/kconf_update/libkubuntu-force-setlocale-rewrite-14-04.upd --- libkubuntu-14.10ubuntu1/kconf_update/libkubuntu-force-setlocale-rewrite-14-04.upd 2014-07-15 00:17:45.000000000 +0000 +++ libkubuntu-15.04ubuntu2/kconf_update/libkubuntu-force-setlocale-rewrite-14-04.upd 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -Id=libkubuntu-force-setlocale-rewrite-14.04 -Script=libkubuntu-force-setlocale-rewrite diff -Nru libkubuntu-14.10ubuntu1/kconf_update/libkubuntu-force-setlocale-rewrite.cpp libkubuntu-15.04ubuntu2/kconf_update/libkubuntu-force-setlocale-rewrite.cpp --- libkubuntu-14.10ubuntu1/kconf_update/libkubuntu-force-setlocale-rewrite.cpp 2014-07-15 00:17:45.000000000 +0000 +++ libkubuntu-15.04ubuntu2/kconf_update/libkubuntu-force-setlocale-rewrite.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -/* - Copyright (C) 2014 Harald Sitter - - 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 . -*/ - -#include -#include -#include - -#include -#include - -#include - -int main(int argc, char *argv[]) -{ - const QString envPath = KGlobal::dirs()->localkdedir() % QLatin1String("/env"); - const QString envFile = envPath % QLatin1String("/setlocale.sh"); - if (QFile::exists(envFile)) { - // Only rewrite the file iff it already exists, otherwise a user may have - // removed it and we restore it which doesn't seem particularly nice. - Kubuntu::Locale locale; - locale.writeToFile(envFile); - } - return 0; -} diff -Nru libkubuntu-14.10ubuntu1/src/busyoverlay.cpp libkubuntu-15.04ubuntu2/src/busyoverlay.cpp --- libkubuntu-14.10ubuntu1/src/busyoverlay.cpp 2014-07-15 00:17:45.000000000 +0000 +++ libkubuntu-15.04ubuntu2/src/busyoverlay.cpp 2015-01-20 16:08:38.000000000 +0000 @@ -123,5 +123,3 @@ } } // namespace Kubuntu - -#include "busyoverlay.moc" diff -Nru libkubuntu-14.10ubuntu1/src/busyoverlay.h libkubuntu-15.04ubuntu2/src/busyoverlay.h --- libkubuntu-14.10ubuntu1/src/busyoverlay.h 2014-07-15 00:17:45.000000000 +0000 +++ libkubuntu-15.04ubuntu2/src/busyoverlay.h 2015-01-20 16:08:38.000000000 +0000 @@ -23,7 +23,7 @@ #include "export.h" -#include +#include namespace Kubuntu { diff -Nru libkubuntu-14.10ubuntu1/src/CMakeLists.txt libkubuntu-15.04ubuntu2/src/CMakeLists.txt --- libkubuntu-14.10ubuntu1/src/CMakeLists.txt 2014-07-15 00:17:45.000000000 +0000 +++ libkubuntu-15.04ubuntu2/src/CMakeLists.txt 2015-01-20 16:08:38.000000000 +0000 @@ -1,4 +1,3 @@ - set(kubuntu_SRCS busyoverlay.cpp l10n_language.cpp @@ -10,22 +9,25 @@ l10n_languagecollection_p.h ) -kde4_add_ui_files(kubuntu_SRCS busyoverlay.ui) -kde4_add_library(Kubuntu SHARED ${kubuntu_SRCS}) +qt5_wrap_ui(kubuntu_SRCS busyoverlay.ui) + +add_library(Kubuntu SHARED ${kubuntu_SRCS}) target_include_directories(Kubuntu PUBLIC "$") +target_include_directories(Kubuntu INTERFACE "$" ) set_target_properties(Kubuntu - PROPERTIES VERSION ${KUBUNTU_VERSION} SOVERSION ${KUBUNTU_VERSION_MAJOR} -) + PROPERTIES + VERSION ${KUBUNTU_VERSION_STRING} + SOVERSION ${KUBUNTU_SOVERSION} + EXPORT_NAME Main) target_link_libraries(Kubuntu - ${QAPT_LIBRARY} - ${KDE4_KDECORE_LIBS} - ${KDE4_KIO_LIBS} # Needed for KProtocolManager/QApt proxy setup -) + KF5::I18n + KF5::KIOCore # Needed for KProtocolManager/QApt proxy setup + QApt::Main) -install(TARGETS Kubuntu EXPORT LibKubuntuTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS Kubuntu EXPORT KubuntuTargets LIBRARY DESTINATION ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES busyoverlay.h @@ -33,5 +35,5 @@ l10n_language.h l10n_languagecollection.h l10n_locale.h - DESTINATION ${INCLUDE_INSTALL_DIR}/Kubuntu COMPONENT Devel -) + DESTINATION ${INCLUDE_INSTALL_DIR}/Kubuntu + COMPONENT Devel) diff -Nru libkubuntu-14.10ubuntu1/src/l10n_languagecollection.cpp libkubuntu-15.04ubuntu2/src/l10n_languagecollection.cpp --- libkubuntu-14.10ubuntu1/src/l10n_languagecollection.cpp 2014-07-15 00:17:45.000000000 +0000 +++ libkubuntu-15.04ubuntu2/src/l10n_languagecollection.cpp 2015-01-20 16:08:38.000000000 +0000 @@ -114,5 +114,3 @@ } } // namespace Kubuntu - -#include "l10n_languagecollection.moc" diff -Nru libkubuntu-14.10ubuntu1/src/l10n_languagecollection_p.h libkubuntu-15.04ubuntu2/src/l10n_languagecollection_p.h --- libkubuntu-14.10ubuntu1/src/l10n_languagecollection_p.h 2014-07-15 00:17:45.000000000 +0000 +++ libkubuntu-15.04ubuntu2/src/l10n_languagecollection_p.h 2015-01-20 16:08:38.000000000 +0000 @@ -21,7 +21,7 @@ #ifndef L10N_LANGUAGECOLLECTION_P_H #define L10N_LANGUAGECOLLECTION_P_H -#include +#include namespace Kubuntu { diff -Nru libkubuntu-14.10ubuntu1/src/l10n_language.cpp libkubuntu-15.04ubuntu2/src/l10n_language.cpp --- libkubuntu-14.10ubuntu1/src/l10n_language.cpp 2014-07-15 00:17:45.000000000 +0000 +++ libkubuntu-15.04ubuntu2/src/l10n_language.cpp 2015-01-20 16:08:38.000000000 +0000 @@ -21,12 +21,12 @@ #include "l10n_language.h" #include -#include -#include +#include #include +#include -#include -#include +#include +#include #include #include @@ -378,4 +378,4 @@ } // namespace Kubuntu -#include "l10n_language.moc" +#include "moc_l10n_language.cpp"