diff -Nru knetwalk-15.12.3/autotests/abstractgridtest.cpp knetwalk-16.04.3/autotests/abstractgridtest.cpp --- knetwalk-15.12.3/autotests/abstractgridtest.cpp 2016-01-05 22:29:04.000000000 +0000 +++ knetwalk-16.04.3/autotests/abstractgridtest.cpp 2016-03-10 10:22:08.000000000 +0000 @@ -32,7 +32,7 @@ void AbstractGridTest::testCreateGrid() { - srand(1370714025); + qsrand(1370714025); for (int i = 0; i < 25; ++i) { qDebug() << "Iteration" << i; AbstractGridTester t; diff -Nru knetwalk-15.12.3/CMakeLists.txt knetwalk-16.04.3/CMakeLists.txt --- knetwalk-15.12.3/CMakeLists.txt 2016-01-05 22:29:04.000000000 +0000 +++ knetwalk-16.04.3/CMakeLists.txt 2016-03-10 10:22:08.000000000 +0000 @@ -1,26 +1,25 @@ project(knetwalk) -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) +set (QT_MIN_VERSION "5.3.0") +set (KF5_MIN_VERSION "5.15.0") find_package(ECM 1.7.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg) -find_package(KF5 REQUIRED COMPONENTS - CoreAddons - Config - WidgetsAddons - DBusAddons - I18n - GuiAddons - ConfigWidgets - ItemViews - IconThemes - XmlGui - KIO - NotifyConfig - DocTools - TextWidgets - ) +find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick) +find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS + Config + ConfigWidgets + CoreAddons + Crash + DBusAddons + DocTools + I18n + TextWidgets + WidgetsAddons + XmlGui +) + find_package(KF5KDEGames 4.9.0 REQUIRED) find_package(Qt5Test ${QT_MIN_VERSION} QUIET) @@ -40,15 +39,22 @@ include(KDECMakeSettings) include(ECMAddTests) -add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) -add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII") - +add_definitions( + -DQT_USE_FAST_CONCATENATION + -DQT_USE_FAST_OPERATOR_PLUS + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY + -DQT_NO_URL_CAST_FROM_STRING + -DQT_USE_QSTRINGBUILDER +) -add_subdirectory(src) -add_subdirectory(themes) +add_subdirectory(src) +add_subdirectory(themes) add_subdirectory(doc) if(BUILD_TESTING) add_subdirectory(autotests) endif() + feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -Nru knetwalk-15.12.3/debian/changelog knetwalk-16.04.3/debian/changelog --- knetwalk-15.12.3/debian/changelog 2016-04-14 22:37:18.000000000 +0000 +++ knetwalk-16.04.3/debian/changelog 2016-09-30 04:31:48.000000000 +0000 @@ -1,3 +1,21 @@ +knetwalk (4:16.04.3-0ubuntu1) yakkety; urgency=medium + + [ Scarlett Clark ] + * New upstream release + + [ Philip Muškovac ] + * Update the Vcs URLs now that the repositories are hosted on + Launchpad + + [ Scarlett Clark ] + * New upstream bugfix release + + [ Clive Johnston ] + * New upstream release (16.04.2) + * New upstream release (16.04.3) + + -- José Manuel Santamaría Lema Fri, 30 Sep 2016 06:31:48 +0200 + knetwalk (4:15.12.3-0ubuntu1) xenial; urgency=medium * New upstream bugfix release diff -Nru knetwalk-15.12.3/debian/control knetwalk-16.04.3/debian/control --- knetwalk-15.12.3/debian/control 2016-04-14 22:37:18.000000000 +0000 +++ knetwalk-16.04.3/debian/control 2016-09-30 04:31:48.000000000 +0000 @@ -12,31 +12,31 @@ Maximiliano Curia Build-Depends: cmake (>= 2.8.12~), debhelper (>= 9), - extra-cmake-modules (>= 1.7.0~), - kdoctools-dev, - kio-dev, - libkf5config-dev, - libkf5configwidgets-dev, - libkf5coreaddons-dev, - libkf5dbusaddons-dev, - libkf5guiaddons-dev, - libkf5i18n-dev, - libkf5iconthemes-dev, - libkf5itemviews-dev, - libkf5kdegames-dev (>= 4.9.0~), - libkf5kdelibs4support-dev, - libkf5notifyconfig-dev, - libkf5textwidgets-dev, - libkf5widgetsaddons-dev, - libkf5xmlgui-dev, - libqt5svg5-dev (>= 5.4), + extra-cmake-modules (>= 5.24.0~), + kdoctools-dev (>= 5.24.0~), + kio-dev (>= 5.24.0~), + libkf5config-dev (>= 5.24.0~), + libkf5configwidgets-dev (>= 5.24.0~), + libkf5coreaddons-dev (>= 5.24.0~), + libkf5dbusaddons-dev (>= 5.24.0~), + libkf5guiaddons-dev (>= 5.24.0~), + libkf5i18n-dev (>= 5.24.0~), + libkf5iconthemes-dev (>= 5.24.0~), + libkf5itemviews-dev (>= 5.24.0~), + libkf5kdegames-dev (>= 4:16.04.3~), + libkf5kdelibs4support-dev (>= 5.24.0~), + libkf5notifyconfig-dev (>= 5.24.0~), + libkf5textwidgets-dev (>= 5.24.0~), + libkf5widgetsaddons-dev (>= 5.24.0~), + libkf5xmlgui-dev (>= 5.24.0~), + libqt5svg5-dev (>= 5.6.1~), pkg-kde-tools (>> 0.15.15), - qtbase5-dev (>= 5.4), - qtdeclarative5-dev (>= 5.4) + qtbase5-dev (>= 5.6.1~), + qtdeclarative5-dev (>= 5.6.1~) Standards-Version: 3.9.6 Homepage: http://games.kde.org/ -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/knetwalk.git -Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/knetwalk.git +Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/knetwalk +Vcs-Git: git://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/knetwalk Package: knetwalk Architecture: any diff -Nru knetwalk-15.12.3/src/abstractgrid.cpp knetwalk-16.04.3/src/abstractgrid.cpp --- knetwalk-15.12.3/src/abstractgrid.cpp 2016-01-05 22:29:04.000000000 +0000 +++ knetwalk-16.04.3/src/abstractgrid.cpp 2016-03-10 10:22:08.000000000 +0000 @@ -18,7 +18,6 @@ #include "abstractgrid.h" -#include // rand() #include #include #include @@ -168,7 +167,7 @@ while(m_minimumMoves < shuffleLimit) { // selecting a random index - int index = rand() % notShuffledCells.count(); + int index = qrand() % notShuffledCells.count(); int cellNo = notShuffledCells[index]; // removing the selected index so that it must not be used again notShuffledCells.removeAt(index); @@ -187,10 +186,10 @@ } // for every other case rotate 1..3 times else { - int rotation = rand() % 3 + 1; // 1..3 + int rotation = qrand() % 3 + 1; // 1..3 // cant rotate twice when m_minimumMoves == shuffleLimit - 1 if (m_minimumMoves == shuffleLimit - 1 && rotation == 2){ - rotation = (rand() % 2)? 1 : 3; // 1 or 3 + rotation = (qrand() % 2)? 1 : 3; // 1 or 3 } m_minimumMoves += (rotation == 3) ? 1 : rotation; while(rotation--) { @@ -229,7 +228,7 @@ void AbstractGrid::createGrid() { // add a random server - server_index = rand() % (cellCount()); + server_index = qrand() % (cellCount()); // number of cells that aren't free int notFreeCells = 0; @@ -244,15 +243,15 @@ QList list; list.append(server_index); - if (rand() % 2) addRandomCable(list); + if (qrand() % 2) addRandomCable(list); // add some random cables... // the list empties if there aren't many free cells left // (because of addRandomCable() not doing anything) while (!list.isEmpty()) { - if (rand() % 2) { + if (qrand() % 2) { addRandomCable(list); - if (rand() % 2) addRandomCable(list); + if (qrand() % 2) addRandomCable(list); list.erase(list.begin()); } else { @@ -300,7 +299,7 @@ QMap::ConstIterator it = freeCells.constBegin(); // move the iterator to a random direction connecting to a free cell - for (int i = rand() % freeCells.count(); i > 0; --i) ++it; + for (int i = qrand() % freeCells.count(); i > 0; --i) ++it; // add the cable in the direction of cell Directions newCables = Directions(m_cells[cell]->cables() | it.key()); diff -Nru knetwalk-15.12.3/src/CMakeLists.txt knetwalk-16.04.3/src/CMakeLists.txt --- knetwalk-15.12.3/src/CMakeLists.txt 2016-01-05 22:29:04.000000000 +0000 +++ knetwalk-16.04.3/src/CMakeLists.txt 2016-03-10 10:22:08.000000000 +0000 @@ -1,35 +1,38 @@ -add_subdirectory( pics ) -add_subdirectory( sounds ) +add_subdirectory(pics) +add_subdirectory(sounds) ########### next target ############### set(knetwalk_SRCS - main.cpp - gameview.cpp - mainwindow.cpp - abstractgrid.cpp) + main.cpp + gameview.cpp + mainwindow.cpp + abstractgrid.cpp +) -ki18n_wrap_ui( knetwalk_SRCS general.ui customgame.ui ) +ki18n_wrap_ui( knetwalk_SRCS general.ui customgame.ui) -kconfig_add_kcfg_files(knetwalk_SRCS settings.kcfgc ) +kconfig_add_kcfg_files(knetwalk_SRCS settings.kcfgc) file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/*-apps-knetwalk.png") ecm_add_app_icon(knetwalk_SRCS ICONS ${ICONS_SRCS}) add_executable(knetwalk ${knetwalk_SRCS}) -target_link_libraries(knetwalk KF5::XmlGui KF5::TextWidgets KF5KDEGames KF5::DBusAddons) +target_link_libraries(knetwalk + KF5::Crash + KF5::DBusAddons + KF5::TextWidgets + KF5::XmlGui + KF5KDEGames +) -install(TARGETS knetwalk ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) +install(TARGETS knetwalk ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### -install( FILES knetwalkui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/knetwalk ) -install( DIRECTORY qml DESTINATION ${KDE_INSTALL_DATADIR}/knetwalk) -install( PROGRAMS org.kde.knetwalk.desktop DESTINATION ${KDE_INSTALL_APPDIR} ) - - - - +install(FILES knetwalkui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/knetwalk) +install(DIRECTORY qml DESTINATION ${KDE_INSTALL_DATADIR}/knetwalk) +install(PROGRAMS org.kde.knetwalk.desktop DESTINATION ${KDE_INSTALL_APPDIR}) diff -Nru knetwalk-15.12.3/src/main.cpp knetwalk-16.04.3/src/main.cpp --- knetwalk-15.12.3/src/main.cpp 2016-01-05 22:29:04.000000000 +0000 +++ knetwalk-16.04.3/src/main.cpp 2016-03-10 10:22:08.000000000 +0000 @@ -17,6 +17,7 @@ */ #include +#include #include #include #include @@ -74,6 +75,7 @@ about.setProductName(QByteArray("knetwalk")); KAboutData::setApplicationData(about); + KCrash::initialize(); KDBusService service; app.setApplicationDisplayName(about.displayName()); diff -Nru knetwalk-15.12.3/src/mainwindow.cpp knetwalk-16.04.3/src/mainwindow.cpp --- knetwalk-15.12.3/src/mainwindow.cpp 2016-01-05 22:29:04.000000000 +0000 +++ knetwalk-16.04.3/src/mainwindow.cpp 2016-03-10 10:22:08.000000000 +0000 @@ -107,7 +107,7 @@ setAutoSaveSettings(); - srand(time(0)); + qsrand(time(0)); m_gameClock = new KGameClock(this, KGameClock::MinSecOnly); connect(m_gameClock, &KGameClock::timeChanged, this, &MainWindow::updateStatusBar);