diff -upNr powertop-2.0/debian/changelog powertop/debian/changelog --- powertop-2.0/debian/changelog 2012-06-30 16:13:48.000000000 +0200 +++ powertop/debian/changelog 2013-02-10 20:39:31.430676606 +0100 @@ -1,3 +1,16 @@ +powertop (2.2-0.1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream version. (Closes: #681380, #682388, #698549, #670115, + #685607, #695892) + * Fix watch file (Closes: #695891). + * Add postrm script to remove /var/cache/powertop when purging (Closes: + #680510). + * Add debug package (Closes: #679579). + * Bump standards version to 3.9.4. + + -- Julian Wollrath Sun, 10 Feb 2013 20:35:36 +0100 + powertop (2.0-0.2) unstable; urgency=low * Non-maintainer upload. diff -upNr powertop-2.0/debian/control powertop/debian/control --- powertop-2.0/debian/control 2012-06-26 01:01:00.000000000 +0200 +++ powertop/debian/control 2013-02-10 20:39:31.430676606 +0100 @@ -4,7 +4,7 @@ Priority: extra Maintainer: Patrick Winnertz Uploaders: Jose Luis Rivas Build-Depends: cdbs, debhelper (>= 9), libncurses5-dev, libncursesw5-dev, libnl-3-dev, libnl-genl-3-dev, libpci-dev, pkg-config -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Homepage: https://01.org/powertop/ Package: powertop @@ -24,3 +24,24 @@ Description: Linux tool to find out what information from the kernel into one convenient screen so that you can see how well your system is doing, and which components are the biggest problem. + +Package: powertop-dbg +Architecture: any +Section: debug +Priority: extra +Depends: powertop (=${binary:Version}), ${misc:Depends} +Description: debugging symbols for powertop + PowerTOP is a Linux tool that finds the software component(s) that + make your laptop use more power than necessary while it is idle. As of + Linux kernel version 2.6.21, the kernel no longer has a fixed 1000Hz + timer tick. This will (in theory) give a huge power savings because + the CPU stays in low power mode for longer periods of time during + system idle. + . + However... there are many things that can ruin the party, both inside + the kernel and in userspace. PowerTOP combines various sources of + information from the kernel into one convenient screen so that you can + see how well your system is doing, and which components are the + biggest problem. + . + This package contains the debugging symbols for powertop. diff -upNr powertop-2.0/debian/patches/0001-Use-PACKAGE_VERSION-for-POWERTOP_VERSION.patch powertop/debian/patches/0001-Use-PACKAGE_VERSION-for-POWERTOP_VERSION.patch --- powertop-2.0/debian/patches/0001-Use-PACKAGE_VERSION-for-POWERTOP_VERSION.patch 1970-01-01 01:00:00.000000000 +0100 +++ powertop/debian/patches/0001-Use-PACKAGE_VERSION-for-POWERTOP_VERSION.patch 2013-02-10 20:39:31.430676606 +0100 @@ -0,0 +1,34 @@ +From 2a01be67d285b911f94fc79d7bca9cf16fdda110 Mon Sep 17 00:00:00 2001 +From: Namhyung Kim +Date: Sun, 18 Nov 2012 00:42:47 +0900 +Subject: [PATCH 1/3] Use PACKAGE_VERSION for POWERTOP_VERSION + +It was missed to update POWERTOP_VERSION macro so that the +new v2.2 release still shows v2.1 string on the header of +ncurses window. Convert to use PACKAGE_VERSION macro which +set by autotools to the AC_INIT version so that it cannot +be missed anymore. + +Signed-off-by: Namhyung Kim +--- + src/lib.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/lib.h b/src/lib.h +index 8cf4632..209421a 100644 +--- a/src/lib.h ++++ b/src/lib.h +@@ -35,8 +35,8 @@ + + #define _(STRING) gettext(STRING) + +-#define POWERTOP_VERSION "v2.1" +-#define POWERTOP_SHORT_VERSION "2.1" ++#define POWERTOP_VERSION "v"PACKAGE_VERSION ++#define POWERTOP_SHORT_VERSION PACKAGE_VERSION + + + extern int get_max_cpu(void); +-- +1.7.10.4 + diff -upNr powertop-2.0/debian/patches/0002-Correct-script-for-tuning-wifi-power_save-with-iw.patch powertop/debian/patches/0002-Correct-script-for-tuning-wifi-power_save-with-iw.patch --- powertop-2.0/debian/patches/0002-Correct-script-for-tuning-wifi-power_save-with-iw.patch 1970-01-01 01:00:00.000000000 +0100 +++ powertop/debian/patches/0002-Correct-script-for-tuning-wifi-power_save-with-iw.patch 2013-02-10 20:39:31.431676606 +0100 @@ -0,0 +1,31 @@ +From c33a4d9b00c2f51c45b0051888d6803ff1d1cff6 Mon Sep 17 00:00:00 2001 +From: Daniel Kahn Gillmor +Date: Thu, 13 Dec 2012 23:52:59 -0500 +Subject: [PATCH 2/3] Correct script for tuning wifi power_save with iw + +The logic for the script to run to fix the power_save state of a +wireless device was inverted. + +Signed-off-by: Daniel Kahn Gillmor +--- + src/tuning/wifi.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/tuning/wifi.cpp b/src/tuning/wifi.cpp +index 38d9be6..77cdfcc 100644 +--- a/src/tuning/wifi.cpp ++++ b/src/tuning/wifi.cpp +@@ -47,8 +47,8 @@ wifi_tunable::wifi_tunable(const char *_iface) : tunable("", 1.5, _("Good"), _(" + strcpy(iface, _iface); + sprintf(desc, _("Wireless Power Saving for interface %s"), iface); + +- sprintf(toggle_good, "iw dev %s set power_save off", iface); +- sprintf(toggle_bad, "iw dev %s set power_save on", iface); ++ sprintf(toggle_good, "iw dev %s set power_save on", iface); ++ sprintf(toggle_bad, "iw dev %s set power_save off", iface); + } + + int wifi_tunable::good_bad(void) +-- +1.7.10.4 + diff -upNr powertop-2.0/debian/patches/0003-csstoh.sh-shell-script-fixes-cross-compiling-issues.patch powertop/debian/patches/0003-csstoh.sh-shell-script-fixes-cross-compiling-issues.patch --- powertop-2.0/debian/patches/0003-csstoh.sh-shell-script-fixes-cross-compiling-issues.patch 1970-01-01 01:00:00.000000000 +0100 +++ powertop/debian/patches/0003-csstoh.sh-shell-script-fixes-cross-compiling-issues.patch 2013-02-10 20:39:31.431676606 +0100 @@ -0,0 +1,94 @@ +From 98fc7a9b8b8d8b0d7375a6cce57705a27c717e8f Mon Sep 17 00:00:00 2001 +From: Thomas Waldecker +Date: Fri, 30 Nov 2012 13:46:27 +0100 +Subject: [PATCH 3/3] csstoh.sh shell script fixes cross compiling issues + +Added the csstoh.sh shell script from Igor Zhbanov found here: +http://lists.01.org/pipermail/powertop/2012-July/000151.html +also patched the Makefile.am to use the csstoh.sh script. +The compiled csstoh binary doesn't work for cross compiling, +however Igors Patch never got applied upstream. +--- + src/Makefile.am | 8 +++----- + src/csstoh.sh | 45 +++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 48 insertions(+), 5 deletions(-) + create mode 100755 src/csstoh.sh + +diff --git a/src/Makefile.am b/src/Makefile.am +index f60426a..a53d942 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,9 +1,6 @@ + AUTOMAKE_OPTIONS = subdir-objects + ACLOCAL_AMFLAGS = -I ../m4 + +-noinst_PROGRAMS = csstoh +-csstoh_SOURCES = csstoh.c +- + sbin_PROGRAMS = powertop + nodist_powertop_SOURCES = css.h + +@@ -48,6 +45,7 @@ AM_LDFLAGS = $(LIBS) $(NCURSES_LIBS) $(PCIUTILS_LIBS) $(LIBNL_LIBS) $(LIBZ_LIBS) + + BUILT_SOURCES = css.h + CLEANFILES = css.h +-css.h: csstoh powertop.css +- ./csstoh "$(srcdir)"/powertop.css css.h ++css.h: powertop.css ++ chmod +x ./csstoh.sh ++ ./csstoh.sh "$(srcdir)"/powertop.css css.h + +diff --git a/src/csstoh.sh b/src/csstoh.sh +new file mode 100755 +index 0000000..5918d12 +--- /dev/null ++++ b/src/csstoh.sh +@@ -0,0 +1,45 @@ ++#!/bin/bash ++# ++# This program file is free software; you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by the ++# Free Software Foundation; version 2 of the License. ++# ++# This program is distributed in the hope that it will be useful, but WITHOUT ++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++# for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program in a file named COPYING; if not, write to the ++# Free Software Foundation, Inc, ++# 51 Franklin Street, Fifth Floor, ++# Boston, MA 02110-1301 USA ++# or just google for it. ++# ++# Written by Igor Zhbanov ++ ++ ++if [ $# -lt 2 ]; then ++ echo "Usage: csstoh.sh cssfile header.h" ++ exit 1 ++fi ++ ++if [ ! -r $1 ]; then ++ echo "Can't find file $1" ++ exit 1 ++fi ++ ++if ! echo -n>$2; then ++ echo "Can't open file $2 for writing." ++ exit 1 ++fi ++ ++echo "#ifndef __INCLUDE_GUARD_CCS_H">> $2 ++echo "#define __INCLUDE_GUARD_CCS_H">> $2 ++echo>> $2 ++echo "const char css[] = ">> $2 ++ ++sed -r 's/^(.*)$/\t\"\1\\n\"/' $1>> $2 ++ ++echo ";">> $2 ++echo "#endif">> $2 +-- +1.7.10.4 + diff -upNr powertop-2.0/debian/patches/series powertop/debian/patches/series --- powertop-2.0/debian/patches/series 2012-06-30 15:58:08.000000000 +0200 +++ powertop/debian/patches/series 2013-02-10 20:39:31.431676606 +0100 @@ -0,0 +1,3 @@ +0001-Use-PACKAGE_VERSION-for-POWERTOP_VERSION.patch +0002-Correct-script-for-tuning-wifi-power_save-with-iw.patch +0003-csstoh.sh-shell-script-fixes-cross-compiling-issues.patch diff -upNr powertop-2.0/debian/postrm powertop/debian/postrm --- powertop-2.0/debian/postrm 1970-01-01 01:00:00.000000000 +0100 +++ powertop/debian/postrm 2013-02-10 20:39:31.431676606 +0100 @@ -0,0 +1,15 @@ +#!/bin/sh +#DEBHELPER# +# Abort if any command returns an error value +set -e + +case "$1" in + purge) + # This package has previously been removed and is now having + # its configuration purged from the system. + : + rm -rf /var/cache/powertop + ;; +esac + +exit 0 diff -upNr powertop-2.0/debian/powertop.8 powertop/debian/powertop.8 --- powertop-2.0/debian/powertop.8 2012-06-12 16:35:14.000000000 +0200 +++ powertop/debian/powertop.8 1970-01-01 01:00:00.000000000 +0100 @@ -1,59 +0,0 @@ -.TH POWERTOP 8 "June 1, 2012" "Linux" "powertop manual" -.SH NAME -powertop \- a power consumption and power management diagnosis tool. -.SH SYNOPSIS -.B powertop -.RB [ -.IR options -.RB ] -.SH DESCRIPTION -.P -\fBpowertop\fP is a program that helps to diagnose various issues with power consumption -and power management. It also has an interactive mode allowing one to -experiment with various power management settings. When invoking powertop -without arguments powertop starts in interactive mode. -.SH OPTIONS -.TP -\fB\-\-csv[\fR=\fIFILENAME\fR] -generate a CSV report. If a filename is not specified then the -default name "powertop.csv" is used. The CSV report can be -used for reporting and data analysis. -.TP -\fB\-\-calibrate -runs powertop in calibration mode. When running on battery, powertop -can track power consumption as well as system activity. When there -are enough measurements, powertop can start to report power estimates. One -can get more accurate estimates by using this option to enable a -calibration cycle. This will cycle through various display levesl and USB -device activities and workloads. -.TP -\fB\-\-debug - run in "debug" mode. -.TP -\fB\-\-extech\fR=\fIdevnode\fR -use the Extech Power Analyzer for measurements. This allows one to -specify the serial device node of the serial to USB adaptor connecting to -the Extech Power Analyzer, for example /dev/ttyUSB0. -.TP -\fB\-\-help - show the help message. -.TP -\fB\-\-html[\fR=\fIFILENAME\fR] -generate an HTML report. If a filename is not specified then the -default name "powertop.html" is used. The HTML report can be -sent to others to help diagnose power issues. -.TP -\fB\-\-iteration[\fR=\fIiterations\fR] -number of times to run each test. -.TP -\fB\-\-time[\fR=\fIseconds\fR] -generate a report for a specified number of seconds. -.TP -\fB\-\-version -print version information and exit. -.SH BUGS -Send bug reports to -.SH SEE ALSO -The program is more fully described at https://01.org/powertop -.SH AUTHOR -powertop was written by Arjan van de Ven , and is currently maintained by Chris E Ferron . diff -upNr powertop-2.0/debian/powertop.manpages powertop/debian/powertop.manpages --- powertop-2.0/debian/powertop.manpages 2012-06-12 16:34:35.000000000 +0200 +++ powertop/debian/powertop.manpages 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -debian/powertop.8 diff -upNr powertop-2.0/debian/watch powertop/debian/watch --- powertop-2.0/debian/watch 2012-05-28 18:33:25.000000000 +0200 +++ powertop/debian/watch 2013-02-10 20:39:31.432676606 +0100 @@ -1,2 +1,2 @@ version=3 -https://01.org/powertop/downloads https://01.org/powertop/sites/default/files/downloads/powertop-([\d\.]*).tar.bz2 +https://01.org/powertop/downloads https://01.org/powertop/sites/default/files/downloads/powertop-([\d\.]*).tar.gz