Merge lp:~l3on/ubuntu/trusty/wyrd/ftbfs-1281275 into lp:ubuntu/trusty/wyrd

[Leo Iannacone]

* Use quilt instead of dpatch (deprecated):
    + added debian/source/format 3.0 quilt
    + removed include dpatch.mk from debian/rules
  * Imported patch from upstream to fix FTBFS with
    Ocalm 4: 02_fix-ftbfs-ocaml-4.patch (LP: #1281275)
  * Refreshed 01_editor.dpatch

[Martin Pitt (pitti)]

Thanks! Uploaded.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2008-02-22 16:30:36 +0000
+++ debian/changelog	2014-03-02 21:48:11 +0000
@@ -1,3 +1,14 @@
+wyrd (1.4.4-1ubuntu1) trusty; urgency=medium
+
+  * Use quilt instead of dpatch (deprecated):
+    + added debian/source/format 3.0 quilt
+    + removed include dpatch.mk from debian/rules
+  * Imported patch from upstream to fix FTBFS with
+    Ocalm 4: 02_fix-ftbfs-ocaml-4.patch (LP: #1281275)
+  * Refreshed 01_editor.dpatch
+
+ -- Leo Iannacone <[e-mail]>  Sun, 02 Mar 2014 22:41:48 +0100
+
 wyrd (1.4.4-1) unstable; urgency=low
 
   * New upstream release that address temporary file vulnerability

=== modified file 'debian/patches/01_editor.dpatch'
--- debian/patches/01_editor.dpatch	2007-09-15 14:08:57 +0000
+++ debian/patches/01_editor.dpatch	2014-03-02 21:48:11 +0000
@@ -6,11 +6,15 @@
 
 @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%"

=== added file 'debian/patches/02_fix-ftbfs-ocaml-4.patch'
--- debian/patches/02_fix-ftbfs-ocaml-4.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/02_fix-ftbfs-ocaml-4.patch	2014-03-02 21:48:11 +0000
@@ -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;}

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2014-03-02 21:48:11 +0000
@@ -0,0 +1,2 @@
+01_editor.dpatch
+02_fix-ftbfs-ocaml-4.patch

=== modified file 'debian/rules'
--- debian/rules	2008-02-22 16:30:36 +0000
+++ debian/rules	2014-03-02 21:48:11 +0000
@@ -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
 

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2014-03-02 21:48:11 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)