[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.2.5-14-g4acaf7f
by Andre Heinecke
cvs at cvs.gnupg.org
Wed Aug 26 16:58:31 CEST 2015
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 4acaf7fab7b0de019f05aee0abb5443af4d769b6 (commit)
via aefd799c5217799bf27b1727307d6380b173a2ea (commit)
via b5b8449f45c2debf30138cce950c9bb03c9fce1f (commit)
via 656daca1f865b645c15f34af3c1d55e41c9d9ce4 (commit)
via 935576828cf0a77d952d8191def843e41512cbe0 (commit)
via f895a29ccfb21fffdc039dea4f73602e943406ea (commit)
via 71c62168dd68d5e8e1de3e175981eb365e90b7d3 (commit)
from 334e7c7060c6bc274ec57f0f34f13139b1adee82 (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 4acaf7fab7b0de019f05aee0abb5443af4d769b6
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Aug 26 16:44:26 2015 +0200
Include GnuPG 2.1
GnuPG is now included from the official binary package.
* configure.ac: mark gnupg-w32 as binsrc package. No longer
configure gnupgs version.
* m4/gpg4win.m4: Allow packages to be .exe files.
* packages/packages.current (gnupg2): Removed.
(gnupg-w32): New.
(gpgme): Update to 1.6.0
* po/potfiles.in: Change gnupg2 to gnupg-w32
* po: Automated update.
* src/Makefile.am (EXTRA_DIST): Change gnupg2 to gnupg-w32
(gpg4win_bpkgs): Add gnupg-w32
* src/config.nsi.in: Change gnupg2 to gnupg-w32
* src/gpg4win.mk.in (DEFLATE_macro): Add ".exe" handling.
* src/inst-gnupg2.nsi, src/uninst-gnupg2.nsi: Removed.
* src/inst-sections.nsi: Update sections accordingly.
* src/installer.nsi (PrintCloseOtherApps): Remove checks for gpg stuff.
* src/inst-gnupg-w32.nsi, src/uninst-gnupg-w32.nsi: New.
--
The idea behind this change is that there is only one "core"
gnupg package and that we rely on that package.
gnupg-w32 is treated like a binary package and executed during
installation to install gnupg.
This is work in progress.
diff --git a/configure.ac b/configure.ac
index c30d27d..e101106 100644
--- a/configure.ac
+++ b/configure.ac
@@ -360,10 +360,8 @@ GPG4WIN_SPKG([libksba], [libgpg-error])
GPG4WIN_SPKG([libassuan], [libgpg-error w32pth])
GPG4WIN_SPKG([dirmngr], [libgpg-error libgcrypt libassuan libksba w32pth])
GPG4WIN_SPKG([pinentry], [libiconv gtk+])
-GPG4WIN_SPKG([gpgme], [libgpg-error gnupg2 glib])
+GPG4WIN_SPKG([gpgme], [libgpg-error glib])
GPG4WIN_SPKG([curl], [zlib gnutls])
-GPG4WIN_SPKG([gnupg2], [libiconv libgcrypt libksba libassuan libgpg-error dnl
- w32pth zlib bzip2 adns pinentry])
GPG4WIN_SPKG([gpgol], [gpgme libassuan])
GPG4WIN_SPKG([gpgex], [libassuan])
GPG4WIN_SPKG([scute], [libgpg-error libassuan])
@@ -384,11 +382,14 @@ GPG4WIN_SPKGEX([gpgex], [libassuan])
GPG4WIN_IPKG([compendium])
+# The GnuPG Package.
+GPG4WIN_BPKG_BINSRC([gnupg-w32])
+
# Qt related stuff.
GPG4WIN_BPKG_GNUWIN32([dbus])
GPG4WIN_BPKG_BINSRC([oxygen-icons])
GPG4WIN_BPKG_GNUWIN32([qt], [dbus])
-GPG4WIN_BPKG_BINSRC([kleopatra], [gpgme gnupg2 qt oxygen-icons])
+GPG4WIN_BPKG_BINSRC([kleopatra], [gpgme qt oxygen-icons])
GPG4WIN_FINALIZE
@@ -417,10 +418,6 @@ fi
# Finalize.
-AC_CONFIG_COMMANDS([gpg4win-conf],[[
-chmod +x patches/gnupg2/01-version.patch
-]])
-
AC_CONFIG_FILES(Makefile)
AC_CONFIG_FILES(packages/Makefile src/Makefile po/Makefile.in)
AC_CONFIG_FILES(po/build-cc)
@@ -429,7 +426,6 @@ AC_CONFIG_FILES(doc/Makefile)
AC_CONFIG_FILES(doc/logo/Makefile)
AC_CONFIG_FILES(doc/manual/Makefile doc/manual/version.tex)
AC_CONFIG_FILES(src/dictionaries/Makefile)
-AC_CONFIG_FILES(patches/gnupg2/01-version.patch)
AC_OUTPUT
# Throw a warning if optional tools are missing
diff --git a/m4/gpg4win.m4 b/m4/gpg4win.m4
index 91b2efe..7aa451b 100644
--- a/m4/gpg4win.m4
+++ b/m4/gpg4win.m4
@@ -141,6 +141,9 @@ AC_DEFUN([GPG4WIN_FIND],
AS_IF([test -z "$_gpg4win_file" -a $_gpg4win_format != tar],
[_gpg4win_file=`echo ${_gpg4win_dir}/${_gpg4win_glob}.zip`
_gpg4win_suffix=.zip])
+ AS_IF([test -z "$_gpg4win_file" -a $_gpg4win_format != tar -a $_gpg4win_format != zip],
+ [_gpg4win_file=`echo ${_gpg4win_dir}/${_gpg4win_glob}.exe`
+ _gpg4win_suffix=.exe])
shopt -u nullglob])
AS_IF([test -z "$_gpg4win_file"],
diff --git a/packages/packages.current b/packages/packages.current
index e64cd96..e9528ae 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -329,11 +329,15 @@ chk 86fe0436f3c8c394d32e142ee410a9f9560173fb
file libassuan/libassuan-2.2.1.tar.bz2
chk c21b86482f6a3624c2b46b91e20f8415f244233a
-# last changed: 2015-06-05
+# last changed: 2015-08-20
# by: ah
-name gnupg2-2.0.28.tar.bz2
-file gnupg/gnupg-2.0.28.tar.bz2
-chk 9a1050f72b6c9afe2b4a0a3f2e9dca2abba8e4ef
+name gnupg-w32-2.1.7-20150811-bin.exe
+file binary/gnupg-w32-2.1.7_20150811.exe
+chk dfea3fa2499f64cac223c9329c9f017bc3da11a5
+
+name gnupg-w32-2.1.7-20150811-src.tar.xz
+file binary/gnupg-w32-2.1.7_20150811.tar.xz
+chk 20439f65b8d94ec79523c45ad72418670ca9d5eb
# checked: 2014-07-16 ah
file dirmngr/dirmngr-1.1.1.tar.bz2
@@ -348,10 +352,10 @@ chk 0c47f0ddea4631bcba01ebbeca8bffe0bf43e440
file scute/scute-1.4.0.tar.bz2
chk e28141d2b03612c09512651795976c58ed3f8035
-# last changed: 2015-06-23
+# last changed: 2015-08-26
# by: ah
-file gpgme/gpgme-1.5.5.tar.bz2
-chk 88476d72cb099e179de4040760502886f7a54926
+file gpgme/gpgme-1.6.0.tar.bz2
+chk 21510323495f6220f8f67610c3c27a23d761d43d
# last changed: 2015-03-09
# by: ah
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b291bfd..14d980d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,7 +3,7 @@ src/g4wihelp.nsi
src/gpg4win.nsi
src/gpg4win-src.nsi
src/installer.nsi
-src/inst-gnupg2.nsi
+src/inst-gnupg-w32.nsi
src/inst-gpa.nsi
src/inst-gpg4win.nsi
src/inst-gpgex.nsi
diff --git a/po/ar.po b/po/ar.po
index 0931996..920ad92 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -284,8 +284,12 @@ msgid ""
"Uninstall Claws Mail from Gpg4win now?"
msgstr ""
+msgctxt "T_Installing_GnuPG"
+msgid "Installing GnuPG"
+msgstr ""
+
#, fuzzy
-msgctxt "DESC_SEC_gnupg2"
+msgctxt "DESC_SEC_gnupg_w32"
msgid "GNU Privacy Guard"
msgstr "ÍÇÑÓ ÎÕæÕíÉ Ìäæ"
diff --git a/po/cz.po b/po/cz.po
index 0424956..759c181 100644
--- a/po/cz.po
+++ b/po/cz.po
@@ -291,7 +291,12 @@ msgid ""
"Uninstall Claws Mail from Gpg4win now?"
msgstr ""
-msgctxt "DESC_SEC_gnupg2"
+msgctxt "T_Installing_GnuPG"
+msgid "Installing GnuPG"
+msgstr ""
+
+#, fuzzy
+msgctxt "DESC_SEC_gnupg_w32"
msgid "GNU Privacy Guard"
msgstr "GNU Privacy Guard"
diff --git a/po/de.po b/po/de.po
index fc3245c..ced3bcc 100644
--- a/po/de.po
+++ b/po/de.po
@@ -354,7 +354,12 @@ msgstr ""
"\n"
"Claws Mail aus Gpg4win jetzt deinstallieren?"
-msgctxt "DESC_SEC_gnupg2"
+msgctxt "T_Installing_GnuPG"
+msgid "Installing GnuPG"
+msgstr ""
+
+#, fuzzy
+msgctxt "DESC_SEC_gnupg_w32"
msgid "GNU Privacy Guard"
msgstr ""
"Der GNU Privacy Guard (GnuPG) ist der Kernbestandteil dieser Software. "
diff --git a/po/es.po b/po/es.po
index f6694f0..f8afa06 100644
--- a/po/es.po
+++ b/po/es.po
@@ -291,8 +291,12 @@ msgid ""
"Uninstall Claws Mail from Gpg4win now?"
msgstr ""
+msgctxt "T_Installing_GnuPG"
+msgid "Installing GnuPG"
+msgstr ""
+
#, fuzzy
-msgctxt "DESC_SEC_gnupg2"
+msgctxt "DESC_SEC_gnupg_w32"
msgid "GNU Privacy Guard"
msgstr "GNU Privacy Guard (GnuPG)"
diff --git a/po/fr.po b/po/fr.po
index 82253ca..57e60f2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -295,7 +295,12 @@ msgid ""
"Uninstall Claws Mail from Gpg4win now?"
msgstr ""
-msgctxt "DESC_SEC_gnupg2"
+msgctxt "T_Installing_GnuPG"
+msgid "Installing GnuPG"
+msgstr ""
+
+#, fuzzy
+msgctxt "DESC_SEC_gnupg_w32"
msgid "GNU Privacy Guard"
msgstr "GNU Privacy Guard"
diff --git a/po/it.po b/po/it.po
index 6d02018..8803e76 100644
--- a/po/it.po
+++ b/po/it.po
@@ -297,7 +297,12 @@ msgid ""
"Uninstall Claws Mail from Gpg4win now?"
msgstr ""
-msgctxt "DESC_SEC_gnupg2"
+msgctxt "T_Installing_GnuPG"
+msgid "Installing GnuPG"
+msgstr ""
+
+#, fuzzy
+msgctxt "DESC_SEC_gnupg_w32"
msgid "GNU Privacy Guard"
msgstr "GNU Privacy Guard"
diff --git a/po/pt.po b/po/pt.po
index 21704a2..69386eb 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -296,7 +296,12 @@ msgid ""
"Uninstall Claws Mail from Gpg4win now?"
msgstr ""
-msgctxt "DESC_SEC_gnupg2"
+msgctxt "T_Installing_GnuPG"
+msgid "Installing GnuPG"
+msgstr ""
+
+#, fuzzy
+msgctxt "DESC_SEC_gnupg_w32"
msgid "GNU Privacy Guard"
msgstr "GNU Privacy Guard"
diff --git a/po/ru.po b/po/ru.po
index 09c5392..96a48ef 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -292,8 +292,12 @@ msgid ""
"Uninstall Claws Mail from Gpg4win now?"
msgstr ""
+msgctxt "T_Installing_GnuPG"
+msgid "Installing GnuPG"
+msgstr ""
+
#, fuzzy
-msgctxt "DESC_SEC_gnupg2"
+msgctxt "DESC_SEC_gnupg_w32"
msgid "GNU Privacy Guard"
msgstr "GNU Privacy Guard"
diff --git a/src/Makefile.am b/src/Makefile.am
index ccd3269..555bcca 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,7 +39,7 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
inst-gettext.nsi uninst-gettext.nsi \
inst-libffi.nsi uninst-libffi.nsi \
inst-glib.nsi uninst-glib.nsi \
- inst-gnupg2.nsi uninst-gnupg2.nsi \
+ inst-gnupg-w32.nsi uninst-gnupg-w32.nsi \
inst-gpa.nsi uninst-gpa.nsi \
inst-gpgme.nsi uninst-gpgme.nsi \
inst-scute.nsi uninst-scute.nsi \
@@ -322,7 +322,7 @@ gpg4win_pkg_zlib_make_args_inst = -fwin32/Makefile.gcc install \
# Supported binary packages.
gpg4win_bpkgs = pkgconfig pango expat freetype fontconfig \
- cairo atk qt dbus oxygen-icons kleopatra bsfilter
+ cairo atk qt dbus oxygen-icons kleopatra bsfilter gnupg-w32
# libiconv needs some special magic to generate a usable import
# library.
diff --git a/src/config.nsi.in b/src/config.nsi.in
index 9a24f38..e58e05b 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -84,9 +84,9 @@
!define gpg4win_pkg_adns @gpg4win_pkg_adns@
!define gpg4win_pkg_adns_version @gpg4win_pkg_adns_version@
- at HAVE_PKG_GNUPG2@
-!define gpg4win_pkg_gnupg2 @gpg4win_pkg_gnupg2@
-!define gpg4win_pkg_gnupg2_version @gpg4win_pkg_gnupg2_version@
+ at HAVE_PKG_GNUPG_W32@
+!define gpg4win_pkg_gnupg_w32 @gpg4win_pkg_gnupg_w32@
+!define gpg4win_pkg_gnupg_w32_version @gpg4win_pkg_gnupg_w32_version@
@HAVE_PKG_PINENTRY@
!define gpg4win_pkg_pinentry @gpg4win_pkg_pinentry@
diff --git a/src/gpg4win.mk.in b/src/gpg4win.mk.in
index ca6aac9..0631478 100644
--- a/src/gpg4win.mk.in
+++ b/src/gpg4win.mk.in
@@ -118,6 +118,8 @@ define DEFLATE_macro
$(TAR) xjf "$(1)" ;; \
*.tar.xz ) \
$(TAR) xJf "$(1)" ;; \
+ *.exe ) \
+ cp "$(1)" . ;; \
*.zip) \
$(UNZIP) -o "$(1)" ;; \
esac
diff --git a/src/inst-gnupg-w32.nsi b/src/inst-gnupg-w32.nsi
new file mode 100644
index 0000000..dd16db3
--- /dev/null
+++ b/src/inst-gnupg-w32.nsi
@@ -0,0 +1,48 @@
+# inst-gnupg2.nsi - Installer snippet for gnupg-w32. -*- coding: latin-1; -*-
+# 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., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/gnupg-w32-${gpg4win_pkg_gnupg_w32_version}
+!define source ${bpdir}/gnupg-w32-${gpg4win_pkg_gnupg_w32_version}
+
+${MementoSection} "GnuPG" SEC_gnupg_w32
+ SectionIn RO
+
+!ifdef SOURCES
+ SetOutPath "$INSTDIR"
+ File "${gpg4win_pkg_gnupg_w32}"
+!else
+
+SetOutPath "$TEMP"
+ DetailPrint "$(T_Installing_GnuPG) ${gpg4win_pkg_gnupg_w32_version}"
+ File "${prefix}/gnupg-w32-${gpg4win_pkg_gnupg_w32_version}-bin.exe"
+ ExecWait '"$TEMP\gnupg-w32-${gpg4win_pkg_gnupg_w32_version}-bin.exe" /S /D="$INSTDIR\..\GnuPG"'
+
+ Delete "$TEMP\gnupg-w32-${gpg4win_pkg_gnupg_w32_version}-bin.exe"
+!endif
+${MementoSectionEnd}
+
+LangString T_Installing_GnuPG ${LANG_ENGLISH} \
+ "Installing GnuPG"
+
+LangString DESC_SEC_gnupg_w32 ${LANG_ENGLISH} \
+ "GNU Privacy Guard"
diff --git a/src/inst-gnupg2.nsi b/src/inst-gnupg2.nsi
deleted file mode 100644
index 0f4c879..0000000
--- a/src/inst-gnupg2.nsi
+++ /dev/null
@@ -1,221 +0,0 @@
-# inst-gnupg2.nsi - Installer snippet for gnupg2. -*- coding: latin-1; -*-
-# Copyright (C) 2007, 2008 g10 Code 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., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/gnupg2-${gpg4win_pkg_gnupg2_version}
-!define source ${bpdir}/gnupg2-${gpg4win_pkg_gnupg2_version}
-
-
-${MementoSection} "GnuPG" SEC_gnupg2
- SectionIn RO
-
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File "${gpg4win_pkg_gnupg2}"
-!else
- File "${prefix}/bin/gpg2.exe"
- File "${prefix}/bin/gpgv2.exe"
- File "${prefix}/bin/gpgsm.exe"
-
- # Fixme: gpgsplit is missing. I doubt that it makes sense to rename
- # it like we did with gpg. It might be better to install this tool
- # into a subdirectory.
-
- # If we are reinstalling, try to kill a possible running agent
- ifFileExists "$INSTDIR\gpg-connect-agent.exe" 0 no_gpg_connect_agent
- ExecWait '"$INSTDIR\gpg-connect-agent.exe" killagent /bye'
- no_gpg_connect_agent:
-
- ClearErrors
- SetOverwrite try
- File "${prefix}/bin/gpg-agent.exe"
- SetOverwrite lastused
- ifErrors 0 +3
- File /oname=gpg-agent.exe.tmp "${prefix}/bin/gpg-agent.exe"
- Rename /REBOOTOK gpg-agent.exe.tmp gpg-agent.exe
-
- File "${prefix}/libexec/scdaemon.exe"
- File "${prefix}/bin/gpgconf.exe"
- File "${prefix}/bin/gpg-connect-agent.exe"
-
- File /nonfatal "${prefix}/bin/gpgtar.exe"
-
-
- # As a special exception, these programs are not kept in
- # libexec/gnupg, where they belong. Please see the comment in
- # gnupg/g10/keyserver.c::keyserver_spawn() for an explanation.
- File "${prefix}/libexec/gpg2keys_finger.exe"
- File "${prefix}/libexec/gpg2keys_hkp.exe"
- File "${prefix}/libexec/gpg2keys_curl.exe"
- File "${prefix}/libexec/gpg2keys_ldap.exe"
- File /nonfatal "${prefix}/libexec/gpg2keys_kdns.exe"
- File "${prefix}/libexec/gpg-protect-tool.exe"
- File "${prefix}/libexec/gpg-preset-passphrase.exe"
-
- # Install the wrappers into the PATH included directory. These are
- # our poor hacker's symlinks. We always install wrappers
- # gpg[v]->gpg[v]2. If old applications are not able to work with
- # gpg2, they may still install a gpg1 version and use the installed
- # version directly without the wrapper.
- SetOutPath "$INSTDIR\pub"
- File /oname=gpg.exe "${BUILD_DIR}/gpgwrap-2.exe"
- File /oname=gpgv.exe "${BUILD_DIR}/gpgwrap-2.exe"
- File /oname=gpg2.exe "${BUILD_DIR}/gpgwrap.exe"
- File /oname=gpgsm.exe "${BUILD_DIR}/gpgwrap.exe"
- File /oname=gpg-connect-agent.exe "${BUILD_DIR}/gpgwrap.exe"
- File /oname=gpgconf.exe "${BUILD_DIR}/gpgwrap.exe"
- # fixme: gpgsplit is missing; see above
-
- SetOutPath "$INSTDIR\share\gnupg"
- File "${prefix}/share/gnupg/qualified.txt"
- # Due to problems with kleoptra we currently do not install the
- # common certificates anymore.
- #File "${prefix}/share/gnupg/com-certs.pem"
- File "${prefix}/share/gnupg/gpg-conf.skel"
- # [fixme: Missing in gnupg2] File "${prefix}/share/gnupg/options.skel"
- # [fixme: Missing in gnupg2] File "${prefix}/share/gnupg/FAQ"
- # [fixme: Missing in gnupg2] File "${prefix}/share/gnupg/faq.html"
- File "${prefix}/share/man/man1/gpg2.man"
- File "${prefix}/share/man/man1/gpgv2.man"
- File "${prefix}/share/man/man1/gpgsm.man"
- File "${prefix}/share/man/man1/gpg-agent.man"
- File "${prefix}/share/man/man1/scdaemon.man"
- File "${prefix}/share/man/man1/gpg-connect-agent.man"
- File "${prefix}/share/man/man1/gpgconf.man"
-
- # Install the language files for gpg. Note that the PO files are
- # required to be UTF-8 encoded and that the post-install macro in
- # Makefile.am needs to build them. The language used depends on the
- # current locale of the session and may be overriden using LC_ALL,
- # LC_MESSAGES or LANG.
-
- # 1. Remove posible left over files from old versions.
- Delete "$INSTDIR\gnupg2.nls\*.mo"
- RMDir "$INSTDIR\gnupg2.nls"
-
- # 2. Install the help files
- File /nonfatal "${prefix}/share/gnupg/help.*.txt"
-
- # 3. Install the mo files.
- SetOutPath "$INSTDIR\share\locale\be\LC_MESSAGES"
- File /nonfatal ${prefix}/share/locale/be/LC_MESSAGES/gnupg2.mo
- SetOutPath "$INSTDIR\share\locale\ca\LC_MESSAGES"
- File /nonfatal ${prefix}/share/locale/ca/LC_MESSAGES/gnupg2.mo
- SetOutPath "$INSTDIR\share\locale\cs\LC_MESSAGES"
- File /nonfatal ${prefix}/share/locale/cs/LC_MESSAGES/gnupg2.mo
- SetOutPath "$INSTDIR\share\locale\da\LC_MESSAGES"
- File /nonfatal ${prefix}/share/locale/da/LC_MESSAGES/gnupg2.mo
- SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
- File /nonfatal ${prefix}/share/locale/de/LC_MESSAGES/gnupg2.mo
- SetOutPath "$INSTDIR\share\locale\el\LC_MESSAGES"
- File /nonfatal ${prefix}/share/locale/el/LC_MESSAGES/gnupg2.mo
- SetOutPath "$INSTDIR\share\locale\eo\LC_MESSAGES"
- File /nonfatal ${prefix}/share/locale/eo/LC_MESSAGES/gnupg2.mo
- SetOutPath "$INSTDIR\share\locale\es\LC_MESSAGES"
- File /nonfatal ${prefix}/share/locale/es/LC_MESSAGES/gnupg2.mo
- SetOutPath "$INSTDIR\share\locale\et\LC_MESSAGES"
- File /nonfatal ${prefix}/share/locale/et/LC_MESSAGES/gnupg2.mo
- SetOutPath "$INSTDIR\share\locale\fi\LC_MESSAGES"
- File /nonfatal ${prefix}/share/locale/fi/LC_MESSAGES/gnupg2.mo
- SetOutPath "$INSTDIR\share\locale\fr\LC_MESSAGES"
- File /nonfatal ${prefix}/share/locale/fr/LC_MESSAGES/gnupg2.mo
- SetOutPath "$INSTDIR\share\locale\gl\LC_MESSAGES"
- File /nonfatal ${prefix}/share/locale/gl/LC_MESSAGES/gnupg2.mo
- SetOutPath "$INSTDIR\share\locale\hu\LC_MESSAGES"
- File /nonfatal ${prefix}/share/locale/hu/LC_MESSAGES/gnupg2.mo
- SetOutPath "$INSTDIR\share\locale\id\LC_MESSAGES"
- File /nonfatal ${prefix}/share/locale/id/LC_MESSAGES/gnupg2.mo
- SetOutPath "$INSTDIR\share\locale\it\LC_MESSAGES"
- File /nonfatal ${prefix}/share/locale/it/LC_MESSAGES/gnupg2.mo
- SetOutPath "$INSTDIR\share\locale\ja\LC_MESSAGES"
- File /nonfatal ${prefix}/share/locale/ja/LC_MESSAGES/gnupg2.mo
- SetOutPath "$INSTDIR\share\locale\nb\LC_MESSAGES"
- File /nonfatal ${prefix}/share/locale/nb/LC_MESSAGES/gnupg2.mo
- SetOutPath "$INSTDIR\share\locale\pl\LC_MESSAGES"
- File /nonfatal ${prefix}/share/locale/pl/LC_MESSAGES/gnupg2.mo
- SetOutPath "$INSTDIR\share\locale\pt_BR\LC_MESSAGES"
- File /nonfatal ${prefix}/share/locale/pt_BR/LC_MESSAGES/gnupg2.mo
- SetOutPath "$INSTDIR\share\locale\pt\LC_MESSAGES"
- File /nonfatal ${prefix}/share/locale/pt/LC_MESSAGES/gnupg2.mo
- SetOutPath "$INSTDIR\share\locale\ro\LC_MESSAGES"
- File /nonfatal ${prefix}/share/locale/ro/LC_MESSAGES/gnupg2.mo
- SetOutPath "$INSTDIR\share\locale\ru\LC_MESSAGES"
- File /nonfatal ${prefix}/share/locale/ru/LC_MESSAGES/gnupg2.mo
- SetOutPath "$INSTDIR\share\locale\sk\LC_MESSAGES"
- File /nonfatal ${prefix}/share/locale/sk/LC_MESSAGES/gnupg2.mo
- SetOutPath "$INSTDIR\share\locale\sv\LC_MESSAGES"
- File /nonfatal ${prefix}/share/locale/sv/LC_MESSAGES/gnupg2.mo
- SetOutPath "$INSTDIR\share\locale\tr\LC_MESSAGES"
- File /nonfatal ${prefix}/share/locale/tr/LC_MESSAGES/gnupg2.mo
- SetOutPath "$INSTDIR\share\locale\zh_CN\LC_MESSAGES"
- File /nonfatal ${prefix}/share/locale/zh_CN/LC_MESSAGES/gnupg2.mo
- SetOutPath "$INSTDIR\share\locale\zh_TW\LC_MESSAGES"
- File /nonfatal ${prefix}/share/locale/zh_TW/LC_MESSAGES/gnupg2.mo
-
-
- # Always install the new template into COMMON_APPDATA folder.
- SetShellVarContext all
- SetOutPath "$APPDATA\GNU\etc\gnupg"
- File /oname=gpgconf-conf.skel "${source}/doc/examples/gpgconf.conf"
- File /oname=trustlist.txt.example "${source}/doc/examples/trustlist.txt"
- # create empty trustlist.txt if not exists
- IfFileExists "$APPDATA\GNU\etc\gnupg\trustlist.txt" TrustlistExists TrustlistNotExists
- TrustlistNotExists:
- FileOpen $9 trustlist.txt w ;Open new file
- FileClose $9 ;Closes file
- TrustlistExists:
- SetShellVarContext current
-
-
- # If requested, install the configuration files.
- ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" AppData
- StrCmp $0 "" no_config_gpg_conf_files
- CreateDirectory "$0\gnupg"
-
- g4wihelp::config_fetch "gpg.conf"
- StrCmp $R0 "" no_config_gpg2_conf
- CopyFiles $R0 "$0\gnupg\gpg.conf"
- no_config_gpg2_conf:
-
- g4wihelp::config_fetch "gpg-agent.conf"
- StrCmp $R0 "" no_config_gpg_agent_conf
- CopyFiles $R0 "$0\gnupg\gpg-agent.conf"
- no_config_gpg_agent_conf:
-
- g4wihelp::config_fetch "scdaemon.conf"
- StrCmp $R0 "" no_config_scdaemon_conf
- CopyFiles $R0 "$0\gnupg\scdaemon.conf"
- no_config_scdaemon_conf:
-
- g4wihelp::config_fetch "trustlist.txt"
- StrCmp $R0 "" no_config_trustlist_txt
- CopyFiles $R0 "$0\gnupg\trustlist.txt"
- no_config_trustlist_txt:
-
- no_config_gpg_conf_files:
-
-!endif
-${MementoSectionEnd}
-
-LangString DESC_SEC_gnupg2 ${LANG_ENGLISH} \
- "GNU Privacy Guard"
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index d5906e0..b43414b 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -119,8 +119,8 @@
!ifdef HAVE_PKG_PINENTRY
!include "inst-pinentry.nsi"
!endif
-!ifdef HAVE_PKG_GNUPG2
-!include "inst-gnupg2.nsi"
+!ifdef HAVE_PKG_GNUPG_W32
+!include "inst-gnupg-w32.nsi"
!endif
!ifdef HAVE_PKG_GPGME
!include "inst-gpgme.nsi"
@@ -203,8 +203,8 @@
!ifdef HAVE_PKG_GPGME
!include "uninst-gpgme.nsi"
!endif
-!ifdef HAVE_PKG_GNUPG2
-!include "uninst-gnupg2.nsi"
+!ifdef HAVE_PKG_GNUPG_W32
+!include "uninst-gnupg-w32.nsi"
!endif
!ifdef HAVE_PKG_PINENTRY
!include "uninst-pinentry.nsi"
@@ -566,7 +566,8 @@ Function CalcDepends
# these packages in the RO section and enabling them by default, but
# it doesn't harm to add it explicitely here as well.
- !insertmacro SelectSection ${SEC_gnupg2}
+ # TODO: Handle newer / other gnupg versions
+ !insertmacro SelectSection ${SEC_gnupg_w32}
# Then enable all dependencies, mostly in reverse build list order!
@@ -629,26 +630,11 @@ Function CalcDepends
skip_kleopatra:
!endif
-!ifdef HAVE_PKG_GNUPG2
- !insertmacro SectionFlagIsSet ${SEC_gnupg2} ${SF_SELECTED} have_gnupg2 skip_gnupg2
- have_gnupg2:
- !insertmacro SelectSection ${SEC_libiconv}
- !insertmacro SelectSection ${SEC_libgcrypt}
- !insertmacro SelectSection ${SEC_libksba}
- !insertmacro SelectSection ${SEC_libassuan}
- !insertmacro SelectSection ${SEC_libgpg_error}
- !insertmacro SelectSection ${SEC_w32pth}
- !insertmacro SelectSection ${SEC_zlib}
- !insertmacro SelectSection ${SEC_adns}
+!ifdef HAVE_PKG_GNUPG_W32
+ !insertmacro SectionFlagIsSet ${SEC_gnupg_w32} ${SF_SELECTED} have_gnupg_w32 skip_gnupg_w32
+ have_gnupg_w32:
!insertmacro SelectSection ${SEC_pinentry}
- !insertmacro SelectSection ${SEC_curl}
- !insertmacro SelectSection ${SEC_dirmngr}
- # Because we need pinentry, we also need to install GTK+
- !insertmacro SelectSection ${SEC_zlib}
- !insertmacro SelectSection ${SEC_gtk_}
- !insertmacro SelectSection ${SEC_libpng}
- !insertmacro SelectSection ${SEC_glib}
- skip_gnupg2:
+ skip_gnupg_w32:
!endif
!ifdef HAVE_PKG_GPA
@@ -723,7 +709,12 @@ Function CalcDepends
${SF_SELECTED} have_pinentry skip_pinentry
have_pinentry:
!insertmacro SelectSection ${SEC_libiconv}
+!ifdef HAVE_PKG_QT
+ !insertmacro SelectSection ${SEC_qt}
+!endif
+!ifdef HAVE_PKG_GTK_
!insertmacro SelectSection ${SEC_gtk_}
+!endif
skip_pinentry:
!endif
@@ -939,8 +930,8 @@ FunctionEnd
# This must be in a central place. Urgs.
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-!ifdef HAVE_PKG_GNUPG2
- !insertmacro MUI_DESCRIPTION_TEXT ${SEC_gnupg2} $(DESC_SEC_gnupg2)
+!ifdef HAVE_PKG_GNUPG_W32
+ !insertmacro MUI_DESCRIPTION_TEXT ${SEC_gnupg_w32} $(DESC_SEC_gnupg_w32)
!endif
!ifdef HAVE_PKG_GPGOL
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_gpgol} $(DESC_SEC_gpgol)
diff --git a/src/installer.nsi b/src/installer.nsi
index b7ff0dd..1c2fed2 100644
--- a/src/installer.nsi
+++ b/src/installer.nsi
@@ -450,19 +450,12 @@ FunctionEnd
# Check whether this is a reinstall and popup a message box to explain
# that it is better to close other apps before continuing
Function PrintCloseOtherApps
- IfFileExists $INSTDIR\gnupg.exe print_warning
- IfFileExists $INSTDIR\winpt.exe print_warning
+ # TODO Look for running processes instead.
IfFileExists $INSTDIR\gpa.exe print_warning
IfFileExists $INSTDIR\gpgol.dll print_warning
- IfFileExists $INSTDIR\dirmngr.exe print_warning
Return
print_warning:
MessageBox MB_OK|MB_ICONEXCLAMATION "$(T_CloseOtherApps)"
- IfFileExists $INSTDIR\winpt.exe 0 +3
- MessageBox MB_OK "$(T_ShuttingDownWinPT)"
- ExecWait '"$INSTDIR\winpt.exe" --stop'
- IfFileExists $INSTDIR\dirmngr.exe 0 +3
- g4wihelp::service_stop "DirMngr"
leave:
FunctionEnd
diff --git a/src/uninst-gnupg-w32.nsi b/src/uninst-gnupg-w32.nsi
new file mode 100644
index 0000000..c9adef2
--- /dev/null
+++ b/src/uninst-gnupg-w32.nsi
@@ -0,0 +1,34 @@
+# inst-gnupg2.nsi - Uninstaller snippet for gnupg-w32. -*- coding: latin-1; -*-
+# 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., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/gnupg-w32-${gpg4win_pkg_gnupg_w32_version}
+
+
+# Uninstaller section.
+Section "un.gnupg_w32"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_gnupg_w32}"
+ Call un.SourceDelete
+!else
+ # TODO: Read gnupg uninstaller from registry.
+!endif
+SectionEnd
diff --git a/src/uninst-gnupg2.nsi b/src/uninst-gnupg2.nsi
deleted file mode 100644
index 0242192..0000000
--- a/src/uninst-gnupg2.nsi
+++ /dev/null
@@ -1,105 +0,0 @@
-# uninst-gnupg2.nsi - Uninstaller snippet for gnupg2. -*- coding: latin-1; -*-
-# Copyright (C) 2007 g10 Code 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., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/gnupg2-${gpg4win_pkg_gnupg2_version}
-
-
-# Uninstaller section.
-Section "-un.gnupg"
-!ifdef SOURCES
- Push "${gpg4win_pkg_gnupg2}"
- Call un.SourceDelete
-!else
- # Try to stop a running agent. This is only for the admin but in
- # some cases that is actually useful.
- ifFileExists "$INSTDIR\gpg-connect-agent.exe" 0 no_u_gpg_connect_agent
- ifFileExists "$INSTDIR\libgpg-error-0.dll" 0 no_u_gpg_connect_agent
- ifFileExists "$INSTDIR\libw32pth-0.dll" 0 no_u_gpg_connect_agent
- ExecWait '"$INSTDIR\gpg-connect-agent.exe" killagent /bye'
- no_u_gpg_connect_agent:
-
- Delete "$INSTDIR\gpg2.exe"
- Delete "$INSTDIR\gpgv2.exe"
- Delete "$INSTDIR\gpgsm.exe"
- Delete /REBOOTOK "$INSTDIR\gpg-agent.exe"
- Delete /REBOOTOK "$INSTDIR\scdaemon.exe"
- Delete "$INSTDIR\gpgconf.exe"
- Delete "$INSTDIR\gpg-connect-agent.exe"
- Delete "$INSTDIR\gpgsplit.exe"
- Delete "$INSTDIR\gpgtar.exe"
-
- Delete "$INSTDIR\pub\gpg.exe"
- Delete "$INSTDIR\pub\gpg2.exe"
- Delete "$INSTDIR\pub\gpgv.exe"
- Delete "$INSTDIR\pub\gpgsm.exe"
- Delete "$INSTDIR\pub\gpg-connect-agent.exe"
- Delete "$INSTDIR\pub\gpgconf.exe"
-
- Delete "$INSTDIR\gpg2keys_finger.exe"
- Delete "$INSTDIR\gpg2keys_hkp.exe"
- Delete "$INSTDIR\gpg2keys_curl.exe"
- Delete "$INSTDIR\gpg2keys_ldap.exe"
- Delete "$INSTDIR\gpg2keys_kdns.exe"
- Delete "$INSTDIR\gpg-protect-tool.exe"
- Delete "$INSTDIR\gpg-preset-passphrase.exe"
-
- Delete "$INSTDIR\share\gnupg\qualified.txt"
- Delete "$INSTDIR\share\gnupg\com-certs.pem"
- Delete "$INSTDIR\share\gnupg\gpg-conf.skel"
- Delete "$INSTDIR\share\gnupg\help.*.txt"
- Delete "$INSTDIR\share\gnupg\*.man"
- RMDir "$INSTDIR\share\gnupg"
-
-
- Delete "$INSTDIR\share\locale\be\LC_MESSAGES\gnupg2.mo"
- Delete "$INSTDIR\share\locale\ca\LC_MESSAGES\gnupg2.mo"
- Delete "$INSTDIR\share\locale\cs\LC_MESSAGES\gnupg2.mo"
- Delete "$INSTDIR\share\locale\da\LC_MESSAGES\gnupg2.mo"
- Delete "$INSTDIR\share\locale\de\LC_MESSAGES\gnupg2.mo"
- Delete "$INSTDIR\share\locale\el\LC_MESSAGES\gnupg2.mo"
- Delete "$INSTDIR\share\locale\eo\LC_MESSAGES\gnupg2.mo"
- Delete "$INSTDIR\share\locale\es\LC_MESSAGES\gnupg2.mo"
- Delete "$INSTDIR\share\locale\et\LC_MESSAGES\gnupg2.mo"
- Delete "$INSTDIR\share\locale\fi\LC_MESSAGES\gnupg2.mo"
- Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\gnupg2.mo"
- Delete "$INSTDIR\share\locale\gl\LC_MESSAGES\gnupg2.mo"
- Delete "$INSTDIR\share\locale\hu\LC_MESSAGES\gnupg2.mo"
- Delete "$INSTDIR\share\locale\id\LC_MESSAGES\gnupg2.mo"
- Delete "$INSTDIR\share\locale\it\LC_MESSAGES\gnupg2.mo"
- Delete "$INSTDIR\share\locale\ja\LC_MESSAGES\gnupg2.mo"
- Delete "$INSTDIR\share\locale\nb\LC_MESSAGES\gnupg2.mo"
- Delete "$INSTDIR\share\locale\pl\LC_MESSAGES\gnupg2.mo"
- Delete "$INSTDIR\share\locale\pt_BR\LC_MESSAGES\gnupg2.mo"
- Delete "$INSTDIR\share\locale\pt\LC_MESSAGES\gnupg2.mo"
- Delete "$INSTDIR\share\locale\ro\LC_MESSAGES\gnupg2.mo"
- Delete "$INSTDIR\share\locale\ru\LC_MESSAGES\gnupg2.mo"
- Delete "$INSTDIR\share\locale\sk\LC_MESSAGES\gnupg2.mo"
- Delete "$INSTDIR\share\locale\sv\LC_MESSAGES\gnupg2.mo"
- Delete "$INSTDIR\share\locale\tr\LC_MESSAGES\gnupg2.mo"
- Delete "$INSTDIR\share\locale\zh_CN\LC_MESSAGES\gnupg2.mo"
- Delete "$INSTDIR\share\locale\zh_TW\LC_MESSAGES\gnupg2.mo"
-
-
-!endif
-SectionEnd
commit aefd799c5217799bf27b1727307d6380b173a2ea
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Aug 26 16:39:19 2015 +0200
Switch from GNU/GnuPG to Gpg4win naming
* src/gpg4win.nsi: Change install dir.
* src/installer-finish.nsi: Update regkeys and paths.
* src/installer.nsi: Ditto.
diff --git a/src/gpg4win.nsi b/src/gpg4win.nsi
index 4f0b599..cce51f6 100644
--- a/src/gpg4win.nsi
+++ b/src/gpg4win.nsi
@@ -124,7 +124,7 @@
!define COPYRIGHT "Copyright (C) 2008 g10 Code GmbH"
!define DESCRIPTION "Gpg4win: The GNU Privacy Guard and Tools for Windows"
-!define INSTALL_DIR "GnuPG"
+!define INSTALL_DIR "Gpg4win"
!define WELCOME_TITLE_STR "$(T_WelcomeTitleGpg4win)"
diff --git a/src/installer-finish.nsi b/src/installer-finish.nsi
index 77ace90..86ec2d5 100644
--- a/src/installer-finish.nsi
+++ b/src/installer-finish.nsi
@@ -181,15 +181,11 @@ no_quick_launch_uninstall:
# hard to get rid of directories which could have REBOOTOK files.
RMDir /REBOOTOK "$INSTDIR\bin"
RMDir /REBOOTOK "$INSTDIR"
- StrCmp "$INSTDIR" "$PROGRAMFILES\GNU\${INSTALL_DIR}" 0 +2
- RMDir /REBOOTOK "$PROGRAMFILES\GNU"
# Clean the registry.
- DeleteRegValue HKLM "Software\GNU\${PRETTY_PACKAGE_SHORT}" \
+ DeleteRegValue HKLM "Software\${PRETTY_PACKAGE_SHORT}" \
"Install Directory"
- DeleteRegKey /ifempty HKLM "Software\GNU\${PRETTY_PACKAGE_SHORT}"
- DeleteRegKey /ifempty HKLM "Software\GNU\GnuPG"
- DeleteRegKey /ifempty HKLM "Software\GNU"
+ DeleteRegKey /ifempty HKLM "Software\${PRETTY_PACKAGE_SHORT}"
# Remove Windows Add/Remove Programs support.
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRETTY_PACKAGE_SHORT}"
diff --git a/src/installer.nsi b/src/installer.nsi
index b56acd6..b7ff0dd 100644
--- a/src/installer.nsi
+++ b/src/installer.nsi
@@ -73,10 +73,10 @@ OutFile "${PACKAGE}-${VERSION}.exe"
!ifndef INSTALL_DIR
!define INSTALL_DIR "${PACKAGE}"
!endif
-InstallDir "$PROGRAMFILES\GNU\${INSTALL_DIR}"
+InstallDir "$PROGRAMFILES\${INSTALL_DIR}"
-InstallDirRegKey HKLM "Software\GNU\${PRETTY_PACKAGE_SHORT}" \
+InstallDirRegKey HKLM "Software\${PRETTY_PACKAGE_SHORT}" \
"Install Directory"
@@ -130,7 +130,7 @@ Var OtherGnuPGDetected
# Remember the installer language
!define MUI_LANGDLL_REGISTRY_ROOT "HKLM"
-!define MUI_LANGDLL_REGISTRY_KEY "Software\GNU\${PRETTY_PACKAGE_SHORT}"
+!define MUI_LANGDLL_REGISTRY_KEY "Software\${PRETTY_PACKAGE_SHORT}"
!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
# No Umlaute, please!
@@ -164,7 +164,7 @@ Var STARTMENU_FOLDER
!define MUI_PAGE_CUSTOMFUNCTION_PRE CheckIfStartMenuWanted
!define MUI_STARTMENUPAGE_NODISABLE
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
-!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\GNU\${PRETTY_PACKAGE_SHORT}"
+!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\${PRETTY_PACKAGE_SHORT}"
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
!insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
@@ -398,6 +398,8 @@ Function CheckExistingVersion
MessageBox MB_YESNO "$(T_FoundExistingVersionB)" IDYES leave
Abort
+ # TODO This is the normal update case. Handle more gracefully.
+ # Especially the install path change from 2.x to 3.x
leave:
FunctionEnd
commit b5b8449f45c2debf30138cce950c9bb03c9fce1f
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Aug 26 16:19:04 2015 +0200
Update gettext
* packages/packages.current(gettext): Update.
--
The old version does not compile with jessie default autotools.
diff --git a/packages/packages.current b/packages/packages.current
index 39b548d..e64cd96 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -17,12 +17,13 @@
#
server ftp://ftp.cs.tu-berlin.de/pub/gnu
-# checked: 2014-06-20 ah - updated
+# last-changed: 2015-08-25
+# by: ah
# verified with key: 4622 25C3 B46F 3487 9FC8 496C D605 848E D7E6 9871
-file gettext/gettext-0.19.1.tar.xz
-chk e0d425de1bd1a16993b262ff37eaf08abee8f953
+file gettext/gettext-0.19.5.tar.xz
+chk bfe50a885076a24d63b9d9b242a409cc16727d24
-# checked: 2014-06-20 ah
+# checked: 2015-08-25 ah
file libiconv/libiconv-1.14.tar.gz
chk be7d67e50d72ff067b2c0291311bc283add36965
commit 656daca1f865b645c15f34af3c1d55e41c9d9ce4
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Aug 26 15:14:42 2015 +0200
Update README for debian jessie
* README: Update some infos.
diff --git a/README b/README
index 9404ae7..0ad59f2 100644
--- a/README
+++ b/README
@@ -32,7 +32,7 @@ Basic requirements
==================
A decent POSIX system is required for building this software as well
-as GNU make. We are using Debian GNU/Linux 7 (Wheezy), any other
+as GNU make. We are using Debian GNU/Linux 8 (Jessie), any other
POSIX system should work as well but you may run into problems due to
different toolchain versions.
@@ -40,7 +40,7 @@ To satisfy all needs of configure at least the following packages need
to be installed:
build-essential (libc6-dev, gcc, g++, make)
- automake 1.11, autoconf (if building from GIT)
+ automake, autoconf (if building from GIT)
mingw32
mingw-w64
mingw-w64-i686-dev
@@ -50,7 +50,7 @@ to be installed:
unzip
texinfo
imagemagick
- gs-common (gs)
+ gs-common | ghostscript (gs)
docbook-utils
gettext (msgfmt, dcgettext, gmsgfmt, xgettext for glib)
libglib2.0-dev (glib-genmarshal, glib-compile-{resources,schemas})
@@ -60,6 +60,7 @@ to be installed:
texlive-lang-german
latex-xcolor (for the compendium)
libqt4-dev-bin (in case pinentry-qt needs moc)
+ libgettextpo-dev
Building the Webpages
commit 935576828cf0a77d952d8191def843e41512cbe0
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Aug 26 15:12:32 2015 +0200
Change --build-w32 to old --build-w32-w64
* autogen.sh: Remove --build-w32-w64.
--
The build-w32-w64 command was never documented. Building
gpgex for 64 bit should be default for the convience
configure offered by autogen.sh
diff --git a/autogen.sh b/autogen.sh
index 731ef13..06be0c7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -79,10 +79,6 @@ myhostsub=""
case "$1" in
--build-w32)
myhost="w32"
- shift
- ;;
- --build-w32-w64)
- myhost="w32"
myhostsub="w64"
shift
;;
@@ -209,7 +205,7 @@ if test "$DIE" = "yes"; then
cat <<EOF
Note that you may use alternative versions of the tools by setting
-the corresponding environment variables; see README.SVN for details.
+the corresponding environment variables; see README.GIT for details.
EOF
exit 1
commit f895a29ccfb21fffdc039dea4f73602e943406ea
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Aug 26 12:31:23 2015 +0200
Bump Version to 3.0.0
* configure.ac: Bump version.
diff --git a/NEWS b/NEWS
index 28554a8..32df0d8 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,20 @@
#
# The version number given below are for the standard installers as
# distributed by www.gpg4win.org.
+Noteworthy changes in version 3.0.0 (unreleased)
+------------------------------------------------
+
+~~~~~~~~~~~~~~~
+GnuPG: 2.1.7
+Kleopatra: 2.2.0-gitcf609810
+GPA: 0.9.7
+GpgOL: 1.2.1
+GpgEX: 1.0.2
+Kompendium DE: 3.0.0
+Kompendium EN: 3.0.0
+~~~~~~~~~~~~~~~
+
+
Noteworthy changes in version 2.2.6 (unreleased)
------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 8a97d24..c30d27d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ min_automake_version="1.9.3"
# commit and push so that the git magic is able to work.
#
# After a release the make target "copy-news" is to be called as well!
-m4_define([my_version], [2.2.6])
+m4_define([my_version], [3.0.0])
# Below is m4 magic to extract and compute the git revision number,
# the decimalized short revision number, a beta version string and a
-----------------------------------------------------------------------
Summary of changes:
NEWS | 14 ++
README | 7 +-
autogen.sh | 6 +-
configure.ac | 16 +-
m4/gpg4win.m4 | 3 +
packages/packages.current | 31 ++--
po/POTFILES.in | 2 +-
po/ar.po | 6 +-
po/cz.po | 7 +-
po/de.po | 7 +-
po/es.po | 6 +-
po/fr.po | 7 +-
po/it.po | 7 +-
po/pt.po | 7 +-
po/ru.po | 6 +-
src/Makefile.am | 4 +-
src/config.nsi.in | 6 +-
src/gpg4win.mk.in | 2 +
src/gpg4win.nsi | 2 +-
src/{inst-libgcrypt.nsi => inst-gnupg-w32.nsi} | 43 +++--
src/inst-gnupg2.nsi | 221 -------------------------
src/inst-sections.nsi | 43 ++---
src/installer-finish.nsi | 8 +-
src/installer.nsi | 19 +--
src/{uninst-bzip2.nsi => uninst-gnupg-w32.nsi} | 24 ++-
src/uninst-gnupg2.nsi | 105 ------------
26 files changed, 156 insertions(+), 453 deletions(-)
copy src/{inst-libgcrypt.nsi => inst-gnupg-w32.nsi} (50%)
delete mode 100644 src/inst-gnupg2.nsi
copy src/{uninst-bzip2.nsi => uninst-gnupg-w32.nsi} (72%)
delete mode 100644 src/uninst-gnupg2.nsi
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list