Package: gkrellm-x86info
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 33abcf0947e013cc39b703f57d067fcc73ea653d Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 21 Apr 2012 15:29:38 +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 | 12 ++++++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/copyright | 4 +++-
debian/patches/00list | 2 --
...{01_gcc-options.dpatch => 01-gcc-options.patch} | 8 ++------
...gkrellm2-port.dpatch => 02-gkrellm2-port.patch} | 8 ++------
.../{03_makefile.dpatch => 03-makefile.patch} | 8 ++------
...h_x86info.dpatch => 04-sync-with-x86info.patch} | 8 ++------
debian/patches/series | 2 ++
debian/rules | 17 ++++++-----------
debian/source/format | 2 +-
13 files changed, 35 insertions(+), 44 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01_gcc-options.dpatch => 01-gcc-options.patch} (70%)
rename debian/patches/{02_gkrellm2-port.dpatch => 02-gkrellm2-port.patch} (88%)
rename debian/patches/{03_makefile.dpatch => 03-makefile.patch} (90%)
rename debian/patches/{04_sync_with_x86info.dpatch => 04-sync-with-x86info.patch} (91%)
create mode 100644 debian/patches/series
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 8dae469..4d8db2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+gkrellm-x86info (0.0.2-9.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.
+ * Add to copyright note about dead URL and successor of gkx86info.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix diff-contains-substvars (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 21 Apr 2012 15:29:24 +0300
+
gkrellm-x86info (0.0.2-9) unstable; urgency=low
* sync MHz.c with x86info 1.25
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 b9519b8..4b60a5c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
Source: gkrellm-x86info
Section: x11
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.2
+Standards-Version: 3.9.3
Package: gkrellm-x86info
Architecture: i386 amd64
diff --git a/debian/copyright b/debian/copyright
index 48fe7b6..94fa17e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,8 @@
This package was debianized by Martin Wuertele m...@debian.org on Sat, 13 Jul 2002 19:38:46 +0200.
It was downloaded from: http://asdfnews.org/yargon/
+as gkx86info0.0.2.tar.gz. The URL as of 2012-04-21 no longer exists.
+Improved version is at http://code.google.com/p/gkrellm-gkfreq
Upstream Author: Jake Richardson <j...@asdfnews.org>
@@ -21,5 +23,5 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, 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 935bec4..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-02_gkrellm2-port.dpatch
-03_makefile.dpatch
diff --git a/debian/patches/01_gcc-options.dpatch b/debian/patches/01-gcc-options.patch
similarity index 70%
rename from debian/patches/01_gcc-options.dpatch
rename to debian/patches/01-gcc-options.patch
index e657dfe..d4bad33 100644
--- a/debian/patches/01_gcc-options.dpatch
+++ b/debian/patches/01-gcc-options.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_gcc-options.dpatch by Martin Wuertele <m...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: replace gcc with $GCC and honor CFLAGS and DEB_BUILD_OPTIONS
+From: Martin Wuertele <m...@debian.org>
+Subject: replace gcc with $GCC and honor CFLAGS and DEB_BUILD_OPTIONS
-@DPATCH@
--- build.orig 2001-10-06 06:35:45.000000000 +0200
+++ ../build 2010-01-01 19:39:51.000000000 +0100
@@ -1,5 +1,6 @@
diff --git a/debian/patches/02_gkrellm2-port.dpatch b/debian/patches/02-gkrellm2-port.patch
similarity index 88%
rename from debian/patches/02_gkrellm2-port.dpatch
rename to debian/patches/02-gkrellm2-port.patch
index b866ec3..50398a8 100644
--- a/debian/patches/02_gkrellm2-port.dpatch
+++ b/debian/patches/02-gkrellm2-port.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_gkrellm2-port.dpatch by Francois Barde <anch...@free.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Port gkrellm-x86info from gkrellm to gkrellm2
+From: Francois Barde <anch...@free.fr>
+Subject: Port gkrellm-x86info from gkrellm to gkrellm2
-@DPATCH@
--- gkx86info.c.orig 2001-10-06 06:44:27.000000000 +0200
+++ ../gkx86info.c 2010-01-01 19:39:51.000000000 +0100
@@ -7,18 +7,18 @@
diff --git a/debian/patches/03_makefile.dpatch b/debian/patches/03-makefile.patch
similarity index 90%
rename from debian/patches/03_makefile.dpatch
rename to debian/patches/03-makefile.patch
index 00c0365..1ea425a 100644
--- a/debian/patches/03_makefile.dpatch
+++ b/debian/patches/03-makefile.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_makefile.dpatch by Martin Wuertele <m...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add Makefile
+From: Martin Wuertele <m...@debian.org>
+Subject: Add Makefile
-@DPATCH@
--- gkrellm-x86info-0.0.2.orig/Makefile
+++ gkrellm-x86info-0.0.2/Makefile
@@ -0,0 +1,57 @@
diff --git a/debian/patches/04_sync_with_x86info.dpatch b/debian/patches/04-sync-with-x86info.patch
similarity index 91%
rename from debian/patches/04_sync_with_x86info.dpatch
rename to debian/patches/04-sync-with-x86info.patch
index fc14bb6..8c522fe 100644
--- a/debian/patches/04_sync_with_x86info.dpatch
+++ b/debian/patches/04-sync-with-x86info.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_sync_with_x86info.dpatch by Martin Wuertele <m...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: updates MHz.c for recent processors
+From: Martin Wuertele <m...@debian.org>
+Subject: updates MHz.c for recent processors
-@DPATCH@
--- MHz.c 2010-01-02 20:27:46.000000000 +0100
+++ /tmp/x86info-1.25/bench/MHz.c 2009-10-30 16:59:46.000000000 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..127460f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+02-gkrellm2-port.patch
+03-makefile.patch
diff --git a/debian/rules b/debian/rules
index 08a76ec..e1ca97c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# Include dpatch stuff.
-include /usr/share/dpatch/dpatch.make
-
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -21,9 +18,11 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
+build-arch: build
+build-indep: build
build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
@echo "--- Compiling"
dh_testdir
@@ -32,20 +31,16 @@ build-stamp: patch-stamp
touch build-stamp
-clean: clean1 unpatch clean2
-clean1:
+clean:
@echo "--- Cleaning"
dh_testdir
dh_testroot
dh_clean
- rm -f build-stamp
+ rm -f build-stamp debian/substvars
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) clean
-clean2:
- [ ! -f Makefile ] || rm -f Makefile
-
install: build-stamp
dh_testdir
dh_testroot
@@ -93,4 +88,4 @@ binary-arch: build install
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: binary clean binary-indep binary-arch build install patch unpatch clean1
+.PHONY: binary clean binary-indep binary-arch build install clean1
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
--
1.7.9.5
