Hello community, here is the log from the commit of package kcalc for openSUSE:Factory checked in at 2015-10-03 20:19:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcalc (Old) and /work/SRC/openSUSE:Factory/.kcalc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcalc" Changes: -------- --- /work/SRC/openSUSE:Factory/kcalc/kcalc.changes 2015-07-14 17:32:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kcalc.new/kcalc.changes 2015-10-03 20:19:09.000000000 +0200 @@ -1,0 +2,23 @@ +Sun Sep 13 19:01:45 UTC 2015 - [email protected] + +- Update to KDE Applications 15.08.1 + * KDE Applications 15.08.1 + * https://www.kde.org/announcements/announce-applications-15.08.1.php + + +------------------------------------------------------------------- +Wed Aug 19 19:42:51 UTC 2015 - [email protected] + +- Update to KDE Applications 15.08.0 + * KDE Applications 15.08.0 + * https://www.kde.org/announcements/announce-applications-15.08.0.php + +------------------------------------------------------------------- +Fri Aug 7 06:48:19 UTC 2015 - [email protected] + +- Update to KDE Applications 15.07.90 + * KDE Applications 15.08.0 RC1 + * https://www.kde.org/announcements/announce-applications-15.07.90.php + + +------------------------------------------------------------------- Old: ---- kcalc-15.04.3.tar.xz New: ---- kcalc-15.08.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcalc.spec ++++++ --- /var/tmp/diff_new_pack.P6l5O2/_old 2015-10-03 20:19:10.000000000 +0200 +++ /var/tmp/diff_new_pack.P6l5O2/_new 2015-10-03 20:19:10.000000000 +0200 @@ -34,7 +34,7 @@ License: GPL-2.0+ Group: Productivity/Scientific/Math Url: http://www.kde.org -Version: 15.04.3 +Version: 15.08.1 Release: 0 Source0: %{name}-%{version}.tar.xz Obsoletes: %{name}5 < %{version} ++++++ kcalc-15.04.3.tar.xz -> kcalc-15.08.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalc-15.04.3/CMakeLists.txt new/kcalc-15.08.1/CMakeLists.txt --- old/kcalc-15.04.3/CMakeLists.txt 2015-04-13 21:35:01.000000000 +0200 +++ new/kcalc-15.08.1/CMakeLists.txt 2015-09-10 00:47:31.000000000 +0200 @@ -1,9 +1,15 @@ project(kcalc) +# KDE Application Version, managed by release script +set (KDE_APPLICATIONS_VERSION_MAJOR "15") +set (KDE_APPLICATIONS_VERSION_MINOR "08") +set (KDE_APPLICATIONS_VERSION_MICRO "1") +set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") + cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) set (QT_MIN_VERSION "5.2.0") -find_package (ECM 1.3.0 REQUIRED NO_MODULE) +find_package (ECM 1.7.0 REQUIRED NO_MODULE) set (CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) add_definitions(-DTRANSLATION_DOMAIN="kcalc") @@ -13,6 +19,13 @@ include(KDECMakeSettings) include(ECMMarkAsTest) include(FeatureSummary) +include(ECMAddAppIcon) +include(ECMSetupVersion) + +## Generate header with version number +ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX KCALC + VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kcalc_version.h" +) find_package (Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core @@ -105,18 +118,18 @@ ${MPFR_LIBRARIES} ) -install(TARGETS kdeinit_kcalc ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS kdeinit_kcalc ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) target_link_libraries( kcalc kdeinit_kcalc ) -install(TARGETS kcalc ${INSTALL_TARGETS_DEFAULT_ARGS} ) +install(TARGETS kcalc ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) ########### install files ############### -install( PROGRAMS org.kde.kcalc.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) -install( FILES kcalc.kcfg DESTINATION ${KCFG_INSTALL_DIR}) -install( FILES kcalcui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kcalc) -install( FILES scienceconstants.xml DESTINATION ${DATA_INSTALL_DIR}/kcalc) -install( FILES kcalcrc.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update) +install( PROGRAMS org.kde.kcalc.desktop DESTINATION ${KDE_INSTALL_APPDIR}) +install( FILES kcalc.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR}) +install( FILES kcalcui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kcalc) +install( FILES scienceconstants.xml DESTINATION ${KDE_INSTALL_DATADIR}/kcalc) +install( FILES kcalcrc.upd DESTINATION ${KDE_INSTALL_DATADIR}/kconf_update) add_subdirectory(doc) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalc-15.04.3/doc/CMakeLists.txt new/kcalc-15.08.1/doc/CMakeLists.txt --- old/kcalc-15.04.3/doc/CMakeLists.txt 2015-04-13 21:35:01.000000000 +0200 +++ new/kcalc-15.08.1/doc/CMakeLists.txt 2015-09-10 00:47:31.000000000 +0200 @@ -1,4 +1,4 @@ ########### install files ############### # # -kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcalc) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcalc) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalc-15.04.3/kcalc.cpp new/kcalc-15.08.1/kcalc.cpp --- old/kcalc-15.04.3/kcalc.cpp 2015-04-13 21:35:01.000000000 +0200 +++ new/kcalc-15.08.1/kcalc.cpp 2015-09-10 00:47:31.000000000 +0200 @@ -10,7 +10,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as -published by the Free Software Foundation; either version 2 of +published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -22,6 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "kcalc_version.h" #include "kcalc.h" #include <clocale> @@ -50,11 +51,9 @@ #include "kcalc_settings.h" #include "kcalc_statusbar.h" #include "kcalcdisplay.h" -#include "version.h" namespace { const char description[] = I18N_NOOP("KDE Calculator"); -const char version[] = KCALCVERSION; const int maxprecision = 1000; } @@ -118,7 +117,7 @@ if (KCalcSettings::captionResult() == true) { connect(calc_display, &KCalcDisplay::changedText, this, &KCalculator::setWindowTitle); } - + calc_display->changeSettings(); setPrecision(); @@ -1549,7 +1548,7 @@ } else { pbShift->setChecked(false); - + // internally, we deal with C locale style numbers, we need to convert QString val = calc_display->text(); val.replace(KNumber::decimalSeparator(), QLatin1String(".")); @@ -2263,25 +2262,29 @@ //------------------------------------------------------------------------------ extern "C" Q_DECL_EXPORT int kdemain(int argc, char *argv[]) { - QApplication app(argc, argv); - + QApplication app(argc, argv); + + /** + * enable high dpi support + */ + app.setAttribute(Qt::AA_UseHighDpiPixmaps, true); + Kdelibs4ConfigMigrator migrate(QLatin1String("kcalc")); migrate.setConfigFiles(QStringList() << QLatin1String("kcalcrc")); migrate.setUiFiles(QStringList() << QLatin1String("kcalcui.rc")); migrate.migrate(); - KAboutData aboutData("kcalc", - i18n("KCalc"), - version, - i18n(description), - KAboutLicense::GPL, - i18n( - "Copyright © 2008-2013, Evan Teran\n" - "Copyright © 2000-2008, The KDE Team\n" - "Copyright © 2003-2005, Klaus Niederkr" "\xc3\xbc" "ger\n" - "Copyright © 1996-2000, Bernd Johannes Wuebben"), - QString(), - "http://utils.kde.org/projects/kcalc";); + KAboutData aboutData(QStringLiteral("kcalc"), + i18n("KCalc"), + QStringLiteral(KCALC_VERSION_STRING), + i18n(description), + KAboutLicense::GPL, + i18n("Copyright © 2008-2013, Evan Teran\n" + "Copyright © 2000-2008, The KDE Team\n" + "Copyright © 2003-2005, Klaus Niederkr" "\xc3\xbc" "ger\n" + "Copyright © 1996-2000, Bernd Johannes Wuebben"), + QStringLiteral(), + QStringLiteral("http://utils.kde.org/projects/kcalc";)); // Klaus Niederkrueger aboutData.addAuthor(i18n("Klaus Niederkr" "\xc3\xbc" "ger"), QString(), "[email protected]"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalc-15.04.3/version.h new/kcalc-15.08.1/version.h --- old/kcalc-15.04.3/version.h 2015-04-13 21:35:01.000000000 +0200 +++ new/kcalc-15.08.1/version.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -/* -Copyright (C) 2001 - 2013 Evan Teran - [email protected] - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef KCALCVERSION -#define KCALCVERSION "2.13" -#endif
