rev 4325 - in kde-extras/knemo/trunk/debian: . patches

[Achim Bohnet]

Author: ach-guest
Date: 2006-08-14 13:09:16 +0000 (Mon, 14 Aug 2006)
New Revision: 4325

Added:
   kde-extras/knemo/trunk/debian/patches/11_revert_load_on_demand.diff
   kde-extras/knemo/trunk/debian/patches/12_kdesvn572745.diff
Modified:
   kde-extras/knemo/trunk/debian/changelog
Log:
knemo:
  * 0.4.4 new upstream release
  * added debian/patches/12_kdesvn572745.diff: Pull from KDE SVN:
    Fixed counting of transmitted data
  * added debian/patches/11_revert_load_on_demand.diff:
    With load on demand, knemo does not start on login.
    So reverting to 0.4.2 behaviour.  This patch
    reverts Dirk Muellers change from 6-Aug-2006
    trunk/extragear/network/knemo/knemod/knemod.desktop #570450:570451
    See also: http://bugs.kde.org/show_bug.cgi?id=132218

Modified: kde-extras/knemo/trunk/debian/changelog
===================================================================
--- kde-extras/knemo/trunk/debian/changelog	2006-08-14 11:32:15 UTC (rev 4324)
+++ kde-extras/knemo/trunk/debian/changelog	2006-08-14 13:09:16 UTC (rev 4325)
@@ -1,9 +1,19 @@
-knemo (0.4.3-2) UNRELEASED; urgency=low
+knemo (0.4.4-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * new upstream release
 
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun,  6 Aug 2006 22:44:25 +0100
+  [ Achim Bohnet ]
+  * added debian/patches/12_kdesvn572745.diff: Pull from KDE SVN:
+    Fixed counting of transmitted data
+  * added debian/patches/11_revert_load_on_demand.diff:
+    With load on demand, knemo does not start on login.
+    So reverting to 0.4.2 behaviour.  This patch
+    reverts Dirk Muellers change from 6-Aug-2006
+    trunk/extragear/network/knemo/knemod/knemod.desktop #570450:570451
+    See also: http://bugs.kde.org/show_bug.cgi?id=132218
 
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Mon, 14 Aug 2006 15:05:36 +0200
+
 knemo (0.4.3-1) unstable; urgency=low
 
   [ Mark Purcell ]

Added: kde-extras/knemo/trunk/debian/patches/11_revert_load_on_demand.diff
===================================================================
--- kde-extras/knemo/trunk/debian/patches/11_revert_load_on_demand.diff	2006-08-14 11:32:15 UTC (rev 4324)
+++ kde-extras/knemo/trunk/debian/patches/11_revert_load_on_demand.diff	2006-08-14 13:09:16 UTC (rev 4325)
@@ -0,0 +1,32 @@
+# With load on demand, knemo does not start on login.
+# One has to open KC's knemo dialog, to have it loaded
+# by demand.  So reverting to 0.4.2 behaviour -- Achim
+--- knemo-0.4.4/src/knemod/knemod.desktop	2006-08-09 00:13:44.000000000 +0200
++++ knemo-0.4.2/src/knemod/knemod.desktop	2006-06-13 22:37:04.000000000 +0200
+@@ -5,7 +5,8 @@
+ X-KDE-ModuleType=Library
+ X-KDE-Library=knemod
+ X-KDE-FactoryName=knemod
+-X-KDE-Kded-load-on-demand=true
++X-KDE-Kded-autoload=true
++X-KDE-Kded-load-on-demand=false
+ Name=KNemo
+ Name[sv]=Knemo
+ Name[xx]=xxKNemoxx
+@@ -14,7 +15,6 @@
+ Comment[br]=Eveshaer ar rouedad evit KDE
+ Comment[cs]=KDE monitor sítě
+ Comment[da]=KDE's netværksovervågning
+-Comment[de]=KDE-Netzwerkmonitor
+ Comment[el]=Επίβλεψη δικτύου του KDE
+ Comment[es]=Monitor de red de KDE
+ Comment[et]=KDE võrgumonitor
+@@ -26,7 +26,7 @@
+ Comment[pa]=KDE ਨੈਟਵਰਕ ਨਿਗਰਾਨ
+ Comment[pl]=Monitor sieci dla KDE
+ Comment[pt]=Monitor da Rede do KDE
+-Comment[pt_BR]=Monitor de Rede do KDE
++Comment[pt_BR]=Monitor da Rede do KDE
+ Comment[ru]=Сетевой монитор KDE
+ Comment[sr]=Надгледање мреже за KDE
+ Comment[sr at Latn]=Nadgledanje mreže za KDE

Added: kde-extras/knemo/trunk/debian/patches/12_kdesvn572745.diff
===================================================================
--- kde-extras/knemo/trunk/debian/patches/12_kdesvn572745.diff	2006-08-14 11:32:15 UTC (rev 4324)
+++ kde-extras/knemo/trunk/debian/patches/12_kdesvn572745.diff	2006-08-14 13:09:16 UTC (rev 4325)
@@ -0,0 +1,14 @@
+# svn diff -r572744:572745 trunk/extragear/network/knemo/knemod/backends/sysbackend.cpp
+Index: sysbackend.cpp
+===================================================================
+--- ./src/knemod/backends/sysbackend.cpp	(revision 572744)
++++ ./src/knemod/backends/sysbackend.cpp	(revision 572745)
+@@ -223,7 +223,7 @@
+             // afterwards only add difference to previous number of bytes
+             data.txBytes += txBytes - data.prevTxBytes;
+ 
+-        data.incomingBytes = txBytes - data.prevTxBytes;
++        data.outgoingBytes = txBytes - data.prevTxBytes;
+         data.prevTxBytes = txBytes;
+         data.txString = KIO::convertSize( data.txBytes );
+     }