Package: firestring
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 21aba0e30b73b41e7501a8b7164ffe5d579b84f2 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Mon, 27 Feb 2012 15:27:23 -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-id-fix.dpatch => 01-id-fix.patch} | 7 ++-----
debian/patches/series | 1 +
debian/rules | 5 ++---
debian/source/format | 1 +
8 files changed, 17 insertions(+), 12 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01-id-fix.dpatch => 01-id-fix.patch} (89%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 86cd5f5..1161f21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+firestring (0.9.12-8.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]> Mon, 27 Feb 2012 15:25:43 -0500
+
firestring (0.9.12-8) unstable; urgency=low
* New maintainer (Closes #407546).
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 fbe29a6..730abc2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: firestring
Section: libs
Priority: optional
Maintainer: Herve Rousseau <[email protected]>
-Build-Depends: debhelper (>= 5), dpatch
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Package: libfirestring0.9
Section: libs
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 618ff76..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01-id-fix.dpatch
diff --git a/debian/patches/01-id-fix.dpatch b/debian/patches/01-id-fix.patch
similarity index 89%
rename from debian/patches/01-id-fix.dpatch
rename to debian/patches/01-id-fix.patch
index 9d4ae13..48128d4 100644
--- a/debian/patches/01-id-fix.dpatch
+++ b/debian/patches/01-id-fix.patch
@@ -1,9 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 01-id-fix.dpatch by Andres Salomon <[email protected]>
-##
-## DP: Disable id check during build, since it's unnecessary.
+From: Andres Salomon <[email protected]>
+Subject: Disable id check during build, since it's unnecessary.
-@DPATCH@
diff -Naur firestring-0.9.12.orig/firemake/id firestring-0.9.12/firemake/id
--- firestring-0.9.12.orig/firemake/id 2003-05-15 16:24:41.000000000 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..63023ed
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-id-fix.patch
diff --git a/debian/rules b/debian/rules
index fa06457..6e60f1e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
CFLAGS = -Wall -g
@@ -13,7 +12,7 @@ else
CFLAGS += -O2
endif
-config.status: configure patch-stamp
+config.status: configure
dh_testdir
# Configuring package
@@ -28,7 +27,7 @@ build-stamp: config.status
touch build-stamp
-clean: unpatch
+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)
--
1.7.9
