Package: yacpi Severity: wishlist Tags: patch Hi Nico,
I had some free time; see attached patch to migrate to new package format[*]. Note that all files in debian/patches/* are canocalized to *.patch. Let me know if there is anything that needs adjusting. Thanks, Jari [*] The dpatch patch management system has been deprecated for some time. The Lintian currently flags use of dpatch packages as an error. The new 3.0 packaging format is an improved version which, among other things, contains patch management built-in. For more information, see: <http://wiki.debian.org/Projects/DebSrc3.0>.
>From 5b5f51df6c031dd31ce3f86a9f484ba5c63f437e Mon Sep 17 00:00:00 2001 From: Jari Aalto <[email protected]> Date: Fri, 20 Apr 2012 12:54:45 +0300 Subject: [PATCH] format-3.0 Organization: Private Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Signed-off-by: Jari Aalto <[email protected]> --- debian/NEWS | 12 +++++++----- debian/changelog | 14 ++++++++++++++ debian/compat | 2 +- debian/control | 6 +++--- debian/copyright | 2 +- debian/patches/00list | 2 -- debian/patches/01-makefile.patch | 18 ++++++++++++++++++ debian/patches/01_makefile.dpatch | 19 ------------------- .../{02_fixacstate.dpatch => 02-fixacstate.patch} | 8 ++------ debian/patches/series | 2 ++ debian/rules | 9 +++++---- debian/source/format | 1 + debian/watch | 2 ++ 13 files changed, 56 insertions(+), 41 deletions(-) delete mode 100644 debian/patches/00list create mode 100644 debian/patches/01-makefile.patch delete mode 100644 debian/patches/01_makefile.dpatch rename debian/patches/{02_fixacstate.dpatch => 02-fixacstate.patch} (64%) create mode 100644 debian/patches/series create mode 100644 debian/source/format create mode 100644 debian/watch diff --git a/debian/NEWS b/debian/NEWS index c0dbe41..67b87ee 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,10 +1,12 @@ yacpi (3.0-1) unstable; urgency=low - * This release is a complete rewrite of yacpi so watch you setups. - * -m option removed, not needed anymore. - * New options to enable or disable features (battery, therm, etc). + This release is a complete rewrite of yacpi so watch you setups. The + major changes are: + + - Remove option -m; not needed anymore. + - New options to enable or disable features (battery, therm, etc). Have a look at yacpi -h - * Samples are completely dropped, they are not needed anymore. - * -t is now -p since -t is used to enable thermal information. + - Drop examples; not needed anymore. + - Option -t is now -p since -t is used to enable thermal information. -- Nico Golde <[email protected]> Thu, 09 Aug 2007 19:05:00 +0200 diff --git a/debian/changelog b/debian/changelog index e6f4d26..e4c92a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +yacpi (3.0-3) unstable; urgency=low + + [ Jari Aalto ] + * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt". + - Note: patch 01 was updated with "quilt refresh" to make + it apply cleanly. + * Update to Standards-Version to 3.9.3 and debhelper to 9. + * Add build-arch and build-indep targets; use dh_prep in rules file. + * Fix copyright-refers-to-symlink-license (Lintian). + * Fix debian-news-entry-uses-asterisk (Lintian). + * Fix debian-watch-file-is-missing (Lintian). + + -- Jari Aalto <[email protected]> Fri, 20 Apr 2012 12:53:07 +0300 + yacpi (3.0-2) unstable; urgency=low * Added 02_fixacstate to add missing call to read_acpi_acstate diff --git a/debian/compat b/debian/compat index 7ed6ff8..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/debian/control b/debian/control index dc73f10..48b2dbe 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,13 @@ Source: yacpi Section: utils Priority: optional Maintainer: Nico Golde <[email protected]> -Build-Depends: debhelper (>= 5), libncurses5-dev, dpatch, libacpi-dev +Build-Depends: debhelper (>= 9), libncurses5-dev, libacpi-dev Homepage: http://www.ngolde.de/yacpi/ -Standards-Version: 3.7.2 +Standards-Version: 3.9.3 Package: yacpi Architecture: i386 ia64 amd64 -Depends: ${shlibs:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Description: ncurses based acpi monitor for text mode yacpi (yet another configuration and power interface) is an ncurses based ACPI monitoring program for notebooks. There is also a text-only output diff --git a/debian/copyright b/debian/copyright index c30c9dc..cdd6f13 100644 --- a/debian/copyright +++ b/debian/copyright @@ -26,4 +26,4 @@ License: MA 02110-1301, USA. On Debian GNU/Linux systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. +Public License can be found in `/usr/share/common-licenses/GPL-2'. diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index 11024de..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1,2 +0,0 @@ -01_makefile -02_fixacstate diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch new file mode 100644 index 0000000..5f1dcd5 --- /dev/null +++ b/debian/patches/01-makefile.patch @@ -0,0 +1,18 @@ +From: Nico Golde <[email protected]> +Subject: Adjust documentation install + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/Makefile ++++ b/Makefile +@@ -43,7 +43,7 @@ + @mkdir -p ${DOCPATH} + @mkdir -p ${INSPATH} + @mkdir -p ${MANPATH} +- install -m644 CHANGELOG README THANKS COPYING ${DOCPATH} ++ install -m644 README THANKS ${DOCPATH} + install -m644 yacpi.1 ${MANPATH} + install ${BIN} ${INSPATH} + diff --git a/debian/patches/01_makefile.dpatch b/debian/patches/01_makefile.dpatch deleted file mode 100644 index 15b3329..0000000 --- a/debian/patches/01_makefile.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_makefile.dpatch by Nico Golde <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad yacpi-2.1~/Makefile yacpi-2.1/Makefile ---- yacpi-2.1~/Makefile 2007-03-18 16:58:47.000000000 +0100 -+++ yacpi-2.1/Makefile 2007-03-18 17:16:24.000000000 +0100 -@@ -45,7 +45,7 @@ - @mkdir -p ${DOCPATH} - @mkdir -p ${INSPATH} - @mkdir -p ${MANPATH} -- install -m644 CHANGELOG README THANKS COPYING ${DOCPATH} -+ install -m644 README THANKS ${DOCPATH} - install -m644 yacpi.1 ${MANPATH} - install ${BIN} ${INSPATH} - diff --git a/debian/patches/02_fixacstate.dpatch b/debian/patches/02-fixacstate.patch similarity index 64% rename from debian/patches/02_fixacstate.dpatch rename to debian/patches/02-fixacstate.patch index bb2b995..684d675 100644 --- a/debian/patches/02_fixacstate.dpatch +++ b/debian/patches/02-fixacstate.patch @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_fixacstate.dpatch by Nico Golde <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +From: Nico Golde <[email protected]> +Subject: Call read_acpi_acstate() -@DPATCH@ diff -urNad yacpi-3.0~/yacpi.c yacpi-3.0/yacpi.c --- yacpi-3.0~/yacpi.c 2007-08-09 18:47:47.000000000 +0200 +++ yacpi-3.0/yacpi.c 2007-10-28 02:18:19.000000000 +0200 diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..cb42eb5 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +01-makefile.patch +02-fixacstate.patch diff --git a/debian/rules b/debian/rules index 0711c3a..4eb29a3 100755 --- a/debian/rules +++ b/debian/rules @@ -1,17 +1,18 @@ #!/usr/bin/make -f -include /usr/share/dpatch/dpatch.make +build-arch: build +build-indep: build build: build-stamp -build-stamp: patch-stamp +build-stamp: dh_testdir $(MAKE) touch build-stamp -clean: unpatch +clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp @@ -23,7 +24,7 @@ clean: unpatch install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs $(MAKE) install prefix=$(CURDIR)/debian/yacpi/usr diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..1d77b42 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://www.ngolde.de/yacpi.html .*yacpi-([\d.]+).tar.gz -- 1.7.9.5
