--- Begin Message ---
Package: ibam
Severity: wishlist
Tags: patch
Hi,
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
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 or if it is ok
to upload this version in a NMU in case you are working on other
issues needing attention.
Thanks,
Jari
>From 6fd5bfc551f989bc8817a2f06b3dcbb44cbd727d Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 21 Apr 2012 16:30:06 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
debian/README.source | 2 --
debian/changelog | 15 +++++++++++++
debian/compat | 2 +-
debian/control | 5 ++---
debian/copyright | 2 +-
debian/patches/00list | 3 ---
.../{02deviation.dpatch => 02-deviation.patch} | 22 ++++++++++----------
.../{03acpi-check.dpatch => 03-acpi-check.patch} | 8 ++-----
...5_sysfs_lenovo.dpatch => 05-sysfs-lenovo.patch} | 8 ++-----
debian/patches/10-makefile.patch | 18 ++++++++++++++++
debian/patches/series | 4 ++++
.../{04sysfs.dpatch => unused/04-sysfs.patch} | 8 ++-----
debian/rules | 10 ++++-----
debian/source/format | 1 +
debian/watch | 3 +++
15 files changed, 66 insertions(+), 45 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{02deviation.dpatch => 02-deviation.patch} (70%)
rename debian/patches/{03acpi-check.dpatch => 03-acpi-check.patch} (73%)
rename debian/patches/{05_sysfs_lenovo.dpatch => 05-sysfs-lenovo.patch} (89%)
create mode 100644 debian/patches/10-makefile.patch
create mode 100644 debian/patches/series
rename debian/patches/{04sysfs.dpatch => unused/04-sysfs.patch} (89%)
create mode 100644 debian/source/format
create mode 100644 debian/watch
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 5e94a7b..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,2 +0,0 @@
-This packages uses dpatch to manage differences between the upsteram and the
-Debian version.
diff --git a/debian/changelog b/debian/changelog
index 7b1e6b8..debf7be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+ibam (1:0.5.2-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * 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.
+ * Patch 01: update with "quilt refresh" to make it apply cleanly.
+ * Patch 04: move to directory debian/patches/unused.
+ * Patch 10: new; fix makefile by removing unused linker flag.
+ * Fix debian-watch-file-is-missing (Lintian)
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix binary-control-field-duplicates-source (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 21 Apr 2012 16:29:38 +0300
+
ibam (1:0.5.2-2) unstable; urgency=low
* added armhf to Architecture (closes: #604674)
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 2567abf..99fff04 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,13 @@
Source: ibam
Section: utils
Priority: optional
-Build-Depends: debhelper (>= 7.0.50), gkrellm (>= 2.1.4), libgtk2.0-dev, dpatch
+Build-Depends: debhelper (>= 9), gkrellm (>= 2.1.4), libgtk2.0-dev
Maintainer: Martin Wuertele <m...@debian.org>
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
Homepage: http://ibam.sourceforge.net/
Package: ibam
Architecture: amd64 i386 powerpc arm mips mipsel armel armhf
-Section: utils
Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.2.0) | debconf-2.0
Suggests: gnuplot
Description: Advanced battery monitor for laptops
diff --git a/debian/copyright b/debian/copyright
index 2e10201..63463cf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,5 +18,5 @@ Free Software Foundation; either version 2, or (at your option) any
later version.
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 f728095..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-02deviation.dpatch
-03acpi-check.dpatch
-05_sysfs_lenovo.dpatch
diff --git a/debian/patches/02deviation.dpatch b/debian/patches/02-deviation.patch
similarity index 70%
rename from debian/patches/02deviation.dpatch
rename to debian/patches/02-deviation.patch
index e3a7395..09be20e 100644
--- a/debian/patches/02deviation.dpatch
+++ b/debian/patches/02-deviation.patch
@@ -1,13 +1,13 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02deviation.dpatch by Martin Wuertele <m...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: change derivation to deviation
+From: Martin Wuertele <m...@debian.org>
+Subject: change derivation to deviation
-@DPATCH@
---- ibam-0.4.orig/ibam.cpp 2007-05-20 09:54:48.000000000 +0200
-+++ ibam-0.4/ibam.cpp 2007-05-20 09:52:47.000000000 +0200
-@@ -91,6 +91,7 @@
+---
+ ibam.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/ibam.cpp
++++ b/ibam.cpp
+@@ -96,6 +96,7 @@
{"totalchargeadaptive",0,0,11},
{"plot",optional_argument,0,12},
{"plotderivations",optional_argument,0,13},
@@ -15,8 +15,8 @@
{"import",0,0,14},
{"correctseconds",0,0,'c'},
{"seconds",0,0,'s'},
-@@ -254,7 +255,8 @@
- cout << " --totalchargeadaptive show adaptive total charge" << endl;
+@@ -265,7 +266,8 @@
+ cout << " [and lower it to value <lim> or diable <0> it]" << endl;
cout << " --plot[=profiles] use gnuplot to plot battery and charge graphs" << endl;
cout << " and plot the last <profiles> additional profiles" << endl;
- cout << " --plotderivations[=profiles] same as above plus standard derivations" << endl;
diff --git a/debian/patches/03acpi-check.dpatch b/debian/patches/03-acpi-check.patch
similarity index 73%
rename from debian/patches/03acpi-check.dpatch
rename to debian/patches/03-acpi-check.patch
index 7a688fe..3ee9142 100644
--- a/debian/patches/03acpi-check.dpatch
+++ b/debian/patches/03-acpi-check.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03acpi-check.dpatch by Martin Wuertele <m...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: change detection for sysfs and sysfs variable names for 2.6.30+ kernels
+From: Martin Wuertele <m...@debian.org>
+Subject: change detection for sysfs and sysfs variable names for 2.6.30+ kernels
-@DPATCH@
--- ibam-0.5.2/ibam.inl.orig 2010-01-03 12:17:10.000000000 +0100
+++ ibam-0.5.2/ibam.inl 2010-01-03 12:17:19.000000000 +0100
@@ -945,7 +945,7 @@
diff --git a/debian/patches/05_sysfs_lenovo.dpatch b/debian/patches/05-sysfs-lenovo.patch
similarity index 89%
rename from debian/patches/05_sysfs_lenovo.dpatch
rename to debian/patches/05-sysfs-lenovo.patch
index 1da897f..1a4e756 100644
--- a/debian/patches/05_sysfs_lenovo.dpatch
+++ b/debian/patches/05-sysfs-lenovo.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_sysfs_lenovo.dpatch by Martin Wuertele <m...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: add lenovo sysfs detection
+From: Martin Wuertele <m...@debian.org>
+Subject: add lenovo sysfs detection
-@DPATCH@
--- ibam-0.5.2/ibam.inl.orig 2011-02-15 21:42:39.000000000 +0100
+++ ibam-0.5.2/ibam.inl 2011-02-15 21:41:08.000000000 +0100
diff --git a/debian/patches/10-makefile.patch b/debian/patches/10-makefile.patch
new file mode 100644
index 0000000..4bad5cc
--- /dev/null
+++ b/debian/patches/10-makefile.patch
@@ -0,0 +1,18 @@
+From: Jari Aalto <jari.aa...@cante.net>
+Subject: Remove linked option -Wl which doesn't make sense alone
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/Makefile
++++ b/Makefile
+@@ -35,7 +35,7 @@
+ krell: ibam-krell.so
+
+ ibam-krell.so: ibam-krell.o
+- $(CC) $(CFLAGS) -fPIC -shared -Wl -o ibam-krell.so ibam-krell.o
++ $(CC) $(CFLAGS) -fPIC -shared -o ibam-krell.so ibam-krell.o
+
+ ibam-krell.o: ibam-krell.cpp ibam.hpp ibam.inl
+ $(CC) $(CFLAGS) -fPIC `pkg-config gtk+-2.0 --cflags` `gdk-pixbuf-config --cflags` -c ibam-krell.cpp
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..32954a2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+02-deviation.patch
+03-acpi-check.patch
+05-sysfs-lenovo.patch
+10-makefile.patch
diff --git a/debian/patches/04sysfs.dpatch b/debian/patches/unused/04-sysfs.patch
similarity index 89%
rename from debian/patches/04sysfs.dpatch
rename to debian/patches/unused/04-sysfs.patch
index fe9e567..323c67f 100644
--- a/debian/patches/04sysfs.dpatch
+++ b/debian/patches/unused/04-sysfs.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04sysfs.dpatch by Martin Wuertele <m...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: consider energy_* and current_* in sysfs
+From: Martin Wuertele <m...@debian.org>
+Subject: consider energy_* and current_* in sysfs
-@DPATCH@
--- ibam-0.5.2/ibam.inl 2010-12-10 11:34:38.584151204 +0100
+++ ibam-0.5.2/ibam.inl.orig 2010-12-10 11:29:43.151172174 +0100
diff --git a/debian/rules b/debian/rules
index 331b93f..c591761 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,11 +20,11 @@ else
CFLAGS += -O2
endif
-# call dpatch
-include /usr/share/dpatch/dpatch.make
+build-arch: build
+build-indep: build
build: build-stamp
-build-stamp: patch
+build-stamp:
dh_testdir
# Add here commands to compile the package.
@@ -33,9 +33,7 @@ build-stamp: patch
touch build-stamp
-clean: clean1 unpatch
-
-clean1:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
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..011f870
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+http://sf.net/ibam/ibam-(.+)\.tar\.gz
+
--
1.7.9.5
--- End Message ---
