Bug#858812: unblock: ksysguard/4:5.8.6-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Dear release team,
KDE Plasma 5.8 is an LTS release that I consider fit to be updated in stretch.
This particular request is for ksysguard 5.8.6.
The fixes included in the ksysguard 5.8.6 release are:
translation updates
2 bug fixes:
+ Fix array allocation for non-continuous cpu numbers (e4c58c2) KDE#376537
+ Use unicode codepoint instead of UTF-8 literal (01a231b)
On the Debian side there are no changes worth mentioning.
The full debdiff is rather large (3.6M), mostly due to the automatic updates
in the po files, I'm publishing the full debdiff in:
https://freak.gnuservers.com.ar/~maxy/debian/ksysguard_5.8.6_unblock/
and I'm attaching a debdiff without the po changes (debdiff --exclude 'po')
instead. Also, I'm attaching the full upstream gitlog between the 5.8.4
version currently in stretch and the requested 5.8.6 version.
I haven't uploaded 4:5.8.6-1 to unstable, as I would like to receive a pre
approval before hand.
Please unblock package ksysguard
Happy hacking,
unblock ksysguard/4:5.8.6-1
-- System Information:
Debian Release: 9.0
APT prefers unstable-debug
APT policy: (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'testing'), (500, 'stable'), (50, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armhf
Kernel: Linux 4.9.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Init: systemd (via /run/systemd/system)
diff -Nru --exclude po ksysguard-5.8.4/CMakeLists.txt ksysguard-5.8.6/CMakeLists.txt
--- ksysguard-5.8.4/CMakeLists.txt 2016-11-22 11:16:01.000000000 +0100
+++ ksysguard-5.8.6/CMakeLists.txt 2017-02-21 13:04:13.000000000 +0100
@@ -1,5 +1,5 @@
project(ksysguard)
-set(PROJECT_VERSION "5.8.4")
+set(PROJECT_VERSION "5.8.6")
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
set(QT_MIN_VERSION "5.4.0")
diff -Nru --exclude po ksysguard-5.8.4/debian/changelog ksysguard-5.8.6/debian/changelog
--- ksysguard-5.8.4/debian/changelog 2016-11-23 18:36:34.000000000 +0100
+++ ksysguard-5.8.6/debian/changelog 2017-03-27 09:01:42.000000000 +0200
@@ -1,3 +1,15 @@
+ksysguard (4:5.8.6-1) unstable; urgency=medium
+
+ * New upstream release (5.8.6)
+
+ -- Maximiliano Curia <maxy@debian.org> Mon, 27 Mar 2017 09:01:42 +0200
+
+ksysguard (4:5.8.5-1) experimental; urgency=medium
+
+ * New upstream release (5.8.5).
+
+ -- Maximiliano Curia <maxy@debian.org> Fri, 30 Dec 2016 18:46:17 +0100
+
ksysguard (4:5.8.4-1) unstable; urgency=medium
* New upstream release (5.8.4)
diff -Nru --exclude po ksysguard-5.8.4/doc/CMakeLists.txt ksysguard-5.8.6/doc/CMakeLists.txt
--- ksysguard-5.8.4/doc/CMakeLists.txt 2016-11-22 11:16:01.000000000 +0100
+++ ksysguard-5.8.6/doc/CMakeLists.txt 2017-02-21 13:04:13.000000000 +0100
@@ -1,9 +1,9 @@
-add_subdirectory(en)
-add_subdirectory(de)
-add_subdirectory(it)
-add_subdirectory(sv)
-add_subdirectory(nl)
-add_subdirectory(pt_BR)
add_subdirectory(uk)
+add_subdirectory(pt_BR)
add_subdirectory(ca)
+add_subdirectory(sv)
+add_subdirectory(de)
add_subdirectory(et)
+add_subdirectory(nl)
+add_subdirectory(it)
+add_subdirectory(en)
diff -Nru --exclude po ksysguard-5.8.4/gui/ksysguard.cpp ksysguard-5.8.6/gui/ksysguard.cpp
--- ksysguard-5.8.4/gui/ksysguard.cpp 2016-11-22 11:15:40.000000000 +0100
+++ ksysguard-5.8.6/gui/ksysguard.cpp 2017-02-21 13:03:51.000000000 +0100
@@ -363,7 +363,7 @@
}
void TopLevel::updateProcessCount() {
- const QString s = i18np( "1 process" "\xc2\x9c" "1", "%1 processes" "\xc2\x9c" "%1", mLocalProcessController->processList()->visibleProcessesCount() );
+ const QString s = i18np( "1 process" "\u009C" "1", "%1 processes" "\u009C" "%1", mLocalProcessController->processList()->visibleProcessesCount() );
sbProcessCount->setText( s );
}
void TopLevel::changeEvent( QEvent * event )
diff -Nru --exclude po ksysguard-5.8.4/gui/ksysguard.knsrc ksysguard-5.8.6/gui/ksysguard.knsrc
--- ksysguard-5.8.4/gui/ksysguard.knsrc 2016-11-22 11:15:40.000000000 +0100
+++ ksysguard-5.8.6/gui/ksysguard.knsrc 2017-02-21 13:03:51.000000000 +0100
@@ -15,7 +15,7 @@
# How to name the files?
# doesn't use payload file name
-CustomName=true
+CustomName=true
# What to do after installation? Any number of the lines below
# unpack the downloaded archive
diff -Nru --exclude po ksysguard-5.8.4/gui/org.kde.ksysguard.desktop ksysguard-5.8.6/gui/org.kde.ksysguard.desktop
--- ksysguard-5.8.4/gui/org.kde.ksysguard.desktop 2016-11-22 11:15:40.000000000 +0100
+++ ksysguard-5.8.6/gui/org.kde.ksysguard.desktop 2017-02-21 13:03:51.000000000 +0100
@@ -179,6 +179,7 @@
Comment[et]=Töötavate protsesside ja süsteemi jõudluse jälgimine
Comment[fa]=پایشگر فرآیندهای در حال اجرا و کارایی سیستم
Comment[fi]=Tarkkaile käynnissä olevia prosesseja ja järjestelmän suorituskykyä
+Comment[fr]=Surveiller les processus en cours d'exécution et les performances du système
Comment[gl]=Vixiar os procesos en execución e o rendemento do sistema.
Comment[he]=מנטר תהליכים פיעילים וביצועי מערכת
Comment[ko]=실행 중인 프로세스와 시스템 성능 감시
diff -Nru --exclude po ksysguard-5.8.4/ksysguardd/Linux/stat.c ksysguard-5.8.6/ksysguardd/Linux/stat.c
--- ksysguard-5.8.4/ksysguardd/Linux/stat.c 2016-11-22 11:15:40.000000000 +0100
+++ ksysguard-5.8.6/ksysguardd/Linux/stat.c 2017-02-21 13:03:51.000000000 +0100
@@ -524,7 +524,8 @@
int id;
sscanf( tag + 3, "%d", &id );
- CPUCount++;
+ if ( CPUCount < id + 1 )
+ CPUCount = id + 1;
sprintf( cmdName, "cpu/cpu%d/user", id );
registerMonitor( cmdName, "float", printCPUxUser, printCPUxUserInfo, StatSM );
sprintf( cmdName, "cpu/cpu%d/nice", id );
commit 72f3080c84da8dcfc4919cd52cc75f09db7e493a
Author: Jonathan Riddell <jr@jriddell.org>
Date: Tue Feb 21 11:42:39 2017 +0000
Update version number for 5.8.6
GIT_SILENT
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f0b73ed..0e9237b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
project(ksysguard)
-set(PROJECT_VERSION "5.8.5")
+set(PROJECT_VERSION "5.8.6")
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
set(QT_MIN_VERSION "5.4.0")
commit e4c58c2f6ef74bad065f7327c19c02a3dac88883
Author: Christoph Feck <cfeck@kde.org>
Date: Sun Feb 19 05:15:52 2017 +0100
Fix array allocation for non-continuous cpu numbers
BUG: 376537
FIXED-IN: 5.8.6
Differential Revision: https://phabricator.kde.org/D4640
diff --git a/ksysguardd/Linux/stat.c b/ksysguardd/Linux/stat.c
index 534a4654..65d08b30 100644
--- a/ksysguardd/Linux/stat.c
+++ b/ksysguardd/Linux/stat.c
@@ -524,7 +524,8 @@ void initStat( struct SensorModul* sm ) {
int id;
sscanf( tag + 3, "%d", &id );
- CPUCount++;
+ if ( CPUCount < id + 1 )
+ CPUCount = id + 1;
sprintf( cmdName, "cpu/cpu%d/user", id );
registerMonitor( cmdName, "float", printCPUxUser, printCPUxUserInfo, StatSM );
sprintf( cmdName, "cpu/cpu%d/nice", id );
commit 01a231bbfcf70f1ff91c510dc62aee1369b2a021
Author: Albert Astals Cid <aacid@kde.org>
Date: Sun Jan 8 20:16:47 2017 +0100
Use unicode codepoint instead of UTF-8 literal
The gettext installed in the l10n server has a bug in which complains about invalid multibyte sequence with the utf-8 literal so workaround it
The bug has been reported but seems it may take a while until it gets fixed
diff --git a/gui/ksysguard.cpp b/gui/ksysguard.cpp
index 7c9b13cb..b40ca37b 100644
--- a/gui/ksysguard.cpp
+++ b/gui/ksysguard.cpp
@@ -363,7 +363,7 @@ void TopLevel::timerEvent( QTimerEvent* )
}
void TopLevel::updateProcessCount() {
- const QString s = i18np( "1 process" "\xc2\x9c" "1", "%1 processes" "\xc2\x9c" "%1", mLocalProcessController->processList()->visibleProcessesCount() );
+ const QString s = i18np( "1 process" "\u009C" "1", "%1 processes" "\u009C" "%1", mLocalProcessController->processList()->visibleProcessesCount() );
sbProcessCount->setText( s );
}
void TopLevel::changeEvent( QEvent * event )
commit ebd71ae8ad1d3c4fe6db49749e74b2064d0e0609
Author: Jonathan Riddell <jr@jriddell.org>
Date: Tue Dec 27 09:26:07 2016 +0000
Update version number for 5.8.5
GIT_SILENT
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75d29071..3f0b73ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
project(ksysguard)
-set(PROJECT_VERSION "5.8.4")
+set(PROJECT_VERSION "5.8.5")
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
set(QT_MIN_VERSION "5.4.0")
commit c6b4c5a9785856974289fda4aa46f418a7a0a79b
Author: l10n daemon script <scripty@kde.org>
Date: Tue Dec 20 15:08:13 2016 +0100
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
diff --git a/gui/ksysguard.knsrc b/gui/ksysguard.knsrc
index 5e8820d2..e881ddc4 100644
--- a/gui/ksysguard.knsrc
+++ b/gui/ksysguard.knsrc
@@ -15,7 +15,7 @@ TargetDir=ksysguard
# How to name the files?
# doesn't use payload file name
-CustomName=true
+CustomName=true
# What to do after installation? Any number of the lines below
# unpack the downloaded archive
commit 8b979c8ac2d62a352ddf41eccd563a915d1b7a19
Author: l10n daemon script <scripty@kde.org>
Date: Fri Nov 25 06:39:32 2016 +0100
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
diff --git a/gui/org.kde.ksysguard.desktop b/gui/org.kde.ksysguard.desktop
index b7ebc055..cc3d29f2 100755
--- a/gui/org.kde.ksysguard.desktop
+++ b/gui/org.kde.ksysguard.desktop
@@ -179,6 +179,7 @@ Comment[es]=Monitor de procesos en ejecución y del rendimiento del sistema
Comment[et]=Töötavate protsesside ja süsteemi jõudluse jälgimine
Comment[fa]=پایشگر فرآیندهای در حال اجرا و کارایی سیستم
Comment[fi]=Tarkkaile käynnissä olevia prosesseja ja järjestelmän suorituskykyä
+Comment[fr]=Surveiller les processus en cours d'exécution et les performances du système
Comment[gl]=Vixiar os procesos en execución e o rendemento do sistema.
Comment[he]=מנטר תהליכים פיעילים וביצועי מערכת
Comment[ko]=실행 중인 프로세스와 시스템 성능 감시
Reply to: