Bug#672555: Bug #672555: powertop: New upstream release (2.0) available
Hello,
new version of the patch, which keeps the needed changes to the rules file
minimal. I will try to do a NMU.
With best regards,
Julian Wollrath
diff -upNr powertop-1.97/debian/changelog powertop-2.0/debian/changelog
--- powertop-1.97/debian/changelog 2011-03-17 16:25:01.0 +0100
+++ powertop-2.0/debian/changelog 2012-05-28 18:33:25.031343378 +0200
@@ -1,3 +1,18 @@
+powertop (2.0-0.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * New upstream version
+(Closes: #667329, #665695, #672555, #652466, #638300)
+ * Build against libnl3 (Closes: #656421)
+ * Add minimal manpage (Closes: #564847)
+ * Update watch and copyright file (Closes: #650063, #634218)
+ * Bump standards version to 3.9.3 (no changes needed)
+ * Become Multi-Arch aware
+ * Drop no longer needed patches fix_prefix_in_manpage.patch,
+fix_NR_perf_event_open_on_ia64.patch, fix_csstoh_on_sparc
+
+ -- Julian Wollrath Sat, 26 May 2012 16:47:30 +0200
+
powertop (1.97-2) unstable; urgency=low
* Fix a build failure on ia64
diff -upNr powertop-1.97/debian/compat powertop-2.0/debian/compat
--- powertop-1.97/debian/compat 2011-03-17 16:25:01.0 +0100
+++ powertop-2.0/debian/compat 2012-05-28 18:33:25.031343378 +0200
@@ -1 +1 @@
-5
+9
diff -upNr powertop-1.97/debian/control powertop-2.0/debian/control
--- powertop-1.97/debian/control 2011-03-17 16:25:01.0 +0100
+++ powertop-2.0/debian/control 2012-05-28 18:33:25.031343378 +0200
@@ -3,12 +3,13 @@ Section: utils
Priority: optional
Maintainer: Patrick Winnertz
Uploaders: Jose Luis Rivas
-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: cdbs, debhelper (>= 9), libncurses5-dev, libncursesw5-dev, libnl-3-dev, libnl-genl-3-dev, libpci-dev, pkg-config
+Standards-Version: 3.9.3
+Homepage: https://01.org/powertop/
Package: powertop
Architecture: any
+Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: cpufrequtils, laptop-mode-tools
Description: Linux tool to find out what is using power on a laptop
diff -upNr powertop-1.97/debian/copyright powertop-2.0/debian/copyright
--- powertop-1.97/debian/copyright 2011-03-17 16:25:01.0 +0100
+++ powertop-2.0/debian/copyright 2012-05-28 18:57:10.563412427 +0200
@@ -1,33 +1,92 @@
-This package was debianized by Petter Reinholdtsen 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/
+ git://github.com/fenrus75/powertop.git
+
+Files: *
+Copyright: 2010 Intel Corporation
+License: GPL-2
+
+Files: pevent/*
+Copyright: 2009, 2010 Red Hat Inc, Steven Rostedt
+License: LGPL-2.1
+
+Files: src/perf/perf_event.h
+Copyright: 2008-2009 Thomas Gleixner
+ 2008-2009 Red Hat, Inc., Ingo Molnar
+ 2008-2009 Red Hat, Inc., Peter Zijlstra
+ 2010 Intel Corporation
+License: GPL-2
+
+Files: src/tuning/iw.*
+Copyright: 2007, 2008 Johannes Berg
+ 2007 Andy Lutomirski
+ 2007 Mike Kershaw
+ 2008-2009 Luis R. Rodriguez
+License: MIT
+
+Files: src/tuning/nl80211.h
+Copyright: 2006-2010 Johannes Berg
+ 2008 Michael Wu
+ 2008 Luis Carlos Cobo
+ 2008 Michael Buesch
+ 2008, 2009 Luis R. Rodriguez
+ 2008 Jouni Malinen
+ 2008 Colin McCabe
+License: MIT
+
+Files: debian/*
+Copyright: 2007 Petter Reinholdtsen
+ 2012 Julian Wollrath
+License: GPL-2
+
+License: LGPL-2.1
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the complete tesxt of the GNU Lesser General Public
+ License can be found in `/usr/share/common-licenses/LGPG-2.1'.
+
+
+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 So
Bug#672555: Bug #672555: powertop: New upstream release (2.0) available
Tags: patch
Hello,
in the attachment is a new version of the patch, which includes a updated
watch file and a manpage. It also gets rid of all lintian warnings.
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.0 +0100
+++ powertop/debian/changelog 2012-05-26 17:23:17.617289923 +0200
@@ -1,3 +1,13 @@
+powertop (2.0-0.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * 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
+ * Add minimal manpage (Closes: #564847)
+
+ -- Julian Wollrath Sat, 26 May 2012 16:47:30 +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.0 +0100
+++ powertop/debian/compat 2012-05-26 17:23:17.617289923 +0200
@@ -1 +1 @@
-5
+9
diff -upNr powertop-1.97/debian/control powertop/debian/control
--- powertop-1.97/debian/control 2011-03-17 16:25:01.0 +0100
+++ powertop/debian/control 2012-05-26 17:23:17.617289923 +0200
@@ -3,12 +3,13 @@ Section: utils
Priority: optional
Maintainer: Patrick Winnertz
Uploaders: Jose Luis Rivas
-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: autopoint, debhelper (>= 9), dh-autoreconf, libncurses5-dev, libncursesw5-dev, libnl-3-dev, libnl-genl-3-dev, libpci-dev, pkg-config, quilt
+Standards-Version: 3.9.3
+Homepage: https://01.org/powertop/
Package: powertop
Architecture: any
+Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: cpufrequtils, laptop-mode-tools
Description: Linux tool to find out what is using power on a laptop
diff -upNr powertop-1.97/debian/copyright powertop/debian/copyright
--- powertop-1.97/debian/copyright 2011-03-17 16:25:01.0 +0100
+++ powertop/debian/copyright 2012-05-26 17:23:17.617289923 +0200
@@ -1,33 +1,30 @@
-This package was debianized by Petter Reinholdtsen on
-Sat May 12 23:22:21 CEST 2007.
-
-It was downloaded from http://www.linuxpowertop.org/download/
-
-Upstream Author:
-
-Arjan van de Ven
-
-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 and
-is licensed under the GPL, see above.
+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
+ 2012 Julian Wollrath
+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
+ .
+ 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/install powertop/debian/install
--- powertop-1.97/debian/install 1970-01-01 01:00:00.0 +0100
+++ powertop/debian/install 2012-05-26 17:23:17.617289923 +0200
@@ -0,0 +1 @@
+README usr/share/doc/powertop
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.0 +01
Bug#672555: Bug #672555: powertop: New upstream release (2.0) available
Tags: patch Hi, if in debian/compat stands a 7 the build dependency should be against debhelper (>= 7). This is fixed in the fourth version of my patch. 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.0 +0100 +++ powertop/debian/changelog 2012-05-15 13:20:55.060049938 +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 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.0 +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.0 +0100 +++ powertop/debian/control 2012-05-15 13:19:44.988052503 +0200 @@ -3,9 +3,9 @@ Section: utils Priority: optional Maintainer: Patrick Winnertz Uploaders: Jose Luis Rivas -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: autopoint, debhelper (>= 7), dh_autoreconf, libncurses5-dev, libncursesw5-dev, libnl-3-dev, libnl-genl-3-dev, libpci-dev, pkg-config, quilt +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.0 +0100 +++ powertop/debian/copyright 2012-05-12 17:59:06.809054206 +0200 @@ -1,33 +1,30 @@ -This package was debianized by Petter Reinholdtsen 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 + 2012 Julian Wollrath +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 - -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 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.0 +0100 +++ powertop/debian/patches/fix_csstoh_on_sparc 1970-01-01 01:00:00.0 +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_ve
Bug#672555: Bug #672555: powertop: New upstream release (2.0) available
Tags: patch Hi, just saw, said I forgot to add quilt to the build dependencies. This is fixed in the third version of my patch. 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.0 +0100 +++ powertop/debian/changelog 2012-05-15 13:20:55.060049938 +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 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.0 +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.0 +0100 +++ powertop/debian/control 2012-05-15 13:19:44.988052503 +0200 @@ -3,9 +3,9 @@ Section: utils Priority: optional Maintainer: Patrick Winnertz Uploaders: Jose Luis Rivas -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, quilt +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.0 +0100 +++ powertop/debian/copyright 2012-05-12 17:59:06.809054206 +0200 @@ -1,33 +1,30 @@ -This package was debianized by Petter Reinholdtsen 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 + 2012 Julian Wollrath +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 - -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 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.0 +0100 +++ powertop/debian/patches/fix_csstoh_on_sparc 1970-01-01 01:00:00.0 +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/debi
Bug#672555: Bug #672555: powertop: New upstream release (2.0) available
push it! powertop 2 would be nice to have -- -Shawn Landden -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#672555: Bug #672555: powertop: New upstream release (2.0) available
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.0 +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 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.0 +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.0 +0100 +++ powertop/debian/control 2012-05-12 17:48:03.383968971 +0200 @@ -3,9 +3,9 @@ Section: utils Priority: optional Maintainer: Patrick Winnertz Uploaders: Jose Luis Rivas -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.0 +0100 +++ powertop/debian/copyright 2012-05-12 17:59:06.809054206 +0200 @@ -1,33 +1,30 @@ -This package was debianized by Petter Reinholdtsen 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 + 2012 Julian Wollrath +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 - -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 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.0 +0100 +++ powertop/debian/patches/fix_csstoh_on_sparc 1970-01-01 01:00:00.0 +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); - fc
Bug#672555: Bug #672555: powertop: New upstream release (2.0) available
Tags: patch
Hello,
in the attachment is a patch, which updates the debian directory to build
powertop 2.0.
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.0 +0100
+++ powertop/debian/changelog 2012-05-12 16:18:18.128254937 +0200
@@ -1,3 +1,15 @@
+powertop (2.0-1+nmu) unstable; urgency=low
+
+ * New upstream version (Closes: #667329, #665695, #650063, #667329, #656421)
+ * Bump standards-version to 3.9.3 - no further changes needed
+ * Update debian/watch
+ * Rewrite debian/rules and update build dependencies accordingly
+ * Add patch fix_libnl_version.patch to fix building with libnl-3-dev
+ * Drop patches fix_prefix_in_manpage.patch, fix_csstoh_on_sparc,
+fix_NR_perf_event_open_on_ia64.patch
+
+ -- Julian Wollrath 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/control powertop/debian/control
--- powertop-1.97/debian/control 2011-03-17 16:25:01.0 +0100
+++ powertop/debian/control 2012-05-12 15:03:15.875237522 +0200
@@ -3,9 +3,9 @@ Section: utils
Priority: optional
Maintainer: Patrick Winnertz
Uploaders: Jose Luis Rivas
-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: http://github.com/fenrus75/powertop
Package: powertop
Architecture: any
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.0 +0100
+++ powertop/debian/patches/fix_csstoh_on_sparc 1970-01-01 01:00:00.0 +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.0 +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.0 +0100
+++ powertop/debian/patches/fix_prefix_in_manpage.patch 1970-01-01 01:00:00.0 +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.0 +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.0 +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 =
+cle
