[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-3.1.3-18-g724bf40
by Andre Heinecke
cvs at cvs.gnupg.org
Wed Oct 17 09:03:41 CEST 2018
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 for Windows".
The branch, master has been updated
via 724bf401110c59b8ecb60c2dc06b5c9105a7e2fd (commit)
via 46c69f58045970d93731210b2c309eff414d60cf (commit)
via 775335c0815a19869ef12f81d52634570d5e7d0c (commit)
via de1111243f9788bc9bdf2928fdc16cf9617be012 (commit)
via 58fdd1695f740779c919739d0e78a0485266f87b (commit)
from d80e3f30c2e4df2ba6ed3b757004b0720b3b6952 (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 724bf401110c59b8ecb60c2dc06b5c9105a7e2fd
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Oct 17 09:03:17 2018 +0200
Post release version bump
--
diff --git a/NEWS b/NEWS
index eda6018..584aa96 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,19 @@
# The version number given below are for the standard installers as
# distributed by www.gpg4win.org.
+Noteworthy changes in Version 3.1.5 (unreleased)
+------------------------------------------------
+
+~~~~~~~~~~~~~~~
+GnuPG: 2.2.10
+Kleopatra: 3.1.3
+GPA: 0.10.0
+GpgOL: 2.3.1
+GpgEX: 1.0.6
+Kompendium DE: 4.0.1
+Compendium EN: 3.0.0
+~~~~~~~~~~~~~~~
+
Noteworthy changes in Version 3.1.4 (2018-10-17)
------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 121f3b5..ac64844 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ min_automake_version="1.9.3"
# (git tag -s gpg4win-2.x.y) 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([my_version], [3.1.4])
+m4_define([my_version], [3.1.5])
# Below is m4 magic to extract and compute the git revision number,
# the decimalized short revision number, a beta version string and a
commit 46c69f58045970d93731210b2c309eff414d60cf
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Oct 17 09:01:34 2018 +0200
Mark release date in NEWS
--
diff --git a/NEWS b/NEWS
index fc99bb1..eda6018 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,7 @@
# The version number given below are for the standard installers as
# distributed by www.gpg4win.org.
-Noteworthy changes in Version 3.1.4 (unreleased)
+Noteworthy changes in Version 3.1.4 (2018-10-17)
------------------------------------------------
(en) GpgOL: It is now possible to configure OpenPGP keys through
commit 775335c0815a19869ef12f81d52634570d5e7d0c
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Oct 17 09:00:24 2018 +0200
Asturian l10n was removed for kleopatra
* src/inst-kde-l10n.nsi, src/uninst-kde-l10n.nsi: Removed
asturian.
diff --git a/src/inst-kde-l10n.nsi b/src/inst-kde-l10n.nsi
index 9d57c63..f00df19 100644
--- a/src/inst-kde-l10n.nsi
+++ b/src/inst-kde-l10n.nsi
@@ -73,23 +73,6 @@ Section "-kde-l10n" SEC_kde-l10n
File ${prefix}/share/locale/ar/LC_MESSAGES/libkleopatra.mo
File ${prefix}/share/locale/ar/LC_MESSAGES/kwatchgnupg.mo
File ${prefix}/share/locale/ar/LC_MESSAGES/kleopatra.mo
- SetOutPath "$INSTDIR\share\locale\ast"
- File ${kcfg_prefix}/share/locale/ast/kf5_entry.desktop
- SetOutPath "$INSTDIR\share\locale\ast\LC_MESSAGES"
- File ${kconfigwidgets_prefix}/share/locale/ast/LC_MESSAGES/kconfigwidgets5.mo
- File ${ki18n_prefix}/share/locale/ast/LC_MESSAGES/ki18n5.mo
- File ${kiconthemes_prefix}/share/locale/ast/LC_MESSAGES/kiconthemes5.mo
- File ${kxmlgui_prefix}/share/locale/ast/LC_MESSAGES/kxmlgui5.mo
- File ${kconfig_prefix}/share/locale/ast/LC_MESSAGES/kconfig5_qt.qm
- File ${kcompletion_prefix}/share/locale/ast/LC_MESSAGES/kcompletion5_qt.qm
- File ${kcodecs_prefix}/share/locale/ast/LC_MESSAGES/kcodecs5_qt.qm
- File ${kcoreaddons_prefix}/share/locale/ast/LC_MESSAGES/kcoreaddons5_qt.qm
- File ${kitemviews_prefix}/share/locale/ast/LC_MESSAGES/kitemviews5_qt.qm
- File ${kwidgetsaddons_prefix}/share/locale/ast/LC_MESSAGES/kwidgetsaddons5_qt.qm
- File ${kwindowsystem_prefix}/share/locale/ast/LC_MESSAGES/kwindowsystem5_qt.qm
- File ${prefix}/share/locale/ast/LC_MESSAGES/libkleopatra.mo
- File ${prefix}/share/locale/ast/LC_MESSAGES/kwatchgnupg.mo
- File ${prefix}/share/locale/ast/LC_MESSAGES/kleopatra.mo
SetOutPath "$INSTDIR\share\locale\be"
File ${kcfg_prefix}/share/locale/be/kf5_entry.desktop
SetOutPath "$INSTDIR\share\locale\be\LC_MESSAGES"
diff --git a/src/uninst-kde-l10n.nsi b/src/uninst-kde-l10n.nsi
index e253ee7..2f84285 100644
--- a/src/uninst-kde-l10n.nsi
+++ b/src/uninst-kde-l10n.nsi
@@ -61,24 +61,6 @@ RMDir "$INSTDIR\share\locale\af"
RMDir "$INSTDIR\share\locale\ar\LC_MESSAGES"
RMDir "$INSTDIR\share\locale\ar\LC_MESSAGES"
RMDir "$INSTDIR\share\locale\ar"
- Delete "$INSTDIR\share\locale\ast\kf5_entry.desktop"
- Delete "$INSTDIR\share\locale\ast\LC_MESSAGES\kconfigwidgets5.mo"
- Delete "$INSTDIR\share\locale\ast\LC_MESSAGES\ki18n5.mo"
- Delete "$INSTDIR\share\locale\ast\LC_MESSAGES\kiconthemes5.mo"
- Delete "$INSTDIR\share\locale\ast\LC_MESSAGES\kxmlgui5.mo"
- Delete "$INSTDIR\share\locale\ast\LC_MESSAGES\kconfig5_qt.qm"
- Delete "$INSTDIR\share\locale\ast\LC_MESSAGES\kcompletion5_qt.qm"
- Delete "$INSTDIR\share\locale\ast\LC_MESSAGES\kcodecs5_qt.qm"
- Delete "$INSTDIR\share\locale\ast\LC_MESSAGES\kcoreaddons5_qt.qm"
- Delete "$INSTDIR\share\locale\ast\LC_MESSAGES\kitemviews5_qt.qm"
- Delete "$INSTDIR\share\locale\ast\LC_MESSAGES\kwidgetsaddons5_qt.qm"
- Delete "$INSTDIR\share\locale\ast\LC_MESSAGES\kwindowsystem5_qt.qm"
- Delete "$INSTDIR\share\locale\ast\LC_MESSAGES\libkleopatra.mo"
- Delete "$INSTDIR\share\locale\ast\LC_MESSAGES\kwatchgnupg.mo"
- Delete "$INSTDIR\share\locale\ast\LC_MESSAGES\kleopatra.mo"
-RMDir "$INSTDIR\share\locale\ast\LC_MESSAGES"
-RMDir "$INSTDIR\share\locale\ast\LC_MESSAGES"
-RMDir "$INSTDIR\share\locale\ast"
Delete "$INSTDIR\share\locale\be\kf5_entry.desktop"
Delete "$INSTDIR\share\locale\be\LC_MESSAGES\kconfigwidgets5.mo"
Delete "$INSTDIR\share\locale\be\LC_MESSAGES\ki18n5.mo"
commit de1111243f9788bc9bdf2928fdc16cf9617be012
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Oct 17 08:35:22 2018 +0200
Fix kde-l10n checksum
--
Woops there was a 1 accidentally added
:xa
diff --git a/packages/packages.current b/packages/packages.current
index 6566798..56fe556 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -560,7 +560,7 @@ chk 73ef39515605d6dbd83cf974ca65f749108682f87599500ba07ca133a3910819
# by: ah
# verified: Tarball created by ah with script kde-l10n.sh
file kde-l10n/kde-l10n-201810161304-bin.tar.xz
-chk f6b4c31774a67ae9aff5c10fa4db136a7594fc9cecbddf786c710ba1d73d4f241
+chk f6b4c31774a67ae9aff5c10fa4db136a7594fc9cecbddf786c710ba1d73d4f24
file kde-l10n/kde-l10n-201810161304-src.tar.xz
chk d3c8e91f9c758e0d5505f7cae6d3908e606cb92103ac2900c021c6c418adfe2a
commit 58fdd1695f740779c919739d0e78a0485266f87b
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Oct 17 08:35:10 2018 +0200
Update GPA to 0.10.0
--
diff --git a/Makefile.am b/Makefile.am
index 44b282b..697af88 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,6 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
patches/extra-cmake-modules/0001-Use-BIN_INSTALL_DIR-data-for-DATAROOTDIR-on-Windows.patch \
patches/glib-2.41.5/01-socket.patch \
patches/glib-2.41.5/02-formatsec.patch \
- patches/gpa-0.9.10/0001-w32-Make-location-of-locale-dir-more-flexible.patch \
patches/gpgol-2.3.1/0001-Pass-lang-correctly-to-config-dialog.patch \
patches/kconfigwidgets/0001-Make-QDbus-optional.patch \
patches/kconfigwidgets/0002-Crudely-remove-KF5Auth-depedency.patch \
diff --git a/NEWS b/NEWS
index b420d41..fc99bb1 100644
--- a/NEWS
+++ b/NEWS
@@ -65,10 +65,18 @@ Noteworthy changes in Version 3.1.4 (unreleased)
(de) GpgOL: Verschiedene kleinere Fehlerkorrekturen.
+(en) GPA: Search now also queries Web Key Directories.
+
+(de) GPA: Bei der Suche werden auch "Web Key Directories" angefragt.
+
+(en) GPA: Improved error handling with diagnostic output.
+
+(de) GPA: Verbesserte Fehlerbehandlung mit Diagnoseausgaben.
+
~~~~~~~~~~~~~~~
GnuPG: 2.2.10
Kleopatra: 3.1.3
-GPA: 0.9.10
+GPA: 0.10.0
GpgOL: 2.3.1
GpgEX: 1.0.6
Kompendium DE: 4.0.1
diff --git a/doc/README.de.txt b/doc/README.de.txt
index 51125f6..dee9e97 100644
--- a/doc/README.de.txt
+++ b/doc/README.de.txt
@@ -97,6 +97,9 @@ Neu in Gpg4win Version !VERSION! (!BUILD_ISODATE!)
- GpgOL: Verschiedene kleinere Fehlerkorrekturen.
+- GPA: Verbesserte Fehlerbehandlung mit Diagnoseausgaben.
+
+- GPA: Bei der Suche werden auch "Web Key Directories" angefragt.
3. Anmerkungen
==============
diff --git a/doc/README.en.txt b/doc/README.en.txt
index 57a9fb0..f80ec45 100644
--- a/doc/README.en.txt
+++ b/doc/README.en.txt
@@ -93,6 +93,10 @@ New in Gpg4win version !VERSION! (!BUILD_ISODATE!)
- GpgOL: Various smaller bugfixes.
+- GPA: Improved error handling with diagnostic output.
+
+- GPA: Search now also queries Web Key Directories.
+
3. Additional notes
===================
diff --git a/packages/packages.current b/packages/packages.current
index 28535de..6566798 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -320,10 +320,10 @@ chk 9a8c5d1b6326547a8a014665105520be7e2bd6624e48fb9a68ac2a84c99ee567
file gpgme/gpgme-1.12.0.tar.bz2
chk b4dc951c3743a60e2e120a77892e9e864fb936b2e58e7c77e8581f4d050e8cd8
-# last changed: 2017-01-04
+# last changed: 2018-10-17
# by: ah
-file gpa/gpa-0.9.10.tar.bz2
-chk c3b9cc36fd9916e83524930f99df13b1d5f601f4c0168cb9f5d81422e282b727
+file gpa/gpa-0.10.0.tar.bz2
+chk 95dbabe75fa5c8dc47e3acf2df7a51cee096051e5a842b4c9b6d61e40a6177b1
#
# GnuPG utilities
diff --git a/patches/gpa-0.9.10/0001-w32-Make-location-of-locale-dir-more-flexible.patch b/patches/gpa-0.9.10/0001-w32-Make-location-of-locale-dir-more-flexible.patch
deleted file mode 100755
index 5229d56..0000000
--- a/patches/gpa-0.9.10/0001-w32-Make-location-of-locale-dir-more-flexible.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From 2dae64a65080c52a731d98a905a447de1428cc7c Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke at intevation.de>
-Date: Thu, 13 Apr 2017 09:44:47 +0200
-Subject: [PATCH] w32: Make location of locale dir more flexible
-
-* src/gpa.c (get_locale_dir): If installed under a bin subdirectory
-strip this out of the locale path.
-
---
-This fixes loading locales when GPA is installed under a bin
-subdirectory like it is with GnuPG 2.1 and Gpg4win.
----
- src/gpa.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/gpa.c b/src/gpa.c
-index be8490d..bad001f 100644
---- a/src/gpa.c
-+++ b/src/gpa.c
-@@ -160,7 +160,15 @@ get_locale_dir (void)
-
- if (! GetModuleFileNameA (0, name, sizeof (name) - 30))
- return NULL;
-- p = strrchr (name, '\\');
-+
-+ /* If installed under bin assume that share is on the same
-+ hierarchy as the bin subdirectory. Otherwise assume that
-+ share is a subdirectory of the gpa.exe location. */
-+ p = strstr (name, "\\bin\\");
-+ if (!p)
-+ {
-+ p = strrchr (name, '\\');
-+ }
- if (!p)
- {
- *name = '\\';
---
-2.1.4
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 1 -
NEWS | 25 +++++++++++--
configure.ac | 2 +-
doc/README.de.txt | 3 ++
doc/README.en.txt | 4 +++
packages/packages.current | 8 ++---
...Make-location-of-locale-dir-more-flexible.patch | 42 ----------------------
src/inst-kde-l10n.nsi | 17 ---------
src/uninst-kde-l10n.nsi | 18 ----------
9 files changed, 35 insertions(+), 85 deletions(-)
delete mode 100755 patches/gpa-0.9.10/0001-w32-Make-location-of-locale-dir-more-flexible.patch
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list