[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.3.1-205-g639fe70
by Andre Heinecke
cvs at cvs.gnupg.org
Tue Jan 17 12:08:07 CET 2017
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 639fe70adb66aac28e5de38c4f9e22f2d5a3b240 (commit)
via 4fac073df226fed146ec9c1c222dd192a57dac11 (commit)
via a3601773da993616208b12cb2e0c8e06970b32d7 (commit)
via 9a613f35092e763517a67862a5e6fc3c02d52656 (commit)
via 6c8d80d07cad55cbe8a1e23f58a86e9f012f7780 (commit)
via f0273a58390870e0d86a61e155343789da6a749f (commit)
from 8ef29dbdb113649d1a0ee3d1d58b14380b5f922e (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 639fe70adb66aac28e5de38c4f9e22f2d5a3b240
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Jan 17 12:06:16 2017 +0100
Update development packages
* packages/packages.current: Update devel packages.
(pinentry): Switch back to released version.
* patches/libkleo/lower-kf5-required.patch: Reduce uneccessary
dependency level.
* Makefile.am (EXTRA_DIST): Update accordingly.
diff --git a/Makefile.am b/Makefile.am
index d5b4180..d7fa075 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,6 +51,7 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch \
patches/libgpg-error-1.21/0001-Add-FD_ISSET-replacement-for-Windows.patch \
patches/gpgex-1.0.4/0001-Prefer-kleowrapped-gpgwrapped-binaries.patch \
+ patches/libkleo/lower-kf5-required.patch \
patches/gpgex-1.0.4/0002-Fix-loop-logic-error-in-new-server-name-detection.patch \
patches/extra-cmake-modules/0001-Use-BIN_INSTALL_DIR-data-for-DATAROOTDIR-on-Windows.patch
diff --git a/packages/packages.current b/packages/packages.current
index 254c5df..947e260 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -297,11 +297,10 @@ name gnupg-w32-2.1.15-20160818-src.tar.xz
file binary/gnupg-w32-2.1.15_20160818.tar.xz
chk 0f6f07ea28023bbef458c9dd2b04c20260d6c59a5319d0bdab750d933ef18999
-# TODO: Switch back to released version
-# last changed: 2015-12-11
+# last changed: 2016-01-17
# by: ah
-#file pinentry/pinentry-0.9.7.tar.bz2
-#chk 6398208394972bbf897c3325780195584682a0d0c164ca5a0da35b93b1e4e7b2
+file pinentry/pinentry-1.0.0.tar.bz2
+chk 1672c2edc1feb036075b187c0773787b2afd0544f55025c645a71b4c2f79275a
# TODO: Switch back to released version
# last changed: 2015-08-26
@@ -511,46 +510,24 @@ chk 161c4b963f57bc52894fb63a5288e20e92651313136066698c02ead4a6d194b3
# a stable branch.
server http://files.intevation.de/projects/gpg4all
-# Pinentry master to show new pinentry features under devel.
-# by: ah
-# verified: tarball created by ah
-file pinentry/pinentry-0.9.8-beta26.tar.bz2
-chk b85a1aa93375758e3a3c3b0f5938799fd6310a882cb1d6d027462dc2c9297a97
-
# ditto for gpgme.
# by: ah
# verified: tarball created by ah
-file gpgme/gpgme-1.7.2-beta44.tar.bz2
-chk 27b8b1c9066f07d76cdec0b831c414642bafc86663c54fb332c79a81a3c2947a
+file gpgme/gpgme-1.8.1-beta34.tar.bz2
+chk 5415a774207ee59ad738a54ad44b8df5630692f6e587f87ac4463243ab3faab7
# ditto for gpgol.
# by: ah
# verified: tarball created by ah
-file gpgol/gpgol-2.0.0-beta172.tar.bz2
-chk 9bed2920d1c4249c0a0ebdab68a82c1a43490d2fc1789b0a4c30759406a3523e
-
-# Gpgmepp
-# last changed: 2016-01-21
-# by: ah
-# verified: https://www.kde.org/info/applications-15.12.1.php
-# file 15.12.1/src/gpgmepp-15.12.1.tar.xz
-# chk 56d5f05bd513efc6caf770e43b6109e42842198f
-#
-# Gpgmepp-devel
-# last changed: see package date
-# by: ah
-# verified: Tarball created by ah.
-
-file gpgmepp/gpgmepp-201608261655.tar.xz
-chk 0cbe8d70f043f5afbc75461a04b7b3ac839a2ae54e131e06b0837ee64c04ca06
-
+file gpgol/gpgol-2.0.0-beta256.tar.bz2
+chk 029a2e07b7f7165e0f4f2eb785f2cd0a2fd8c91771230eadcf1d20acc8a7f324
# Libkleo
# last changed: see package date.
# by: ah
# verified: Tarball created by ah.
-file libkleo/libkleo-201608261656.tar.xz
-chk 40e982aa06fddfea50c3794b2fcb73232458cbb5111d5201a59d94a1bfe2ece2
+file libkleo/libkleo-201701171117.tar.xz
+chk 117a9402892c4bd5b0fb384bf79c932ef9132413b0bbc55c0a92fd95759ad0f8
# KDE-L10n
# last changed: 2016-02-19
@@ -566,5 +543,5 @@ chk d07988acf4398583580f0f55aae73c3082687fba19d2aa8048979d53a82cf592
# last changed: see package date.
# by: ah
# verified: Tarball created by ah.
-file kleopatra/kleopatra-201609051810.tar.gz
-chk 73498bcbc40ffb3e3a4f0998a178c94480e4de78380b0992e3811aa335e4067f
+file kleopatra/kleopatra-201701171118.tar.gz
+chk 6de660fcfb3cebb9825a3e763f0ea7eb219f3e997675a45771e3a3d9fb15e5a0
diff --git a/patches/libkleo/lower-kf5-required.patch b/patches/libkleo/lower-kf5-required.patch
new file mode 100755
index 0000000..d15ed74
--- /dev/null
+++ b/patches/libkleo/lower-kf5-required.patch
@@ -0,0 +1,17 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7223ab9..754088c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.12)
+
+ project(libkleo)
+
+-set(KF5_VERSION "5.30.0")
++set(KF5_VERSION "5.25.0")
+ find_package(ECM ${KF5_VERSION} CONFIG REQUIRED)
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+ set(LIBRARY_NAMELINK)
commit 4fac073df226fed146ec9c1c222dd192a57dac11
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Jan 17 12:03:36 2017 +0100
Update libpng to 1.4.20
* packages/packages.current: Update libpng
diff --git a/packages/packages.current b/packages/packages.current
index 81bc2a7..254c5df 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -211,8 +211,8 @@ chk 677d6055494e24cad6c49eab33eee618ddc6ed65da827c8b5b7da761b4063278
# by: ah
# verified: Sig 8048 643B A2C8 40F4 F92A 195F F549 84BF A16C 640F
server ftp://ftp.simplesystems.org/pub/png/src/
-file libpng14/libpng-1.4.19.tar.xz
-chk 52b830ea8900fad3ed46fc91021355211f418c8a41c39699600dbf1db2bbf7ff
+file libpng14/libpng-1.4.20.tar.xz
+chk f425d0b218fe025616a751c5c0051481fbbeac32d06c79a265e9bd5aef470275
#
# LibFFI
commit a3601773da993616208b12cb2e0c8e06970b32d7
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Jan 17 12:02:42 2017 +0100
Fix debug prefix for recent kleo versions
* src/inst-kleopatra.nsi: Update debug prefix.
--
Debug output now follows a clear scheme.
diff --git a/src/inst-kleopatra.nsi b/src/inst-kleopatra.nsi
index 8bc09a6..777006a 100644
--- a/src/inst-kleopatra.nsi
+++ b/src/inst-kleopatra.nsi
@@ -219,7 +219,7 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
push $1
FileOpen $1 "$INSTDIR\share\QtProject\qtlogging.ini" "w"
FileWrite $1 '[Rules]$\r$\n'
- FileWrite $1 'log_kleopatra.debug=true$\r$\n'
+ FileWrite $1 'org.kde.pim.*=true$\r$\n'
FileClose $1
pop $1
commit 9a613f35092e763517a67862a5e6fc3c02d52656
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Jan 17 12:02:06 2017 +0100
Define KDE_INSTALL_DATADIR to share
* src/gpg4win.mk.in: Add KDE_INSTALL_DATADIR define.
--
Otherwise KDE now installs data into bin. Yay.
diff --git a/src/gpg4win.mk.in b/src/gpg4win.mk.in
index 35f0619..a682890 100644
--- a/src/gpg4win.mk.in
+++ b/src/gpg4win.mk.in
@@ -649,6 +649,7 @@ stamps/stamp-$(1)-02-configure: stamps/stamp-$(1)-01-patch
-DCMAKE_INSTALL_PREFIX="$$$${pkgidir}" \
-DCMAKE_PREFIX_PATH="$$$${pkgidir}" \
-DCMAKE_TOOLCHAIN_FILE=$(abs_top_srcdir)/src/toolchain.cmake \
+ -DKDE_INSTALL_DATADIR="$$$${pkgidir}/share" \
-DBUILD_TESTING=False \
$$$${pkgcfg} $$$${pkgextracflags} "../$$$${pkg_version}") && \
touch stamps/stamp-$(1)-02-configure
commit 6c8d80d07cad55cbe8a1e23f58a86e9f012f7780
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Jan 17 12:00:21 2017 +0100
Remove KF5Gpmepp
* Makefile.am: Remove patches for gpgmepp
* configure.ac: Remvoe package as dependency.
* patches/gpgmepp: Remove obsolete file.
* src/Makefile.am: No longer define stuff for gpgmepp.
* src/config.nsi.in: Ditto.
* src/inst-gpgmepp.nsi, src/uninst-gpgmepp.nsi: Removed.
* src/inst-sections.nsi: No longer handle gpgmepp
diff --git a/Makefile.am b/Makefile.am
index 7873d4d..d5b4180 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,7 +40,6 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
patches/ki18n/no-tests.patch \
patches/gpgme-1.6.0/0001-w32-Fallback-to-2.1-reg-key-for-gpgconf-search.patch \
patches/gpgme-1.6.0/0001-Add-gpgme_pubkey_algo_string.patch \
- patches/gpgmepp/0002-disable-variants.patch \
patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch \
patches/kxmlgui/0003-Make-KTextWidgets-optional.patch \
patches/kxmlgui/0004-Cruedly-disable-KSendbugmail.patch \
diff --git a/configure.ac b/configure.ac
index 2131303..f1d55ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -351,7 +351,6 @@ GPG4WIN_KDEPKG([kleopatra], [gnupg-w32 breeze-icons kxmlgui libkleo kde-l10n kit
GPG4WIN_KDEPKG([extra-cmake-modules])
GPG4WIN_KDEPKG([kconfig], [qtbase qttools extra-cmake-modules])
GPG4WIN_KDEPKG([ki18n], [qtbase gettext qttools extra-cmake-modules])
-GPG4WIN_KDEPKG([gpgmepp], [boost qtbase gpgme extra-cmake-modules])
GPG4WIN_KDEPKG([kwidgetsaddons], [kconfig qttools qtbase])
GPG4WIN_KDEPKG([kcompletion], [kwidgetsaddons])
GPG4WIN_KDEPKG([kwindowsystem], [qtbase qtwinextras])
@@ -365,7 +364,7 @@ GPG4WIN_KDEPKG([kitemmodels], [qtbase qttools])
GPG4WIN_KDEPKG([karchive], [qtbase qttools extra-cmake-modules])
GPG4WIN_KDEPKG([kiconthemes], [qtsvg kconfigwidgets karchive])
GPG4WIN_KDEPKG([kxmlgui], [kiconthemes kconfigwidgets kitemviews])
-GPG4WIN_KDEPKG([libkleo], [gpgmepp kmime kwidgetsaddons kwindowsystem kcompletion kconfig gpgme])
+GPG4WIN_KDEPKG([libkleo], [kmime kwidgetsaddons kwindowsystem kcompletion kconfig gpgme])
GPG4WIN_FINALIZE
diff --git a/patches/gpgmepp/0002-disable-variants.patch b/patches/gpgmepp/0002-disable-variants.patch
deleted file mode 100755
index 3346a71..0000000
--- a/patches/gpgmepp/0002-disable-variants.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-#! /bin/sh
-patch -p1 -f $* < $0
-exit $?
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 1c3335a..eb1dd3a 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -75,58 +75,6 @@ if ( GPGME_VANILLA_FOUND )
-
- endif()
-
--if ( GPGME_GLIB_FOUND )
-- add_library(KF5Gpgmepp-glib ${gpgme_LIB_SRCS} context_glib.cpp)
--
-- generate_export_header(KF5Gpgmepp-glib BASE_NAME gpgmepp-glib)
--
-- add_library(KF5::Gpgmepp-glib ALIAS KF5Gpgmepp-glib)
--
-- target_link_libraries(KF5Gpgmepp-glib
-- ${GPGME_GLIB_LIBRARIES}
-- Qt5::Core
-- )
--
-- target_include_directories(KF5Gpgmepp-glib INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/gpgme++>")
-- target_include_directories(KF5Gpgmepp-glib PUBLIC "$<BUILD_INTERFACE:${Gpgmepp_SOURCE_DIR}/src;${Gpgmepp_BINARY_DIR}/src>")
--
-- set_target_properties(KF5Gpgmepp-glib PROPERTIES
-- VERSION ${GPGMEPP_VERSION_STRING}
-- SOVERSION ${GPGMEPP_SOVERSION}
-- EXPORT_NAME Gpgmepp-glib
-- )
-- install(TARGETS KF5Gpgmepp-glib EXPORT KF5GpgmeppTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
--endif()
--
--
--if ( GPGME_QT_FOUND )
-- add_library(KF5Gpgmepp-qt ${gpgme_LIB_SRCS} context_qt.cpp)
--
-- generate_export_header(KF5Gpgmepp-qt BASE_NAME gpgmepp-qt)
--
-- add_library(KF5::Gpgmepp-qt ALIAS KF5Gpgmepp-qt)
--
-- target_link_libraries(KF5Gpgmepp-qt
-- ${GPGME_QT_LIBRARIES}
-- Qt5::Core
-- )
--
-- target_include_directories(KF5Gpgmepp-qt INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/gpgme++>")
-- target_include_directories(KF5Gpgmepp-qt PUBLIC "$<BUILD_INTERFACE:${Gpgmepp_SOURCE_DIR}/src;${Gpgmepp_BINARY_DIR}/src>")
--
-- if(WIN32)
-- target_link_libraries( gpgmepp-qt ${GPGME_VANILLA_LIBRARIES} )
-- endif()
--
-- set_target_properties(KF5Gpgmepp-qt PROPERTIES
-- VERSION ${GPGMEPP_VERSION_STRING}
-- SOVERSION ${GPGMEPP_SOVERSION}
-- EXPORT_NAME Gpgmepp-qt
-- )
-- install(TARGETS KF5Gpgmepp-qt EXPORT KF5GpgmeppTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
--endif()
--
--
- if ( GPGME_PTHREAD_FOUND )
- add_library(KF5Gpgmepp-pthread ${gpgme_LIB_SRCS} context_vanilla.cpp)
diff --git a/src/Makefile.am b/src/Makefile.am
index 1bbd1fa..e9c237d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -63,7 +63,6 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
uninst-claws-mail.nsi uninst-claws-mail-cmds.nsi \
inst-qtbase.nsi uninst-qtbase.nsi \
inst-ki18n.nsi uninst-ki18n.nsi \
- inst-gpgmepp.nsi uninst-gpgmepp.nsi \
inst-kwidgetsaddons.nsi uninst-kwidgetsaddons.nsi \
inst-kcompletion.nsi uninst-kcompletion.nsi \
inst-kwindowsystem.nsi uninst-kwindowsystem.nsi \
@@ -120,7 +119,7 @@ gpg4win_spkgs = glib libffi gdk-pixbuf gtk+ \
gpg4win_qtpkgs = qtbase qttools qtwinextras qtsvg
# Source packages following the KDE pattern
-gpg4win_kdepkgs = kconfig gpgmepp kwidgetsaddons ki18n extra-cmake-modules \
+gpg4win_kdepkgs = kconfig kwidgetsaddons ki18n extra-cmake-modules \
kcompletion kwindowsystem kcoreaddons libkleo kcodecs \
kmime kconfigwidgets kxmlgui kguiaddons kitemviews \
kiconthemes kleopatra breeze-icons kitemmodels karchive
diff --git a/src/config.nsi.in b/src/config.nsi.in
index 93ef87a..39648c7 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -209,10 +209,6 @@
!define gpg4win_pkg_kwidgetsaddons @gpg4win_pkg_kwidgetsaddons@
!define gpg4win_pkg_kwidgetsaddons_version @gpg4win_pkg_kwidgetsaddons_version@
- at HAVE_PKG_GPGMEPP@
-!define gpg4win_pkg_gpgmepp @gpg4win_pkg_gpgmepp@
-!define gpg4win_pkg_gpgmepp_version @gpg4win_pkg_gpgmepp_version@
-
@HAVE_PKG_BOOST@
!define gpg4win_pkg_boost @gpg4win_pkg_boost@
!define gpg4win_pkg_boost_version @gpg4win_pkg_boost_version@
diff --git a/src/inst-gpgmepp.nsi b/src/inst-gpgmepp.nsi
deleted file mode 100644
index 3e09cd2..0000000
--- a/src/inst-gpgmepp.nsi
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (C) 2015 Intevation GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/gpgmepp-${gpg4win_pkg_gpgmepp_version}
-
-!ifdef DEBUG
-Section "gpgmepp" SEC_gpgmepp
-!else
-Section "-gpgmepp" SEC_gpgmepp
-!endif
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File "${gpg4win_pkg_gpgmepp}"
-!else
- SetOutPath "$INSTDIR\bin"
- File ${prefix}/bin/libKF5Gpgmepp.dll
- File ${prefix}/bin/libKF5QGpgme.dll
-!endif
-SectionEnd
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index f537457..00864a8 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -113,9 +113,6 @@
!ifdef HAVE_PKG_KI18N
!include "inst-ki18n.nsi"
!endif
-!ifdef HAVE_PKG_GPGMEPP
-!include "inst-gpgmepp.nsi"
-!endif
!ifdef HAVE_PKG_KWIDGETSADDONS
!include "inst-kwidgetsaddons.nsi"
!endif
@@ -338,9 +335,6 @@
!ifdef HAVE_PKG_KI18N
!include "uninst-ki18n.nsi"
!endif
-!ifdef HAVE_PKG_GPGMEPP
-!include "uninst-gpgmepp.nsi"
-!endif
!ifdef HAVE_PKG_KWIDGETSADDONS
!include "uninst-kwidgetsaddons.nsi"
!endif
@@ -612,9 +606,6 @@ Function CalcDepends
!ifdef HAVE_PKG_KI18N
!insertmacro UnselectSection ${SEC_ki18n}
!endif
-!ifdef HAVE_PKG_GPGMEPP
- !insertmacro UnselectSection ${SEC_gpgmepp}
-!endif
!ifdef HAVE_PKG_KWIDGETSADDONS
!insertmacro UnselectSection ${SEC_kwidgetsaddons}
!endif
@@ -755,7 +746,6 @@ Function CalcDepends
!insertmacro SelectSection ${SEC_breeze_icons}
!insertmacro SelectSection ${SEC_kconfig}
!insertmacro SelectSection ${SEC_ki18n}
- !insertmacro SelectSection ${SEC_gpgmepp}
!insertmacro SelectSection ${SEC_kwidgetsaddons}
!insertmacro SelectSection ${SEC_kcompletion}
!insertmacro SelectSection ${SEC_kwindowsystem}
diff --git a/src/uninst-gpgmepp.nsi b/src/uninst-gpgmepp.nsi
deleted file mode 100644
index ca7c4df..0000000
--- a/src/uninst-gpgmepp.nsi
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (C) 2015 Intevation GmbH
-#
-# This file is part of GPG4Win.
-#
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GPG4Win is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/gpgmepp-${gpg4win_pkg_gpgmepp_version}
-
-; Uninstaller section.
-Section "-un.gpgmepp"
-!ifdef SOURCES
- Push "${gpg4win_pkg_gpgmepp}"
- Call un.SourceDelete
-!else
- Delete "$INSTDIR\bin\libKF5Gpgmepp.dll"
- Delete "$INSTDIR\bin\libKF5QGpgme.dll"
- RmDir "$INSTDIR\bin"
-
-!endif
-SectionEnd
commit f0273a58390870e0d86a61e155343789da6a749f
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Jan 17 11:59:03 2017 +0100
Auto update translations
--
diff --git a/po/de.po b/po/de.po
index c3bdf75..629d7a7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -402,8 +402,8 @@ msgstr "Warnung: Registration des GpgOL Outlook Plugin ist fehlgeschlagen."
msgctxt "DESC_SEC_gpgol"
msgid "GnuPG for Outlook"
msgstr ""
-"GnuPG für Outlook (GpgOL) ist eine Erweiterung für Microsoft Outlook, "
-"die verwendet wird, um Nachrichten mit OpenPGP oder S/MIME zu verschlüsseln. "
+"GnuPG für Outlook (GpgOL) ist eine Erweiterung für Microsoft Outlook, die "
+"verwendet wird, um Nachrichten mit OpenPGP oder S/MIME zu verschlüsseln. "
"Benötigt Kleopatra oder GPA."
msgctxt "DESC_SEC_kleopatra"
diff --git a/po/no.po b/po/no.po
index 3bd45c3..007bd52 100644
--- a/po/no.po
+++ b/po/no.po
@@ -76,6 +76,14 @@ msgctxt "T_AboutGpg4winSrcReleaseDate"
msgid "release date ${_BUILD_ISODATE}"
msgstr "utgivelsesdato ${_BUILD_ISODATE}"
+msgctxt "T_RunKleopatra"
+msgid "Run Kleopatra"
+msgstr "Kjør Kleopatra"
+
+msgctxt "T_RunGPA"
+msgid "Run GPA"
+msgstr "Kjør GPA"
+
msgctxt "T_LangCode"
msgid "en"
msgstr "no"
@@ -97,11 +105,6 @@ msgstr ""
"Kort fortalt: Du kan kjøre denne programvaren for all type bruk. Du kan dele "
"den videre så lenge mottakerne får same rettighetene til den som du har fått."
-#, fuzzy
-msgctxt "T_RunKeyManager"
-msgid "Run the key manager"
-msgstr "Kjør Kleopatra nøkkelhåndteringsverktøy."
-
msgctxt "T_MoreInfo"
msgid "Click here for the project's homepage"
msgstr "Trykk her for prosjektets hjemmeside"
@@ -177,18 +180,9 @@ msgstr ""
"r oppgradering til en vesentlig nyere versjon.\n"
"Vil du installere Gpg4win ${VERSION} likevel?"
-#, fuzzy
-msgctxt "T_FoundExistingVersionB"
-msgid ""
-"A version of Gpg4Win has already been installed on the system. There will be "
-"no problem installing and thus overwriting this Version.\n"
-"\n"
-"Do you want to continue installing Gpg4win?"
-msgstr ""
-"En installasjon av GnuPT har blitt oppdaget. Dette kan forårsake problemer "
-"når det brukes sammen med Gpg4win.\n"
-"\n"
-"Vil du fortsette installasjonen av Gpg4win?"
+msgctxt "T_UninstallingOldVersion"
+msgid "Uninstalling Gpg4win-"
+msgstr "Avinstallerer Gpg4win-"
msgctxt "T_FoundOldSeeManual"
msgid ""
@@ -300,8 +294,12 @@ msgstr ""
"installere en oppdatert versjon fra: http://www.claws-mail.org/win32 Vil du "
"avinstallere 'Claws Mail' fra Gpg4win nå?"
+msgctxt "T_Installing_GnuPG"
+msgid "Installing GnuPG"
+msgstr "Installerer GnuPG"
+
#, fuzzy
-msgctxt "DESC_SEC_gnupg2"
+msgctxt "DESC_SEC_gnupg_w32"
msgid "GNU Privacy Guard"
msgstr "GNU Privacy Guard"
@@ -381,18 +379,20 @@ msgctxt "DESC_Menu_compendium_en_pdf"
msgid "Show the Gpg4win Compendium (pdf, English)"
msgstr "Vis Gpg4win Compendium (pdf, Engelsk)"
-#~ msgctxt "T_RunKleopatra"
-#~ msgid "Run Kleopatra"
-#~ msgstr "Kjør Kleopatra"
-
-#~ msgctxt "T_RunGPA"
-#~ msgid "Run GPA"
-#~ msgstr "Kjør GPA"
-
-#~ msgctxt "T_UninstallingOldVersion"
-#~ msgid "Uninstalling Gpg4win-"
-#~ msgstr "Avinstallerer Gpg4win-"
+#, fuzzy
+#~ msgctxt "T_RunKeyManager"
+#~ msgid "Run the key manager"
+#~ msgstr "Kjør Kleopatra nøkkelhåndteringsverktøy."
-#~ msgctxt "T_Installing_GnuPG"
-#~ msgid "Installing GnuPG"
-#~ msgstr "Installerer GnuPG"
+#, fuzzy
+#~ msgctxt "T_FoundExistingVersionB"
+#~ msgid ""
+#~ "A version of Gpg4Win has already been installed on the system. There will "
+#~ "be no problem installing and thus overwriting this Version.\n"
+#~ "\n"
+#~ "Do you want to continue installing Gpg4win?"
+#~ msgstr ""
+#~ "En installasjon av GnuPT har blitt oppdaget. Dette kan forårsake "
+#~ "problemer når det brukes sammen med Gpg4win.\n"
+#~ "\n"
+#~ "Vil du fortsette installasjonen av Gpg4win?"
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 2 +-
configure.ac | 3 +-
packages/packages.current | 49 ++++++---------------
patches/gpgmepp/0002-disable-variants.patch | 66 -----------------------------
patches/libkleo/lower-kf5-required.patch | 17 ++++++++
po/de.po | 4 +-
po/no.po | 64 ++++++++++++++--------------
src/Makefile.am | 3 +-
src/config.nsi.in | 4 --
src/gpg4win.mk.in | 1 +
src/inst-gpgmepp.nsi | 36 ----------------
src/inst-kleopatra.nsi | 2 +-
src/inst-sections.nsi | 10 -----
src/uninst-gpgmepp.nsi | 34 ---------------
14 files changed, 69 insertions(+), 226 deletions(-)
delete mode 100755 patches/gpgmepp/0002-disable-variants.patch
create mode 100755 patches/libkleo/lower-kf5-required.patch
delete mode 100644 src/inst-gpgmepp.nsi
delete mode 100644 src/uninst-gpgmepp.nsi
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list