Hi,

I've collected and tested the patch applied by Ubuntu.
It could be useful in the meantime the package will be updated with the upstream version.

Erwan.
diff -Naur a/debian/patches/01_editor.dpatch b/debian/patches/01_editor.dpatch
--- a/debian/patches/01_editor.dpatch	2014-08-21 11:18:05.109832955 +0200
+++ b/debian/patches/01_editor.dpatch	2014-08-21 11:29:41.145795962 +0200
@@ -10,7 +10,7 @@
 +++ wyrd-1.4.1/wyrdrc	2006-11-27 11:42:35.000000000 +0100
 @@ -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 -Naur a/debian/patches/02_fix-ftbfs-ocaml-4.patch b/debian/patches/02_fix-ftbfs-ocaml-4.patch
--- a/debian/patches/02_fix-ftbfs-ocaml-4.patch	1970-01-01 01:00:00.000000000 +0100
+++ b/debian/patches/02_fix-ftbfs-ocaml-4.patch	2014-08-21 11:39:19.529765221 +0200
@@ -0,0 +1,36 @@
+From: Paul Pelzl
+Subject: fix 'configure' test which incorrectly rejected OCaml 4 
+ .
+ Patch not needed for wyrd >= 1.4.6
+ .
+Origin: upstream, http://bazaar.launchpad.net/~pelzlpj/wyrd/wyrd-dev/revision/304
+Bug-Ubuntu: https://launchpad.net/bugs/1281275
+Bug-Debian: http://bugs.debian.org/735832
+
+---
+ configure    |    2 +-
+ configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/configure.in
++++ b/configure.in
+@@ -63,7 +63,7 @@
+ OCAMLMINORVERSION=`echo $OCAMLVERSION | cut -d '.' -f 2`
+ if test $OCAMLMAJORVERSION -lt 3 ; then
+    AC_MSG_ERROR(Wyrd requires OCaml version 3.08 or greater.)
+-else
++elif test $OCAMLMAJORVERSION -eq 3; then
+    if test $OCAMLMINORVERSION -lt 8 ; then
+       AC_MSG_ERROR(Wyrd requires OCaml version 3.08 or greater.)
+    fi
+--- a/configure
++++ b/configure
+@@ -1724,7 +1724,7 @@
+    { { echo "$as_me:$LINENO: error: Wyrd requires OCaml version 3.08 or greater." >&5
+ echo "$as_me: error: Wyrd requires OCaml version 3.08 or greater." >&2;}
+    { (exit 1); exit 1; }; }
+-else
++elif test $OCAMLMAJORVERSION -eq 3; then
+    if test $OCAMLMINORVERSION -lt 8 ; then
+       { { echo "$as_me:$LINENO: error: Wyrd requires OCaml version 3.08 or greater." >&5
+ echo "$as_me: error: Wyrd requires OCaml version 3.08 or greater." >&2;}
diff -Naur a/debian/patches/series b/debian/patches/series
--- a/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ b/debian/patches/series	2014-08-21 11:20:54.249823966 +0200
@@ -0,0 +1,2 @@
+01_editor.dpatch
+02_fix-ftbfs-ocaml-4.patch
diff -Naur a/debian/rules b/debian/rules
--- a/debian/rules	2014-08-21 11:18:05.105832956 +0200
+++ b/debian/rules	2014-08-21 11:19:09.873829513 +0200
@@ -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 -Naur a/debian/source/format b/debian/source/format
--- a/debian/source/format	1970-01-01 01:00:00.000000000 +0100
+++ b/debian/source/format	2014-08-21 11:21:50.185820993 +0200
@@ -0,0 +1 @@
+3.0 (quilt)

Reply via email to