r8402 - in /vdr/vdr-plugin-sysinfo/trunk/debian: changelog control copyright patches/00list patches/03_gcc-4.3.dpatch patches/04_sysinfo-0.1.0a-meminfo.dpatch

[tom-guest at users.alioth.debian.org]

Author: tom-guest
Date: Fri Feb 26 19:45:53 2010
New Revision: 8402

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8402
Log:
* Added 04_sysinfo-0.1.0a-meminfo.dpatch
* Added awk to Depends
* Updated debian/copyright

Added:
    vdr/vdr-plugin-sysinfo/trunk/debian/patches/04_sysinfo-0.1.0a-meminfo.dpatch
Modified:
    vdr/vdr-plugin-sysinfo/trunk/debian/changelog
    vdr/vdr-plugin-sysinfo/trunk/debian/control
    vdr/vdr-plugin-sysinfo/trunk/debian/copyright
    vdr/vdr-plugin-sysinfo/trunk/debian/patches/00list
    vdr/vdr-plugin-sysinfo/trunk/debian/patches/03_gcc-4.3.dpatch   (props changed)

Modified: vdr/vdr-plugin-sysinfo/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-sysinfo/trunk/debian/changelog?rev=8402&op=diff
==============================================================================
--- vdr/vdr-plugin-sysinfo/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-sysinfo/trunk/debian/changelog Fri Feb 26 19:45:53 2010
@@ -1,3 +1,11 @@
+vdr-plugin-sysinfo (0.1.0a-16) experimental; urgency=low
+
+  * Added 04_sysinfo-0.1.0a-meminfo.dpatch
+  * Added awk to Depends
+  * Updated debian/copyright
+
+ -- Thomas Günther <tom at toms-cafe.de>  Fri, 26 Feb 2010 20:40:07 +0100
+
 vdr-plugin-sysinfo (0.1.0a-15) experimental; urgency=low
 
   * Removed non-standard shebang line from debian/rules

Modified: vdr/vdr-plugin-sysinfo/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-sysinfo/trunk/debian/control?rev=8402&op=diff
==============================================================================
--- vdr/vdr-plugin-sysinfo/trunk/debian/control (original)
+++ vdr/vdr-plugin-sysinfo/trunk/debian/control Fri Feb 26 19:45:53 2010
@@ -10,7 +10,7 @@
 
 Package: vdr-plugin-sysinfo
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends}, lm-sensors
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends}, lm-sensors, awk
 Description: Plugin for vdr to display hardware monitoring data
  This plugin displays hardware monitoring data identified by lm-sensors,
  such as CPU and mainboard temperature, CPU and system fan speed.

Modified: vdr/vdr-plugin-sysinfo/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-sysinfo/trunk/debian/copyright?rev=8402&op=diff
==============================================================================
--- vdr/vdr-plugin-sysinfo/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-sysinfo/trunk/debian/copyright Fri Feb 26 19:45:53 2010
@@ -13,7 +13,7 @@
     (C) 2004 - 2006 Alberto Pachera
 
 Copyright (Debian packaging):
-    (C) 2006 - 2009 Tobias Grimm, Thomas Günther, Thomas Schmidt
+    (C) 2006 - 2010 Tobias Grimm, Thomas Günther, Thomas Schmidt
 
 License:
     This program is free software; you can redistribute it and/or modify

Modified: vdr/vdr-plugin-sysinfo/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-sysinfo/trunk/debian/patches/00list?rev=8402&op=diff
==============================================================================
--- vdr/vdr-plugin-sysinfo/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-sysinfo/trunk/debian/patches/00list Fri Feb 26 19:45:53 2010
@@ -2,3 +2,4 @@
 01_sysinfo-0.1.0a-fontfix
 02_sysinfo.sh-path
 03_gcc-4.3
+04_sysinfo-0.1.0a-meminfo

Propchange: vdr/vdr-plugin-sysinfo/trunk/debian/patches/03_gcc-4.3.dpatch
            ('svn:executable' removed)

Added: vdr/vdr-plugin-sysinfo/trunk/debian/patches/04_sysinfo-0.1.0a-meminfo.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-sysinfo/trunk/debian/patches/04_sysinfo-0.1.0a-meminfo.dpatch?rev=8402&op=file
==============================================================================
--- vdr/vdr-plugin-sysinfo/trunk/debian/patches/04_sysinfo-0.1.0a-meminfo.dpatch (added)
+++ vdr/vdr-plugin-sysinfo/trunk/debian/patches/04_sysinfo-0.1.0a-meminfo.dpatch Fri Feb 26 19:45:53 2010
@@ -1,0 +1,15 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_sysinfo-0.1.0a-meminfo.dpatch by Thomas Günther <tom at toms-cafe.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes meminfo output (e.g. Total memory 207Mb -> Total memory 2073Mb)
+
+ at DPATCH@
+--- sysinfo-0.1.0a/sysinfoosd.c
++++ sysinfo-0.1.0a/sysinfoosd.c
+@@ -316 +316 @@
+-	ExecShellCmd("cat /proc/meminfo | grep -i 'MEMTOTAL' | cut -c 16-23 | tr -d ' '", cTemp);
++	ExecShellCmd("cat /proc/meminfo | grep -i 'MEMTOTAL' | awk '{ print $2 }'", cTemp);
+@@ -325 +325 @@
+-	ExecShellCmd("cat /proc/meminfo | grep -i 'MEMFREE' | cut -c 16-23 | tr -d ' '", cTemp);
++	ExecShellCmd("cat /proc/meminfo | grep -i 'MEMFREE' | awk '{ print $2 }'", cTemp);