From 93248791e35dd28a73bf98802bebfc5fef50f1fe Mon Sep 17 00:00:00 2001
From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Mon, 23 May 2016 20:35:13 +0200
Subject: [PATCH] added support of taskwarrior 2.5

---
 NEWS          |   2 +-
 NEWS.html     |   4 +-
 config.status |  48 +++++++++---------
 po/fr.gmo     | Bin 890 -> 453 bytes
 po/fr.po      | 157 +++++++++++-----------------------------------------------
 po/ptask.pot  | 145 +++--------------------------------------------------
 src/tw.c      |   3 +-
 7 files changed, 65 insertions(+), 294 deletions(-)

diff --git a/NEWS b/NEWS
index 42dd54a..0aa08b0 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,7 @@ What's New
 
 v1.0.0
 ------
- * allowed 2.4.0 and 2.4.1 release of taskwarrior.
+ * allowed 2.4.0, 2.4.1 and 2.5 release of taskwarrior.
  * added keywords in the desktop file.
  * added a command line option to force usage of an unsupported
    version of taskwarrior (risk of malfunction like damaging data).
diff --git a/NEWS.html b/NEWS.html
index b169456..75bf500 100644
--- a/NEWS.html
+++ b/NEWS.html
@@ -325,7 +325,7 @@ asciidoc.install();
 <div class="ulist"><ul>
 <li>
 <p>
-allowed 2.4.0 and 2.4.1 release of taskwarrior.
+allowed 2.4.0, 2.4.1 and 2.5 release of taskwarrior.
 </p>
 </li>
 <li>
@@ -646,7 +646,7 @@ Initial release.
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2015-06-24 22:14:21 CEST
+ 2016-05-23 20:34:41 CEST
 </div>
 </div>
 </body>
diff --git a/config.status b/config.status
index 53960b6..317250a 100755
--- a/config.status
+++ b/config.status
@@ -380,7 +380,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ptask $as_me 0.0.9, which was
+This file was extended by ptask $as_me 1.0.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -428,9 +428,9 @@ $config_commands
 Report bugs to <jeanfi@gmail.com>.
 ptask home page: <http://wpitchoune.net/ptask>."
 
-ac_cs_config=""
+ac_cs_config="'--prefix=/tmp'"
 ac_cs_version="\
-ptask config.status 0.0.9
+ptask config.status 1.0.0
 configured by ./configure, generated by GNU Autoconf 2.69,
   with options \"$ac_cs_config\"
 
@@ -438,7 +438,7 @@ Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
-ac_pwd='/home/jporsini/work.local/ptask'
+ac_pwd='/home/jporsini/work/ptask'
 srcdir='.'
 INSTALL='/usr/bin/install -c'
 MKDIR_P='/bin/mkdir -p'
@@ -520,7 +520,7 @@ if $ac_cs_silent; then
 fi
 
 if $ac_cs_recheck; then
-  set X /bin/bash './configure'  $ac_configure_extra_args --no-create --no-recursion
+  set X /bin/bash './configure'  '--prefix=/tmp' $ac_configure_extra_args --no-create --no-recursion
   shift
   $as_echo "running CONFIG_SHELL=/bin/bash $*" >&6
   CONFIG_SHELL='/bin/bash'
@@ -684,17 +684,17 @@ S["gsettingsschemadir"]="${datarootdir}/glib-2.0/schemas"
 S["GSETTINGS_DISABLE_SCHEMAS_COMPILE"]=""
 S["JSON_FALSE"]="#"
 S["JSON_TRUE"]=""
-S["JSON_LIBS"]="-ljson-c "
-S["JSON_CFLAGS"]="-I/usr/include/json-c "
-S["GTK_LIBS"]="-lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 "
+S["JSON_LIBS"]="-ljson-c"
+S["JSON_CFLAGS"]="-I/usr/include/json-c"
+S["GTK_LIBS"]="-lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0"
 S["GTK_CFLAGS"]="-pthread -I/usr/include/gtk-3.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1."\
-"0/include -I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/mirclient -I/usr/include/mircommon -I/usr/include/cairo -I/usr/include/"\
-"pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freety"\
-"pe2 -I/usr/include/libpng12 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng12 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/inclu"\
-"de  -DGTK_DISABLE_SINGLE_INCLUDES  -DGDK_DISABLE_DEPRECATED  -DGSEAL_ENABLE "
-S["XEXT_LIBS"]="-lXext "
+"0/include -I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/mirclient -I/usr/include/mircommon -I/usr/include/mircookie -I/usr/incl"\
+"ude/cairo -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixma"\
+"n-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng12 -I/usr/include/glib-2.0 -I/usr/lib/x86_64"\
+"-linux-gnu/glib-2.0/include -DGTK_DISABLE_SINGLE_INCLUDES  -DGDK_DISABLE_DEPRECATED  -DGSEAL_ENABLE "
+S["XEXT_LIBS"]="-lXext"
 S["XEXT_CFLAGS"]=""
-S["X11_LIBS"]="-lX11 "
+S["X11_LIBS"]="-lX11"
 S["X11_CFLAGS"]=""
 S["PKG_CONFIG_LIBDIR"]=""
 S["PKG_CONFIG_PATH"]=""
@@ -727,7 +727,7 @@ S["MSGFMT"]="/usr/bin/msgfmt"
 S["GETTEXT_MACRO_VERSION"]="0.19"
 S["USE_NLS"]="yes"
 S["SED"]="/bin/sed"
-S["CPP"]="gcc -std=gnu99 -E"
+S["CPP"]="gcc -E"
 S["XMKMF"]=""
 S["am__fastdepCC_FALSE"]="#"
 S["am__fastdepCC_TRUE"]=""
@@ -745,7 +745,7 @@ S["ac_ct_CC"]="gcc"
 S["CPPFLAGS"]=""
 S["LDFLAGS"]=""
 S["CFLAGS"]="-g -O2"
-S["CC"]="gcc -std=gnu99"
+S["CC"]="gcc"
 S["AM_BACKSLASH"]="\\"
 S["AM_DEFAULT_VERBOSITY"]="1"
 S["AM_DEFAULT_V"]="$(AM_DEFAULT_VERBOSITY)"
@@ -760,13 +760,13 @@ S["mkdir_p"]="$(MKDIR_P)"
 S["MKDIR_P"]="/bin/mkdir -p"
 S["INSTALL_STRIP_PROGRAM"]="$(install_sh) -c -s"
 S["STRIP"]=""
-S["install_sh"]="${SHELL} /home/jporsini/work.local/ptask/install-sh"
+S["install_sh"]="${SHELL} /home/jporsini/work/ptask/install-sh"
 S["MAKEINFO"]="makeinfo"
 S["AUTOHEADER"]="autoheader"
 S["AUTOMAKE"]="automake-1.14"
 S["AUTOCONF"]="autoconf"
 S["ACLOCAL"]="aclocal-1.14"
-S["VERSION"]="0.0.9"
+S["VERSION"]="1.0.0"
 S["PACKAGE"]="ptask"
 S["CYGPATH_W"]="echo"
 S["am__isrc"]=""
@@ -801,12 +801,12 @@ S["libexecdir"]="${exec_prefix}/libexec"
 S["sbindir"]="${exec_prefix}/sbin"
 S["bindir"]="${exec_prefix}/bin"
 S["program_transform_name"]="s,x,x,"
-S["prefix"]="/usr/local"
+S["prefix"]="/tmp"
 S["exec_prefix"]="${prefix}"
 S["PACKAGE_URL"]="http://wpitchoune.net/ptask"
 S["PACKAGE_BUGREPORT"]="jeanfi@gmail.com"
-S["PACKAGE_STRING"]="ptask 0.0.9"
-S["PACKAGE_VERSION"]="0.0.9"
+S["PACKAGE_STRING"]="ptask 1.0.0"
+S["PACKAGE_VERSION"]="1.0.0"
 S["PACKAGE_TARNAME"]="ptask"
 S["PACKAGE_NAME"]="ptask"
 S["PATH_SEPARATOR"]=":"
@@ -854,12 +854,12 @@ cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 D["PACKAGE_NAME"]=" \"ptask\""
 D["PACKAGE_TARNAME"]=" \"ptask\""
-D["PACKAGE_VERSION"]=" \"0.0.9\""
-D["PACKAGE_STRING"]=" \"ptask 0.0.9\""
+D["PACKAGE_VERSION"]=" \"1.0.0\""
+D["PACKAGE_STRING"]=" \"ptask 1.0.0\""
 D["PACKAGE_BUGREPORT"]=" \"jeanfi@gmail.com\""
 D["PACKAGE_URL"]=" \"http://wpitchoune.net/ptask\""
 D["PACKAGE"]=" \"ptask\""
-D["VERSION"]=" \"0.0.9\""
+D["VERSION"]=" \"1.0.0\""
 D["ENABLE_NLS"]=" 1"
 D["HAVE_GETTEXT"]=" 1"
 D["HAVE_DCGETTEXT"]=" 1"
diff --git a/po/fr.gmo b/po/fr.gmo
index ae7d8651224e849b9c8f937c76c8a26d825e6d78..d1e9bf6e68f5f9a755f93897601f1e672eec622e 100644
GIT binary patch
delta 84
zcmeyxc9hxTo)F7a1|VPrVi_P-0b*t#)&XJ=umIw2prj>`2C0F8$t{c#yk@!vrn*MP
Q3Wk<e#>SgpGHNga0H}KkzW@LL

delta 523
zcmaKn%}T>S6oqe0ZT&6OwZga)A)rBRnRRq!i%<m@f`l-|u_dXKiA4~ya^=c}OCQ3A
z@GZm#apk#jB3*gm@ZGt&Gw0;P|8ACF8;w^&twEd6Bh-ODAuiz&t%BPi?*!m7D8VH#
z0vEx)I}hFWE3k$6$jwuCo`Jkyg3lh6^n`{DI{vT0mg6qi#=Hyig%gksPeBfF0XD&F
zurdO9FLksao~8w;F5c&#Xh18F5C7^C`l|S0E`E^BI2c7LPmG>gou%`=q<(D1BFa)l
z12q%paXzL&W|gEfqcfxJ!(YRr>{cbVrlg^bZIQPmO)W0I^e)#AgT135JP=_h_j~Ve
rJD&c}`L0k#jACu!S=_71L?J<PgDmqAR2`v8g$OQzm2`{%&YgY$O_p5N

diff --git a/po/fr.po b/po/fr.po
index 06c5070..f6e27a7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ptask\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2015-06-24 22:18+0200\n"
+"POT-Creation-Date: 2016-05-23 19:33+0200\n"
 "PO-Revision-Date: 2012-05-13 18:15+0000\n"
 "Last-Translator: jeanfi <Unknown>\n"
 "Language-Team: French <>\n"
@@ -69,163 +69,66 @@ msgstr ""
 msgid "%s home page: <%s>\n"
 msgstr ""
 
-#: src/main.c:122
+#: src/main.c:120
 msgid ""
 "Error loading tasks, verify that a supported version of taskwarrior is "
 "installed."
 msgstr ""
 
-#: src/main.c:187
+#: src/main.c:185
 msgid "Enables debug mode."
 msgstr ""
 
-#: src/main.c:190
+#: src/main.c:188
 msgid "Force usage of an unsupported version of taskwarrior."
 msgstr ""
 
-#: src/main.c:201
+#: src/main.c:199
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/main.c:220
+#: src/main.c:218
 #, c-format
 msgid "Failed to load UI: %s"
 msgstr ""
 
-#: src/glade/ptask.glade:62
-msgid "Notes directory: "
-msgstr ""
-
-#: src/glade/ptask.glade:75
-msgid "Select a directory"
-msgstr ""
-
-#: src/glade/ptask.glade:103
-msgid "None"
-msgstr ""
-
-#: src/glade/ptask.glade:106
-msgid "Low"
-msgstr ""
-
-#: src/glade/ptask.glade:109
-msgid "Medium"
-msgstr ""
-
-#: src/glade/ptask.glade:112
-msgid "High"
-msgstr ""
+#~ msgid "New Task"
+#~ msgstr "Nouvelle Tache"
 
-#: src/glade/ptask.glade:119
-msgid "New Task"
-msgstr "Nouvelle Tache"
+#~ msgid "Description:"
+#~ msgstr "Description:"
 
-#: src/glade/ptask.glade:178 src/glade/ptask.glade:770
-msgid "Description:"
-msgstr "Description:"
-
-#: src/glade/ptask.glade:211 src/glade/ptask.glade:840
-msgid "Project:"
-msgstr "Projet:"
+#~ msgid "Project:"
+#~ msgstr "Projet:"
 
-#: src/glade/ptask.glade:227 src/glade/ptask.glade:870
-msgid "Priority:"
-msgstr "Priorite:"
+#~ msgid "Priority:"
+#~ msgstr "Priorite:"
 
-#: src/glade/ptask.glade:307
-msgid "pending"
-msgstr ""
+#~ msgid "ptask"
+#~ msgstr "ptask"
 
-#: src/glade/ptask.glade:310
-msgid "completed"
-msgstr ""
+#~ msgid "Status:"
+#~ msgstr "Etat:"
 
-#: src/glade/ptask.glade:313
-msgid "deleted"
-msgstr ""
+#~ msgid "Project"
+#~ msgstr "Projet"
 
-#: src/glade/ptask.glade:341 src/glade/ptask.glade:361
-msgid "ptask"
-msgstr "ptask"
+#~ msgid "Priority"
+#~ msgstr "Priorite"
 
-#: src/glade/ptask.glade:401
-msgid "_Help"
-msgstr ""
+#~ msgid "Description"
+#~ msgstr "Description"
 
-#: src/glade/ptask.glade:486
-msgid "Status:"
-msgstr "Etat:"
+#~ msgid "Note:"
+#~ msgstr "Note:"
 
-#: src/glade/ptask.glade:566 src/glade/ptask.glade:640
-#: src/glade/ptask.glade:1120
-msgid "Project"
-msgstr "Projet"
-
-#: src/glade/ptask.glade:577
-msgid "Count"
-msgstr ""
-
-#: src/glade/ptask.glade:626 src/glade/ptask.glade:1140
-msgid "Priority"
-msgstr "Priorite"
-
-#: src/glade/ptask.glade:655 src/glade/ptask.glade:1150
-msgid "Urgency"
-msgstr ""
+#~ msgid "Mark Done"
+#~ msgstr "Marquer fait"
 
-#: src/glade/ptask.glade:667 src/glade/ptask.glade:1160
-msgid "Creation date"
-msgstr ""
-
-#: src/glade/ptask.glade:679 src/glade/ptask.glade:1170
-msgid "Due"
-msgstr ""
-
-#: src/glade/ptask.glade:691 src/glade/ptask.glade:1180
-msgid "Start date"
-msgstr ""
-
-#: src/glade/ptask.glade:705 src/glade/ptask.glade:1190
-msgid "Description"
-msgstr "Description"
-
-#: src/glade/ptask.glade:721 src/glade/ptask.glade:1110
-msgid "Id"
-msgstr ""
-
-#: src/glade/ptask.glade:732 src/glade/ptask.glade:1130
-msgid "UUID"
-msgstr ""
-
-#: src/glade/ptask.glade:786
-msgid "Note:"
-msgstr "Note:"
-
-#: src/glade/ptask.glade:937
-msgid "Mark Done"
-msgstr "Marquer fait"
-
-#: src/glade/ptask.glade:980
-msgid "Tags:"
-msgstr ""
-
-#: src/glade/ptask.glade:996
-msgid "label"
-msgstr ""
-
-#: src/glade/ptask.glade:1042
 #, fuzzy
-msgid "Done"
-msgstr "Marquer fait"
-
-#: src/glade/ptask.glade:1058
-msgid "Start"
-msgstr ""
-
-#: src/glade/ptask.glade:1065
-msgid "Stop"
-msgstr ""
+#~ msgid "Done"
+#~ msgstr "Marquer fait"
 
 #~ msgid "Save"
 #~ msgstr "Sauvegarder"
diff --git a/po/ptask.pot b/po/ptask.pot
index cda6ff7..c3358a0 100644
--- a/po/ptask.pot
+++ b/po/ptask.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2015-06-24 22:18+0200\n"
+"POT-Creation-Date: 2016-05-23 19:33+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -66,159 +66,26 @@ msgstr ""
 msgid "%s home page: <%s>\n"
 msgstr ""
 
-#: src/main.c:122
+#: src/main.c:120
 msgid ""
 "Error loading tasks, verify that a supported version of taskwarrior is "
 "installed."
 msgstr ""
 
-#: src/main.c:187
+#: src/main.c:185
 msgid "Enables debug mode."
 msgstr ""
 
-#: src/main.c:190
+#: src/main.c:188
 msgid "Force usage of an unsupported version of taskwarrior."
 msgstr ""
 
-#: src/main.c:201
+#: src/main.c:199
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/main.c:220
+#: src/main.c:218
 #, c-format
 msgid "Failed to load UI: %s"
 msgstr ""
-
-#: src/glade/ptask.glade:62
-msgid "Notes directory: "
-msgstr ""
-
-#: src/glade/ptask.glade:75
-msgid "Select a directory"
-msgstr ""
-
-#: src/glade/ptask.glade:103
-msgid "None"
-msgstr ""
-
-#: src/glade/ptask.glade:106
-msgid "Low"
-msgstr ""
-
-#: src/glade/ptask.glade:109
-msgid "Medium"
-msgstr ""
-
-#: src/glade/ptask.glade:112
-msgid "High"
-msgstr ""
-
-#: src/glade/ptask.glade:119
-msgid "New Task"
-msgstr ""
-
-#: src/glade/ptask.glade:178 src/glade/ptask.glade:770
-msgid "Description:"
-msgstr ""
-
-#: src/glade/ptask.glade:211 src/glade/ptask.glade:840
-msgid "Project:"
-msgstr ""
-
-#: src/glade/ptask.glade:227 src/glade/ptask.glade:870
-msgid "Priority:"
-msgstr ""
-
-#: src/glade/ptask.glade:307
-msgid "pending"
-msgstr ""
-
-#: src/glade/ptask.glade:310
-msgid "completed"
-msgstr ""
-
-#: src/glade/ptask.glade:313
-msgid "deleted"
-msgstr ""
-
-#: src/glade/ptask.glade:341 src/glade/ptask.glade:361
-msgid "ptask"
-msgstr ""
-
-#: src/glade/ptask.glade:401
-msgid "_Help"
-msgstr ""
-
-#: src/glade/ptask.glade:486
-msgid "Status:"
-msgstr ""
-
-#: src/glade/ptask.glade:566 src/glade/ptask.glade:640
-#: src/glade/ptask.glade:1120
-msgid "Project"
-msgstr ""
-
-#: src/glade/ptask.glade:577
-msgid "Count"
-msgstr ""
-
-#: src/glade/ptask.glade:626 src/glade/ptask.glade:1140
-msgid "Priority"
-msgstr ""
-
-#: src/glade/ptask.glade:655 src/glade/ptask.glade:1150
-msgid "Urgency"
-msgstr ""
-
-#: src/glade/ptask.glade:667 src/glade/ptask.glade:1160
-msgid "Creation date"
-msgstr ""
-
-#: src/glade/ptask.glade:679 src/glade/ptask.glade:1170
-msgid "Due"
-msgstr ""
-
-#: src/glade/ptask.glade:691 src/glade/ptask.glade:1180
-msgid "Start date"
-msgstr ""
-
-#: src/glade/ptask.glade:705 src/glade/ptask.glade:1190
-msgid "Description"
-msgstr ""
-
-#: src/glade/ptask.glade:721 src/glade/ptask.glade:1110
-msgid "Id"
-msgstr ""
-
-#: src/glade/ptask.glade:732 src/glade/ptask.glade:1130
-msgid "UUID"
-msgstr ""
-
-#: src/glade/ptask.glade:786
-msgid "Note:"
-msgstr ""
-
-#: src/glade/ptask.glade:937
-msgid "Mark Done"
-msgstr ""
-
-#: src/glade/ptask.glade:980
-msgid "Tags:"
-msgstr ""
-
-#: src/glade/ptask.glade:996
-msgid "label"
-msgstr ""
-
-#: src/glade/ptask.glade:1042
-msgid "Done"
-msgstr ""
-
-#: src/glade/ptask.glade:1058
-msgid "Start"
-msgstr ""
-
-#: src/glade/ptask.glade:1065
-msgid "Stop"
-msgstr ""
diff --git a/src/tw.c b/src/tw.c
index 4da313a..a32ec1c 100644
--- a/src/tw.c
+++ b/src/tw.c
@@ -115,7 +115,8 @@ static int task_check_version()
 	    || !strcmp(ver, "2.0.0")
 	    || !strcmp(ver, "2.3.0")
 	    || !strcmp(ver, "2.4.0")
-	    || !strcmp(ver, "2.4.1"))
+	    || !strcmp(ver, "2.4.1")
+	    || !strcmp(ver, "2.5.0"))
 		return 1;
 	else
 		return 0;
-- 
2.7.4