[git] GpgEX - branch, master, updated. gpgex-1.0.4-11-g011b0af

[by Andre Heinecke]

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 "GnupG extension for the Windows Explorer".

The branch, master has been updated
       via  011b0afb4012258af479fb40b26911d7be874750 (commit)
       via  dcdc405fa9190164e525fec0c1a7e7c5b58312a2 (commit)
       via  293168f6c49c245c2922a554c24a3744a0d9ab9d (commit)
      from  4965492e8b6aaf41cb380f1a0e0dea8753d9e8d5 (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 -----------------------------------------------------------------
commit 011b0afb4012258af479fb40b26911d7be874750
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Sep 12 14:48:29 2017 +0200

    Post release updates
    
    --

diff --git a/NEWS b/NEWS
index bce268e..2f61ffc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes for version 1.0.6 (unreleased)
+-------------------------------------------------
+
+
 Noteworthy changes for version 1.0.5 (2017-09-12)
 -------------------------------------------------
 
diff --git a/configure.ac b/configure.ac
index baef053..a9f3157 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ min_automake_version="1.10"
 # (git tag -s gnupg-2.n.m) and run "./autogen.sh --force".  Please
 # bump the version number immediately *after* the release and do
 # another commit and push so that the git magic is able to work.
-m4_define([mym4_version], [1.0.5])
+m4_define([mym4_version], [1.0.6])
 
 # Below is m4 magic to extract and compute the git revision number,
 # the decimalized short revision number, a beta version string and a

commit dcdc405fa9190164e525fec0c1a7e7c5b58312a2
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Sep 12 14:42:11 2017 +0200

    Release GpgEX 1.0.5

diff --git a/NEWS b/NEWS
index 9120a12..bce268e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
-Noteworthy changes for version 1.0.5 (unreleased)
+Noteworthy changes for version 1.0.5 (2017-09-12)
 -------------------------------------------------
 
+* Fixed localisation for the 64bit version.
+
+* Added c++ hardending flags by default.
+
 
 Noteworthy changes for version 1.0.4 (2016-03-30)
 -------------------------------------------------

commit 293168f6c49c245c2922a554c24a3744a0d9ab9d
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Sep 12 14:40:22 2017 +0200

    Fix locale dir if installed under bin_64
    
    * src/main.cc (get_locale_dir): Also strip bin_64

diff --git a/po/pt.po b/po/pt.po
index 0ccf5bb..859fa61 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -17,7 +17,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Generator: Poedit 2.0.3\n"
-"POT-Creation-Date: \n"
 
 #, c-format
 msgid ""
diff --git a/src/main.cc b/src/main.cc
index 8cc0ed9..661b9ad 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -103,7 +103,7 @@ get_locale_dir (void)
                  such a directory layout under plain Windows without
                  the need to change libgpg-error.  */
               p = strrchr (result, '\\');
-              if (p && !strcmp (p+1, "bin"))
+              if (p && (!strcmp (p+1, "bin") || !strcmp (p+1, "bin_64")))
                 *p = 0;
 
               gpgex_server::root_dir = strdup (result);

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

Summary of changes:
 NEWS         | 10 +++++++++-
 configure.ac |  2 +-
 po/pt.po     |  1 -
 src/main.cc  |  2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GnupG extension for the Windows Explorer
http://git.gnupg.org