[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.3.1-146-g5b3c85e
by Andre Heinecke
cvs at cvs.gnupg.org
Fri Apr 29 14:28:27 CEST 2016
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 5b3c85e2730d57d97eff9a70c5c6d9e3729e7fb6 (commit)
via 5b49e6ff9188696128adb940d433f05156930173 (commit)
from 01097b97db00092746e6b8550b1204e89180dbe5 (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 5b3c85e2730d57d97eff9a70c5c6d9e3729e7fb6
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Apr 29 14:27:58 2016 +0200
Install additional icons
--
The icons are needed for new features in Kleopatra and for
pinentry visibility.
diff --git a/src/inst-breeze-icons.nsi b/src/inst-breeze-icons.nsi
index 71e2056..fe981c3 100644
--- a/src/inst-breeze-icons.nsi
+++ b/src/inst-breeze-icons.nsi
@@ -89,6 +89,8 @@ Section "-breeze-icons" SEC_breeze_icons
File ${prefix}/share/icons/breeze-dark/actions/16/tools-report-bug.svg
File ${prefix}/share/icons/breeze-dark/actions/16/view-refresh.svg
File ${prefix}/share/icons/breeze-dark/actions/16/window-close.svg
+ File ${prefix}/share/icons/breeze-dark/actions/16/visibility.svg
+ File ${prefix}/share/icons/breeze-dark/actions/16/hint.svg
SetOutPath "$INSTDIR\share\icons\breeze-dark\actions\22"
@@ -200,6 +202,8 @@ Section "-breeze-icons" SEC_breeze_icons
File ${prefix}/share/icons/breeze-dark/actions/24/tools-report-bug.svg
File ${prefix}/share/icons/breeze-dark/actions/24/view-refresh.svg
File ${prefix}/share/icons/breeze-dark/actions/24/window-close.svg
+ File ${prefix}/share/icons/breeze-dark/actions/24/visibility.svg
+ File ${prefix}/share/icons/breeze-dark/actions/24/hint.svg
SetOutPath "$INSTDIR\share\icons\breeze-dark\actions\32"
@@ -302,6 +306,7 @@ Section "-breeze-icons" SEC_breeze_icons
File ${prefix}/share/icons/breeze/actions/16/document-edit-sign.svg
File ${prefix}/share/icons/breeze/actions/16/document-edit-verify.svg
File ${prefix}/share/icons/breeze/actions/16/document-encrypt.svg
+ File ${prefix}/share/icons/breeze/actions/16/document-sign.svg
File ${prefix}/share/icons/breeze/actions/16/document-open.svg
File ${prefix}/share/icons/breeze/actions/16/document-print.svg
File ${prefix}/share/icons/breeze/actions/16/document-revert.svg
@@ -335,6 +340,8 @@ Section "-breeze-icons" SEC_breeze_icons
File ${prefix}/share/icons/breeze/actions/16/tools-report-bug.svg
File ${prefix}/share/icons/breeze/actions/16/view-refresh.svg
File ${prefix}/share/icons/breeze/actions/16/window-close.svg
+ File ${prefix}/share/icons/breeze/actions/16/visibility.svg
+ File ${prefix}/share/icons/breeze/actions/16/hint.svg
SetOutPath "$INSTDIR\share\icons\breeze\actions\22"
@@ -355,6 +362,7 @@ Section "-breeze-icons" SEC_breeze_icons
File ${prefix}/share/icons/breeze/actions/22/document-edit-sign.svg
File ${prefix}/share/icons/breeze/actions/22/document-edit-verify.svg
File ${prefix}/share/icons/breeze/actions/22/document-encrypt.svg
+ File ${prefix}/share/icons/breeze/actions/22/document-sign.svg
File ${prefix}/share/icons/breeze/actions/22/document-open.svg
File ${prefix}/share/icons/breeze/actions/22/document-print.svg
File ${prefix}/share/icons/breeze/actions/22/document-revert.svg
@@ -414,6 +422,7 @@ Section "-breeze-icons" SEC_breeze_icons
File ${prefix}/share/icons/breeze/actions/24/document-edit-sign.svg
File ${prefix}/share/icons/breeze/actions/24/document-edit-verify.svg
File ${prefix}/share/icons/breeze/actions/24/document-encrypt.svg
+ File ${prefix}/share/icons/breeze/actions/24/document-sign.svg
File ${prefix}/share/icons/breeze/actions/24/document-open.svg
File ${prefix}/share/icons/breeze/actions/24/document-print.svg
File ${prefix}/share/icons/breeze/actions/24/document-revert.svg
@@ -446,6 +455,8 @@ Section "-breeze-icons" SEC_breeze_icons
File ${prefix}/share/icons/breeze/actions/24/tools-report-bug.svg
File ${prefix}/share/icons/breeze/actions/24/view-refresh.svg
File ${prefix}/share/icons/breeze/actions/24/window-close.svg
+ File ${prefix}/share/icons/breeze/actions/24/visibility.svg
+ File ${prefix}/share/icons/breeze/actions/24/hint.svg
SetOutPath "$INSTDIR\share\icons\breeze\actions\32"
diff --git a/src/uninst-breeze-icons.nsi b/src/uninst-breeze-icons.nsi
index 374bf2a..886d3cb 100644
--- a/src/uninst-breeze-icons.nsi
+++ b/src/uninst-breeze-icons.nsi
@@ -106,6 +106,7 @@ Section "-un.breeze-icons"
Delete "$INSTDIR\share\icons\breeze\actions\24\document-print.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\document-open.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\document-encrypt.svg"
+ Delete "$INSTDIR\share\icons\breeze\actions\24\document-sign.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\document-edit-verify.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\document-edit-sign.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\document-edit-sign-encrypt.svg"
@@ -121,6 +122,8 @@ Section "-un.breeze-icons"
Delete "$INSTDIR\share\icons\breeze\actions\24\arrow-up.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\arrow-down.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\application-exit.svg"
+ Delete "$INSTDIR\share\icons\breeze\actions\24\visibility.svg"
+ Delete "$INSTDIR\share\icons\breeze\actions\24\hint.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\window-close.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\view-refresh.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\view-certificate-sign.svg"
@@ -162,6 +165,7 @@ Section "-un.breeze-icons"
Delete "$INSTDIR\share\icons\breeze\actions\22\document-print.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\document-open.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\document-encrypt.svg"
+ Delete "$INSTDIR\share\icons\breeze\actions\22\document-sign.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\document-edit-verify.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\document-edit-sign.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\document-edit-sign-encrypt.svg"
@@ -212,6 +216,7 @@ Section "-un.breeze-icons"
Delete "$INSTDIR\share\icons\breeze\actions\16\document-print.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\document-open.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\document-encrypt.svg"
+ Delete "$INSTDIR\share\icons\breeze\actions\16\document-sign.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\document-edit-verify.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\document-edit-sign.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\document-edit-sign-encrypt.svg"
@@ -228,6 +233,8 @@ Section "-un.breeze-icons"
Delete "$INSTDIR\share\icons\breeze\actions\16\arrow-up.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\arrow-down.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\application-exit.svg"
+ Delete "$INSTDIR\share\icons\breeze\actions\16\visibility.svg"
+ Delete "$INSTDIR\share\icons\breeze\actions\16\hint.svg"
Delete "$INSTDIR\share\icons\breeze-dark\status\64\security-medium.svg"
Delete "$INSTDIR\share\icons\breeze-dark\status\64\security-low.svg"
Delete "$INSTDIR\share\icons\breeze-dark\status\64\security-high.svg"
@@ -304,6 +311,7 @@ Section "-un.breeze-icons"
Delete "$INSTDIR\share\icons\breeze-dark\actions\24\document-print.svg"
Delete "$INSTDIR\share\icons\breeze-dark\actions\24\document-open.svg"
Delete "$INSTDIR\share\icons\breeze-dark\actions\24\document-encrypt.svg"
+ Delete "$INSTDIR\share\icons\breeze-dark\actions\24\document-sign.svg"
Delete "$INSTDIR\share\icons\breeze-dark\actions\24\document-edit-verify.svg"
Delete "$INSTDIR\share\icons\breeze-dark\actions\24\document-edit-sign.svg"
Delete "$INSTDIR\share\icons\breeze-dark\actions\24\document-edit-sign-encrypt.svg"
@@ -319,6 +327,8 @@ Section "-un.breeze-icons"
Delete "$INSTDIR\share\icons\breeze-dark\actions\24\arrow-up.svg"
Delete "$INSTDIR\share\icons\breeze-dark\actions\24\arrow-down.svg"
Delete "$INSTDIR\share\icons\breeze-dark\actions\24\application-exit.svg"
+ Delete "$INSTDIR\share\icons\breeze-dark\actions\24\visibility.svg"
+ Delete "$INSTDIR\share\icons\breeze-dark\actions\24\hint.svg"
Delete "$INSTDIR\share\icons\breeze-dark\actions\22\window-close.svg"
Delete "$INSTDIR\share\icons\breeze-dark\actions\22\view-refresh.svg"
Delete "$INSTDIR\share\icons\breeze-dark\actions\22\view-certificate-sign.svg"
@@ -360,6 +370,7 @@ Section "-un.breeze-icons"
Delete "$INSTDIR\share\icons\breeze-dark\actions\22\document-print.svg"
Delete "$INSTDIR\share\icons\breeze-dark\actions\22\document-open.svg"
Delete "$INSTDIR\share\icons\breeze-dark\actions\22\document-encrypt.svg"
+ Delete "$INSTDIR\share\icons\breeze-dark\actions\22\document-sign.svg"
Delete "$INSTDIR\share\icons\breeze-dark\actions\22\document-edit-verify.svg"
Delete "$INSTDIR\share\icons\breeze-dark\actions\22\document-edit-sign.svg"
Delete "$INSTDIR\share\icons\breeze-dark\actions\22\document-edit-sign-encrypt.svg"
@@ -410,6 +421,7 @@ Section "-un.breeze-icons"
Delete "$INSTDIR\share\icons\breeze-dark\actions\16\document-print.svg"
Delete "$INSTDIR\share\icons\breeze-dark\actions\16\document-open.svg"
Delete "$INSTDIR\share\icons\breeze-dark\actions\16\document-encrypt.svg"
+ Delete "$INSTDIR\share\icons\breeze-dark\actions\16\document-sign.svg"
Delete "$INSTDIR\share\icons\breeze-dark\actions\16\document-edit-verify.svg"
Delete "$INSTDIR\share\icons\breeze-dark\actions\16\document-edit-sign.svg"
Delete "$INSTDIR\share\icons\breeze-dark\actions\16\document-edit-sign-encrypt.svg"
@@ -426,6 +438,8 @@ Section "-un.breeze-icons"
Delete "$INSTDIR\share\icons\breeze-dark\actions\16\arrow-up.svg"
Delete "$INSTDIR\share\icons\breeze-dark\actions\16\arrow-down.svg"
Delete "$INSTDIR\share\icons\breeze-dark\actions\16\application-exit.svg"
+ Delete "$INSTDIR\share\icons\breeze-dark\actions\16\visibility.svg"
+ Delete "$INSTDIR\share\icons\breeze-dark\actions\16\hint.svg"
RMDir "$INSTDIR\share\icons\breeze\status\64"
RMDir "$INSTDIR\share\icons\breeze\status\24"
commit 5b49e6ff9188696128adb940d433f05156930173
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Apr 29 14:27:07 2016 +0200
Fix gpgol_ex configure command
* src/Makefile.am (pkg_gpgol_ex_configure): Remove duplicated conf.
--
A merge error from merging the 2.x branch into master.
diff --git a/src/Makefile.am b/src/Makefile.am
index 50c9445..6e6ddda 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -252,17 +252,11 @@ gpg4win_pkg_gpa_configure = --silent \
gpg4win_pkg_gpgol_configure = --silent \
--with-gpgme-prefix=$(idir) --with-gpg-error-prefix=$(idir) \
- --with-libassuan-prefix=$(idir) --enable-mime-send \
- --enable-gpg4win-3-reg-keys
+ --with-libassuan-prefix=$(idir) --enable-mime-send
gpg4win_pkg_gpgol_ex_configure = --silent \
--with-gpgme-prefix=$(ex_idir) --with-gpg-error-prefix=$(ex_idir) \
- --with-libassuan-prefix=$(ex_idir) --enable-mime-send \
- --enable-gpg4win-3-reg-keys
-
-gpg4win_pkg_gpgol_ex_configure = --silent \
- --with-gpgme-prefix=$(ex_idir) --with-gpg-error-prefix=$(ex_idir) \
- --with-libassuan-prefix=$(ex_idir)
+ --with-libassuan-prefix=$(ex_idir) --enable-mime-send
gpg4win_pkg_gpgex_configure = --silent \
--with-gpg-error-prefix=$(idir) \
-----------------------------------------------------------------------
Summary of changes:
src/Makefile.am | 10 ++--------
src/inst-breeze-icons.nsi | 11 +++++++++++
src/uninst-breeze-icons.nsi | 14 ++++++++++++++
3 files changed, 27 insertions(+), 8 deletions(-)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list