Tags: patch Hello,
in the attachment is version 2 of the previously posted patch for the packaging ofpowertop 2.0. It delivers an almost complete rewrite of the debian folder and should close some bugs, which are hopefully all marked as closed in the debian/changelog file. With best regards, Julian Wollrath
diff -upNr powertop-1.97/debian/changelog powertop/debian/changelog --- powertop-1.97/debian/changelog 2011-03-17 16:25:01.000000000 +0100 +++ powertop/debian/changelog 2012-05-12 17:56:45.260012371 +0200 @@ -1,3 +1,11 @@ +powertop (2.0-1+nmu) unstable; urgency=low + + * New upstream version (Closes: #667329, #665695, #650063, #667329, #656421) + * Almost complete rewrite of the debianization + * Add patch fix_libnl_version.patch to fix building with libnl-3-dev + + -- Julian Wollrath <jwollr...@web.de> Sat, 12 May 2012 14:17:56 +0200 + powertop (1.97-2) unstable; urgency=low * Fix a build failure on ia64 diff -upNr powertop-1.97/debian/compat powertop/debian/compat --- powertop-1.97/debian/compat 2011-03-17 16:25:01.000000000 +0100 +++ powertop/debian/compat 2012-05-12 17:25:44.195769447 +0200 @@ -1 +1 @@ -5 +7 diff -upNr powertop-1.97/debian/control powertop/debian/control --- powertop-1.97/debian/control 2011-03-17 16:25:01.000000000 +0100 +++ powertop/debian/control 2012-05-12 17:48:03.383968971 +0200 @@ -3,9 +3,9 @@ Section: utils Priority: optional Maintainer: Patrick Winnertz <win...@debian.org> Uploaders: Jose Luis Rivas <ghostba...@gmail.com> -Build-Depends: cdbs, debhelper (>= 5), libncursesw5-dev, libncurses5-dev, libnl2-dev, pkg-config, libpci-dev -Standards-Version: 3.9.1 -Homepage: http://www.linuxpowertop.org +Build-Depends: dh-autoreconf, autopoint, debhelper (>= 5), libncursesw5-dev, libncurses5-dev, libnl-3-dev, libnl-genl-3-dev, pkg-config, libpci-dev +Standards-Version: 3.9.3 +Homepage: https://01.org/powertop/ Package: powertop Architecture: any diff -upNr powertop-1.97/debian/copyright powertop/debian/copyright --- powertop-1.97/debian/copyright 2011-03-17 16:25:01.000000000 +0100 +++ powertop/debian/copyright 2012-05-12 17:59:06.809054206 +0200 @@ -1,33 +1,30 @@ -This package was debianized by Petter Reinholdtsen <p...@hungry.com> on -Sat May 12 23:22:21 CEST 2007. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: PowerTOP +Upstream-Contact: power...@lists.01.org +Source: https://01.org/powertop/ + +Files: * +Copyright: 2010 Intel Corporation +License: GPL-2 + +Files: debian/* +Copyright: 2007 Petter Reinholdtsen <p...@hungry.com> + 2012 Julian Wollrath <jwollr...@web.de> +License: GPL-2 + +License: GPL-2 + This package 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 package 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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -It was downloaded from http://www.linuxpowertop.org/download/ - -Upstream Author: - - Arjan van de Ven <ar...@linux.intel.com> - -Copyright: - - Copyright 2007 Intel Corporation - -License: - - This package 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 package 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 package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL-2'. - -The Debian packaging is copyrighted 2007, Petter Reinholdtsen <p...@hungry.com> and -is licensed under the GPL, see above. + On Debian systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL-2'. diff -upNr powertop-1.97/debian/patches/fix_csstoh_on_sparc powertop/debian/patches/fix_csstoh_on_sparc --- powertop-1.97/debian/patches/fix_csstoh_on_sparc 2011-03-17 16:25:01.000000000 +0100 +++ powertop/debian/patches/fix_csstoh_on_sparc 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -Index: powertop/csstoh.c -=================================================================== ---- powertop.orig/csstoh.c 2011-03-17 16:16:33.576642103 +0100 -+++ powertop/csstoh.c 2011-03-17 16:16:51.384730406 +0100 -@@ -65,4 +65,6 @@ - fprintf(out, "#endif\n"); - fclose(out); - fclose(in); --} -\ No newline at end of file -+ -+ return(0); -+} diff -upNr powertop-1.97/debian/patches/fix_libnl_version.patch powertop/debian/patches/fix_libnl_version.patch --- powertop-1.97/debian/patches/fix_libnl_version.patch 1970-01-01 01:00:00.000000000 +0100 +++ powertop/debian/patches/fix_libnl_version.patch 2012-05-12 15:07:24.222664464 +0200 @@ -0,0 +1,11 @@ +--- powertop.orig/configure.ac 2012-05-11 10:34:37.444265028 +0200 ++++ powertop/configure.ac 2012-05-12 15:00:10.886684276 +0200 +@@ -56,7 +56,7 @@ PKG_CHECK_MODULES([LIBZ], [zlib],[],[ + + has_libnl_ver=0 + PKG_CHECK_MODULES([LIBNL], [libnl-1], [has_libnl_ver=1], [ +- AC_SEARCH_LIBS([nl_socket_alloc], [nl], [has_libnl_ver=2], [ ++ AC_SEARCH_LIBS([nl_socket_alloc], [libnl-2.0], [has_libnl_ver=2], [ + PKG_CHECK_MODULES([LIBNL], [libnl-3.0 libnl-genl-3.0], [has_libnl_ver=3], + [AC_SEARCH_LIBS([nl_socket_alloc], [nl-3 nl-genl-3], [has_libnl_ver=3], [], [])]) + ], []) diff -upNr powertop-1.97/debian/patches/fix_prefix_in_manpage.patch powertop/debian/patches/fix_prefix_in_manpage.patch --- powertop-1.97/debian/patches/fix_prefix_in_manpage.patch 2011-03-17 16:25:01.000000000 +0100 +++ powertop/debian/patches/fix_prefix_in_manpage.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index 166a16f..0382fea 100644 ---- a/Makefile -+++ b/Makefile -@@ -69,7 +69,7 @@ powertop: $(OBJS) $(HEADERS) - install: powertop - mkdir -p ${DESTDIR}${BINDIR} - cp powertop ${DESTDIR}${BINDIR} -- mkdir -p ${DESTDIR}${PREFIX}/var/cache/powertop -+ mkdir -p ${DESTDIR}/var/cache/powertop - @(cd po/ && env LOCALESDIR=$(LOCALESDIR) DESTDIR=$(DESTDIR) $(MAKE) $@) - - diff -upNr powertop-1.97/debian/patches/series powertop/debian/patches/series --- powertop-1.97/debian/patches/series 2011-03-17 16:25:01.000000000 +0100 +++ powertop/debian/patches/series 2012-05-12 15:22:12.745334840 +0200 @@ -1,3 +1 @@ -fix_prefix_in_manpage.patch -fix_NR_perf_event_open_on_ia64.patch -fix_csstoh_on_sparc +fix_libnl_version.patch diff -upNr powertop-1.97/debian/rules powertop/debian/rules --- powertop-1.97/debian/rules 2011-03-17 16:25:01.000000000 +0100 +++ powertop/debian/rules 2012-05-12 15:18:43.823007667 +0200 @@ -1,8 +1,25 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/class/makefile.mk -include /usr/share/cdbs/1/rules/debhelper.mk -#include /usr/share/cdbs/1/rules/dpatch.mk +export CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) +export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) +export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -DEB_MAKE_INSTALL_TARGET = install BINDIR=/usr/sbin DESTDIR=`pwd`/debian/powertop -DEB_MAKE_EXTRA_ARGS = +clean: + dh clean + dh_autoreconf_clean + dh_quilt_unpatch + rm -rf m4 debian/powertop.debhelper.log + +build: + dh_quilt_patch + dh_autoreconf + dh_testdir + dh_auto_configure + dh_auto_build + dh_auto_test + +binary: + dh binary + +#%: +# dh $@ --with-autoreconf diff -upNr powertop-1.97/debian/watch powertop/debian/watch --- powertop-1.97/debian/watch 2011-03-17 16:25:01.000000000 +0100 +++ powertop/debian/watch 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -version=3 -http://www.kernel.org/pub/linux/status/powertop/powertop-([\d\.]*).tar.gz
