Package: wyrd
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 4d4162cf789b08ed4130792f881bcc6a46e6378a Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Tue, 24 Apr 2012 00:25:10 +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/changelog | 11 +++++++++++
debian/compat | 2 +-
debian/control | 6 +++---
debian/copyright | 2 +-
debian/doc-base | 2 +-
debian/patches/00list | 1 -
debian/patches/{01_editor.dpatch => 01-editor.patch} | 18 +++++++++---------
debian/patches/series | 1 +
debian/rules | 1 -
debian/source/format | 1 +
10 files changed, 28 insertions(+), 17 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_editor.dpatch => 01-editor.patch} (66%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index b4d7dfe..15b6de1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+wyrd (1.4.4-1.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.
+ * Patch 01: update with "quilt refresh" to make it apply cleanly.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix doc-base-unknown-section (Lintian); set to Office.
+
+ -- Jari Aalto <jari.aa...@cante.net> Tue, 24 Apr 2012 00:24:51 +0300
+
wyrd (1.4.4-1) unstable; urgency=low
* New upstream release that address temporary file vulnerability
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 545f2c3..637e406 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: wyrd
Section: utils
Priority: optional
Maintainer: Kevin Coyner <kcoy...@debian.org>
-Build-Depends: debhelper (>= 5.0), autotools-dev, camlp4, cdbs (>=0.4.39), remind (>= 03.00.24), dpatch, libncursesw5-dev
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 9), autotools-dev, camlp4, cdbs (>=0.4.39), remind (>= 03.00.24), libncursesw5-dev
+Standards-Version: 3.9.3
Homepage: http://pessimization.com/software/wyrd/
Package: wyrd
Architecture: any
-Depends: ${shlibs:Depends}, remind (>= 03.00.24), less
+Depends: ${misc:Depends}, ${shlibs:Depends}, remind (>= 03.00.24), less
Description: text-based calendar application
Wyrd acts as an ncurses-based frontend for remind, a scheduler
application featuring sophisticated date calculation, moon phases,
diff --git a/debian/copyright b/debian/copyright
index 274e5a2..3a3a626 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -23,4 +23,4 @@ License:
Foundation, 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
On Debian 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/doc-base b/debian/doc-base
index 5092cd9..4a94ec6 100644
--- a/debian/doc-base
+++ b/debian/doc-base
@@ -3,7 +3,7 @@ Title: Wyrd Usage and Configuration Manual
Author: Paul Pelzl <pelz...@eecs.umich.edu>
Abstract: This manual describes the usage and configuration of wyrd
the free text-based scheduler application
-Section: Apps/Tools
+Section: Office
Format: HTML
Index: /usr/share/doc/wyrd/manual.html
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index f1ecb67..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01_editor
diff --git a/debian/patches/01_editor.dpatch b/debian/patches/01-editor.patch
similarity index 66%
rename from debian/patches/01_editor.dpatch
rename to debian/patches/01-editor.patch
index 48b71e2..d8ec55f 100644
--- a/debian/patches/01_editor.dpatch
+++ b/debian/patches/01-editor.patch
@@ -1,16 +1,16 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_editor_patch.dpatch by Kevin Coyner <kcoy...@debian.org>
-## Original diff by Frank Terbeck
-##
-## DP: editorpatch
+From: Kevin Coyner <kcoy...@debian.org>
+Subject: editorpatch
-@DPATCH@
---- wyrd-1.4.1.orig/wyrdrc 2006-11-27 11:42:27.000000000 +0100
-+++ wyrd-1.4.1/wyrdrc 2006-11-27 11:42:35.000000000 +0100
+---
+ wyrdrc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/wyrdrc
++++ b/wyrdrc
@@ -5,11 +5,11 @@
# the default reminder file to display
- set reminders_file="~/.reminders"
+ set reminders_file="$HOME/.reminders"
# command for editing an old appointment, given a line number %line% and filename %file%
-set edit_old_command="$EDITOR +%line% %file%"
+set edit_old_command="${VISUAL:-$EDITOR} +%line% %file%"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e1eb9c0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-editor.patch
diff --git a/debian/rules b/debian/rules
index 97e94d7..2ee9882 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
DEB_CONFIGURE_EXTRA_FLAGS = --enable-utf8
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.10
