Hello community, here is the log from the commit of package knemo for openSUSE:Factory checked in at 2012-11-12 11:42:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/knemo (Old) and /work/SRC/openSUSE:Factory/.knemo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "knemo", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/knemo/knemo.changes 2012-11-08 07:45:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.knemo.new/knemo.changes 2012-11-12 11:42:32.000000000 +0100 @@ -1,0 +2,9 @@ +Fri Nov 9 19:51:04 UTC 2012 - [email protected] + +- Update to version 0.7.5 + * Fix building on ARM architecture + * Version 0.7.4 failed to create tables in new statistics databases. Fix that. + * Possibly fix a plotter crash +- Remove knemo-arm.patch, because fixed upstream + +------------------------------------------------------------------- Old: ---- 12956-knemo-0.7.4.tar.bz2 knemo-arm.patch New: ---- 12956-knemo-0.7.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ knemo.spec ++++++ --- /var/tmp/diff_new_pack.iBVnVJ/_old 2012-11-12 11:42:33.000000000 +0100 +++ /var/tmp/diff_new_pack.iBVnVJ/_new 2012-11-12 11:42:33.000000000 +0100 @@ -19,15 +19,13 @@ Name: knemo -Version: 0.7.4 +Version: 0.7.5 Release: 0 Summary: The KDE Network Monitor License: GPL-2.0+ Group: System/GUI/KDE Url: http://kde-apps.org/content/show.php/KNemo?content=12956 Source: http://kde-apps.org/CONTENT/content-files/12956-knemo-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM knemo-arm.patch -Patch0: knemo-arm.patch BuildRequires: kdebase4-workspace-devel BuildRequires: libiw-devel BuildRequires: libkde4-devel @@ -44,7 +42,6 @@ %prep %setup -q -%patch0 -p1 %build %cmake_kde4 -d build ++++++ 12956-knemo-0.7.4.tar.bz2 -> 12956-knemo-0.7.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knemo-0.7.4/CMakeLists.txt new/knemo-0.7.5/CMakeLists.txt --- old/knemo-0.7.4/CMakeLists.txt 2012-10-30 15:48:12.000000000 +0100 +++ new/knemo-0.7.5/CMakeLists.txt 2012-11-09 04:28:26.000000000 +0100 @@ -1,6 +1,6 @@ project( knemo ) -set( KNEMO_VERSION 0.7.4 ) +set( KNEMO_VERSION 0.7.5 ) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knemo-0.7.4/ChangeLog new/knemo-0.7.5/ChangeLog --- old/knemo-0.7.4/ChangeLog 2012-10-30 15:45:31.000000000 +0100 +++ new/knemo-0.7.5/ChangeLog 2012-11-09 04:26:02.000000000 +0100 @@ -1,3 +1,9 @@ +Version 0.7.5 + * Fix building on ARM architecture + * Version 0.7.4 failed to create tables in new statistics databases. Fix + that. + * Possibly fix a plotter crash + Version 0.7.4 * Fix bugs in the BSD backend, thanks to Alberto Villa - KDE bug #301546: Wrong traffic reported on FreeBSD diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knemo-0.7.4/po/es/knemo.po new/knemo-0.7.5/po/es/knemo.po --- old/knemo-0.7.4/po/es/knemo.po 2012-10-30 15:46:06.000000000 +0100 +++ new/knemo-0.7.5/po/es/knemo.po 2012-11-09 04:26:30.000000000 +0100 @@ -6,28 +6,29 @@ # Raul Moratalla <[email protected]>, 2004. # Pedro Jurado Maqueda <[email protected]>, 2004. # Enrique Matias Sanchez (aka Quique) <[email protected]>, 2006, 2007, 2009, 2010. +# Raul Gonzalez <[email protected]>, 2012. msgid "" msgstr "" "Project-Id-Version: knemo\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2012-10-19 03:45+0200\n" -"PO-Revision-Date: 2010-10-01 11:41+0200\n" -"Last-Translator: Enrique Matias Sanchez (aka Quique) <[email protected]>\n" +"PO-Revision-Date: 2012-10-31 13:56+0100\n" +"Last-Translator: Raul Gonzalez <[email protected]>\n" "Language-Team: Spanish <[email protected]>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Enrique Matías Sánchez (Quique)" +msgstr "Raúl González,Enrique Matías Sánchez (Quique)" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "[email protected]" +msgstr "[email protected],[email protected]" #: backends/bsdbackend.cpp:209 msgid " anycast" @@ -850,6 +851,10 @@ "\n" "Please upgrade to a more recent KNemo release." msgstr "" +"La base de datos de estadísticas para la interfaz «%1» es incompatible con " +"esta versión de KNemo.\n" +"\n" +"Por favor actualícese a una versión más reciente de KNemo." #~ msgid "Automatic range detection" #~ msgstr "Detección automática del intervalo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knemo-0.7.4/po/hu/knemo.po new/knemo-0.7.5/po/hu/knemo.po --- old/knemo-0.7.4/po/hu/knemo.po 2012-10-30 15:46:30.000000000 +0100 +++ new/knemo-0.7.5/po/hu/knemo.po 2012-11-09 04:26:49.000000000 +0100 @@ -5,19 +5,20 @@ # Charles Barcza <[email protected]>, 2006. # Csaba Zakarias <[email protected]>, 2010. # Kristóf Kiszel <[email protected]>, 2011. +# Balázs Úr <[email protected]>, 2012. msgid "" msgstr "" "Project-Id-Version: knemod\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2012-10-19 03:45+0200\n" -"PO-Revision-Date: 2011-12-23 14:37+0100\n" -"Last-Translator: Kristóf Kiszel <[email protected]>\n" +"PO-Revision-Date: 2012-11-02 09:49+0100\n" +"Last-Translator: Balázs Úr <[email protected]>\n" "Language-Team: Hungarian <[email protected]>\n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.5\n" "X-Poedit-Language: Hungarian\n" "X-Poedit-Country: HUNGARY\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -851,6 +852,10 @@ "\n" "Please upgrade to a more recent KNemo release." msgstr "" +"A(z) „%1” felület statisztika adatbázisa nem kompatibilis a KNemo ezen " +"verziójával.\n" +"\n" +"Kérjük frissítsen a legutóbbi KNemo kiadásra." #~ msgid "Automatic range detection" #~ msgstr "Automaikus tartomány érzékelés" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knemo-0.7.4/src/kcm/configdialog.cpp new/knemo-0.7.5/src/kcm/configdialog.cpp --- old/knemo-0.7.4/src/kcm/configdialog.cpp 2012-10-30 15:45:26.000000000 +0100 +++ new/knemo-0.7.5/src/kcm/configdialog.cpp 2012-11-09 04:26:01.000000000 +0100 @@ -1041,12 +1041,12 @@ ifaces.removeAll( "lo" ); ifaces.removeAll( "lo0" ); + const KColorScheme scheme(QPalette::Active, KColorScheme::View); foreach ( QString ifname, ifaces ) { if ( mSettingsMap.contains( ifname ) ) continue; InterfaceSettings* settings = new InterfaceSettings(); - KColorScheme scheme(QPalette::Active, KColorScheme::View); settings->colorDisabled = scheme.foreground( KColorScheme::InactiveText ).color(); settings->colorUnavailable = scheme.foreground( KColorScheme::InactiveText ).color(); settings->colorBackground = scheme.foreground( KColorScheme::InactiveText ).color(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knemo-0.7.4/src/knemod/interfaceplotterdialog.cpp new/knemo-0.7.5/src/knemod/interfaceplotterdialog.cpp --- old/knemo-0.7.4/src/knemod/interfaceplotterdialog.cpp 2012-10-30 15:45:31.000000000 +0100 +++ new/knemo-0.7.5/src/knemod/interfaceplotterdialog.cpp 2012-11-09 04:26:02.000000000 +0100 @@ -237,6 +237,8 @@ void InterfacePlotterDialog::setPlotterUnits() { + // Prevent this being called recursively + disconnect( mPlotter, SIGNAL(axisScaleChanged()), this, SLOT(setPlotterUnits()) ); qreal value = mPlotter->currentMaximumRangeValue(); int units = 0; @@ -257,6 +259,8 @@ mPlotter->setUnit( mBitUnits[units] ); else mPlotter->setUnit( mByteUnits[units] ); + // reconnect + connect( mPlotter, SIGNAL(axisScaleChanged()), this, SLOT(setPlotterUnits()) ); } void InterfacePlotterDialog::useBitrate( bool useBits ) @@ -289,7 +293,7 @@ void InterfacePlotterDialog::updatePlotter( const double incomingBytes, const double outgoingBytes ) { - QList<double> trafficList; + QList<qreal> trafficList; if ( mOutgoingVisible ) trafficList.append( outgoingBytes ); if ( mIncomingVisible ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knemo-0.7.4/src/knemod/storage/sqlstorage.cpp new/knemo-0.7.5/src/knemod/storage/sqlstorage.cpp --- old/knemo-0.7.4/src/knemod/storage/sqlstorage.cpp 2012-10-30 15:45:29.000000000 +0100 +++ new/knemo-0.7.5/src/knemod/storage/sqlstorage.cpp 2012-11-09 04:26:01.000000000 +0100 @@ -44,7 +44,15 @@ mTypeMap.insert( KNemoStats::AllTraffic, "" ); mTypeMap.insert( KNemoStats::OffpeakTraffic, "_offpeak" ); - migrateDb(); + if ( dbExists() && open() ) + { + // KNemo 0.7.4 didn't create tables on a new db. This lets us fix it + // without forcing the user to intervene. + if ( db.tables().isEmpty() ) + createDb(); + else + migrateDb(); + } } SqlStorage::~SqlStorage() -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
