[Debian-l10n-commits] poedit branch master updated. debian/2.0.1-1_exp1-4-ge81fd6e

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "poedit".

The branch, master has been updated
       via  e81fd6ed7193261db6b87e01132457b5a1a2ed02 (commit)
      from  ba9e7ca5fdc5faf474f25455467342bc5f59b56a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------

http://anonscm.debian.org/gitweb/?p=debian-l10n/poedit.git;a=commitdiff;h=e81fd6ed7193261db6b87e01132457b5a1a2ed02

commit e81fd6ed7193261db6b87e01132457b5a1a2ed02
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue May 16 15:18:09 2017 +0200

    Upload to experimental

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                         |  7 +++++++
 debian/patches/relax-wx-dependency.patch | 15 +++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 23 insertions(+)
 create mode 100644 debian/patches/relax-wx-dependency.patch

diff --git a/debian/changelog b/debian/changelog
index 944fcb0..1dc2ad5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+poedit (2.0.2-1~exp2) experimental; urgency=medium
+
+  * Relax wxwidgets dependency, we already have a patched wx
+    (commit: ed88188be7e97a0503f3471f7b0452740b732902)
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Tue, 16 May 2017 15:17:37 +0200
+
 poedit (2.0.2-1~exp1) experimental; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/relax-wx-dependency.patch b/debian/patches/relax-wx-dependency.patch
new file mode 100644
index 0000000..00a5c8c
--- /dev/null
+++ b/debian/patches/relax-wx-dependency.patch
@@ -0,0 +1,15 @@
+Description: Debian has already cherry-picked wx commit ed88188be7e97a0503f3471f7b0452740b732902
+ Latest wxwidgets should be preferred, but for experimental we can leave with this patch
+Author: Gianfranco Costamagna <locutusofborg at debian.org>
+
+--- poedit-2.0.2.orig/configure.ac
++++ poedit-2.0.2/configure.ac
+@@ -121,7 +121,7 @@ AM_CONDITIONAL([HAVE_CPPREST], [test "x$
+ 
+ AC_CHECK_HEADERS([json.hpp])
+ 
+-WX_CONFIG_CHECK([3.0.3], [WXFOUND=1], [WXFOUND=0], [$WXLIBS_USED], [--unicode])
++WX_CONFIG_CHECK([3.0.2], [WXFOUND=1], [WXFOUND=0], [$WXLIBS_USED], [--unicode])
+ 
+ if test "$WXFOUND" != 1; then
+     AC_MSG_ERROR([
diff --git a/debian/patches/series b/debian/patches/series
index 60365d9..878309e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-desktop.patch
+relax-wx-dependency.patch
-----------------------------------------------------------------------


hooks/post-receive
-- 
poedit