Package: coldfire
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 2d412fd6d12d443f354b34500a9b0938cd4306ec Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 17 Mar 2012 11:22:48 -0400
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/changelog | 9 ++++++
debian/compat | 2 +-
debian/control | 4 +-
debian/patches/00list | 1 -
...{01_lvalue_cast.dpatch => 01_lvalue_cast.patch} | 10 ++-----
debian/patches/10_run.patch | 19 +++++++++++++
debian/patches/series | 2 +
debian/rules | 29 +++----------------
debian/source/format | 1 +
run.c | 2 +-
10 files changed, 43 insertions(+), 36 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_lvalue_cast.dpatch => 01_lvalue_cast.patch} (73%)
create mode 100644 debian/patches/10_run.patch
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index f1df868..0064890 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+coldfire (0.2.2-2.4) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ Convert in-line patches to individual debian/patches: 10.
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto <jari.aa...@cante.net> Mon, 27 Feb 2012 12:27:25 -0500
+
coldfire (0.2.2-2.3) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index b8626c4..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+9
diff --git a/debian/control b/debian/control
index 0a749ca..c5d6a4a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: coldfire
Section: otherosfs
Priority: optional
Maintainer: Claudio Matsuoka <clau...@mandriva.com>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, libncurses5-dev, libreadline-dev, docbook-to-man, dpatch
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 9), autotools-dev, libncurses5-dev, libreadline-dev, docbook-to-man
+Standards-Version: 3.9.3
Package: coldfire
Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index dc76821..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01_lvalue_cast.dpatch
diff --git a/debian/patches/01_lvalue_cast.dpatch b/debian/patches/01_lvalue_cast.patch
similarity index 73%
rename from debian/patches/01_lvalue_cast.dpatch
rename to debian/patches/01_lvalue_cast.patch
index bec71f7..7308c72 100644
--- a/debian/patches/01_lvalue_cast.dpatch
+++ b/debian/patches/01_lvalue_cast.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_lvalue_cast.dpatch by Claudio Matsuoka <clau...@mandriva.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Addresses lvalue typecast warning in gcc 3.3 and allows build with gcc
-## DP: 4.0
+From: Claudio Matsuoka <clau...@mandriva.com>
+Subject: Addresses lvalue typecast warning in gcc 3.3 and allows build with gcc
+4.0
-@DPATCH@
diff -rud coldfire-0.2.2-orig/i_5206e/i_div.c coldfire-0.2.2/i_5206e/i_div.c
--- coldfire-0.2.2-orig/i_5206e/i_div.c 2004-02-20 03:26:38.000000000 -0300
diff --git a/debian/patches/10_run.patch b/debian/patches/10_run.patch
new file mode 100644
index 0000000..708c306
--- /dev/null
+++ b/debian/patches/10_run.patch
@@ -0,0 +1,19 @@
+From: Claudio Matsuoka <clau...@mandriva.com>
+Subject: fix include
+
+ run.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/run.c b/run.c
+index 2d37bb7..1546b5e 100644
+--- a/run.c
++++ b/run.c
+@@ -6,7 +6,7 @@
+ /* */
+ /**********************************/
+
+-
++#include "config.h"
+
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9a6e114
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01_lvalue_cast.patch
+10_run.patch
diff --git a/debian/rules b/debian/rules
index 0da07d4..0b31dc0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,9 +9,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# For dpatch
-.NOTPARALLEL:
-
# 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)
@@ -26,8 +23,10 @@ else
CFLAGS += -O2
endif
-config.status: patch configure
+config.status: configure
dh_testdir
+ cp -f /usr/share/misc/config.sub config.sub
+ cp -f /usr/share/misc/config.guess config.guess
# Add here commands to configure the package.
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
@@ -43,43 +42,25 @@ build-stamp: config.status
touch build-stamp
-clean: clean-patched unpatch
-
-clean-patched:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
-
+ rm -f config.guess config.sub
# Add here commands to clean up after the build process.
-$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
rm -f coldfire.1
rm -f ./i_5307/Makefile
dh_clean
-patch: patch-stamp
-
-patch-stamp:
- dpatch apply-all
- dpatch cat-all >patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
install: build
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
-
# Add here commands to install the package into debian/coldfire.
$(MAKE) install prefix=$(CURDIR)/debian/coldfire/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/run.c b/run.c
index 1546b5e..2d37bb7 100644
--- a/run.c
+++ b/run.c
@@ -6,7 +6,7 @@
/* */
/**********************************/
-#include "config.h"
+
#include <stdio.h>
#include <stdlib.h>
--
1.7.9.1
