Package: yorick-soy
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 8a16b5d88e3507725d792eb5deb5533966d374d4 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Wed, 29 Feb 2012 13:24:55 -0500
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/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 1 -
.../patches/{01_checki.dpatch => 01_checki.patch} | 8 ++------
debian/patches/series | 1 +
debian/rules | 10 ++++------
debian/source/format | 1 +
8 files changed, 19 insertions(+), 16 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_checki.dpatch => 01_checki.patch} (54%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 8e3aef7..0af44b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+yorick-soy (1.2.01-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.
+
+ -- Jari Aalto <[email protected]> Wed, 29 Feb 2012 13:21:16 -0500
+
yorick-soy (1.2.01-2) unstable; urgency=low
* debian/control:
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 c175cf4..fdaaa93 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: yorick-soy
Section: math
Priority: optional
Maintainer: Thibaut Paumard <[email protected]>
-Build-Depends: debhelper (>= 5.0.0), yorick-dev (>= 2.1.05+dfsg-2~bpo40+1), dpatch
-Standards-Version: 3.7.3.0
+Build-Depends: debhelper (>= 9), yorick-dev (>= 2.1.05+dfsg-2~bpo40+1)
+Standards-Version: 3.9.3
XS-DM-Upload-Allowed: yes
Package: yorick-soy
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 6fe2700..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01_checki
diff --git a/debian/patches/01_checki.dpatch b/debian/patches/01_checki.patch
similarity index 54%
rename from debian/patches/01_checki.dpatch
rename to debian/patches/01_checki.patch
index 4696174..233015e 100644
--- a/debian/patches/01_checki.dpatch
+++ b/debian/patches/01_checki.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_checki.dpatch by Thibaut Paumard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Change soy/soy.i to soy.i in check.i
+From: Thibaut Paumard <[email protected]>
+Subject: Change soy/soy.i to soy.i in check.i
-@DPATCH@
diff -urN orig/check.i tp/check.i
--- orig/check.i 2006-05-11 22:50:14.237782544 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6fffc8b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_checki.patch
diff --git a/debian/rules b/debian/rules
index 194582f..8eebbe6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,14 +9,13 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
Makefile:
yorick -batch make.i
configure: configure-stamp
-configure-stamp: patch-stamp Makefile
+configure-stamp: Makefile
dh_testdir
touch configure-stamp
@@ -27,12 +26,11 @@ build-stamp: configure-stamp
$(MAKE)
touch build-stamp
-clean: clean-patched unpatch
-clean-patched: Makefile
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
- $(MAKE) clean
+ -$(MAKE) clean
-rm Makefile
dh_clean
@@ -59,4 +57,4 @@ binary-arch: build install
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean clean-patched binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install configure
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)
--
1.7.9
