[Gpg4win-commits] r833 - in trunk: . include packages patches po src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Thu Jun 5 21:47:36 CEST 2008
Author: werner
Date: 2008-06-05 21:47:35 +0200 (Thu, 05 Jun 2008)
New Revision: 833
Removed:
trunk/patches/gnupg-1.4.8/
trunk/src/inst-gnupg.nsi
trunk/src/uninst-gnupg.nsi
Modified:
trunk/ChangeLog
trunk/Makefile.am
trunk/NEWS
trunk/configure.ac
trunk/include/config.nsi.in
trunk/packages/packages.current
trunk/po/POTFILES.in
trunk/po/ar.po
trunk/po/de.po
trunk/po/es.po
trunk/po/fr.po
trunk/po/ru.po
trunk/src/Makefile.am
trunk/src/gpgwrap.c
trunk/src/inst-gnupg2.nsi
trunk/src/inst-gpg4win.nsi
trunk/src/inst-sections.nsi
trunk/src/uninst-gnupg2.nsi
trunk/src/uninst-gpg4win.nsi
trunk/src/uninst-gtk+.nsi
trunk/src/uninst-kleopatra.nsi
trunk/src/uninst-libetpan.nsi
trunk/src/uninst-qt.nsi
Log:
Entirely removed GnuPG-1 and GPGex.
Removed WinPT from packages list.
Install gpg2 as gpg in the PATH.
Uninstall cleans up everything now.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-06-05 14:46:05 UTC (rev 832)
+++ trunk/ChangeLog 2008-06-05 19:47:35 UTC (rev 833)
@@ -1,3 +1,27 @@
+2008-06-05 Werner Koch <wk at g10code.com>
+
+ * src/uninst-libetpan.nsi: Remove libetpan-13.
+ * src/uninst-kleopatra.nsi: Remove kwatchgnupg dirs.
+ * src/uninst-qt.nsi: Remove two resource dlls.
+ * src/uninst-gtk+.nsi: Remove foo-properties.mo.
+
+ * packages/packages.current: Remove GnuPG-1. Remove WinPT.
+ * configure.ac: Remove gnupg and replace by gnupg2. Remove GPGee.
+ * include/config.nsi.in: Remove GnuPG.
+ * src/inst-gnupg2.nsi: Update to fully replace gnupg1.
+ * src/inst-gnupg.nsi: Remove. Move some common code to ...
+ * src/inst-gpg4win.nsi: .. here.
+ * src/uninst-gnupg.nsi: Remove. Move some common code to ..
+ * src/uninst-gpg4win.nsi: .. here.
+ * src/inst-sections.nsi: Remove inst-gnupg.nsi and uninst-gnupg.nsi.
+ * src/Makefile.am: Ditto.
+ (gpg4win_pkg_gnupg_post_install): Remove.
+ (gpg4win_pkg_gnupg2_post_install): Convert man pages.
+ (gpg4win_pkg_gnupg2_configure): Add --with-bzip2.
+
+ * src/Makefile.am (gpgwrap-2.exe): New.
+ * src/gpgwrap.c (main): Support variant 2 of that program.
+
2008-05-28 Werner Koch <wk at g10code.com>
Release 1.9.2 beta version.
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2008-06-05 14:46:05 UTC (rev 832)
+++ trunk/Makefile.am 2008-06-05 19:47:35 UTC (rev 833)
@@ -43,7 +43,6 @@
patches/gpgme/01-gpg2.patch \
patches/libetpan-0.54/01-config.patch \
patches/libetpan-0.54/02-index.patch \
- patches/gnupg-1.4.8/01-gpgconf-list.patch \
patches/winpt/01-gpg-path.patch \
patches/gnupg2/01-version.patch.in \
patches/gnupg2/02-p12-hack.patch \
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-06-05 14:46:05 UTC (rev 832)
+++ trunk/NEWS 2008-06-05 19:47:35 UTC (rev 833)
@@ -3,6 +3,29 @@
# The version number given below are for the standard installers as
# distributed by www.gpg4win.org.
+Noteworthy changes in version 1.9.3
+------------------------------------------------
+
+(en) This is a BETA version of the new Gpg4win/2 architecture.
+ This version shall not be used in a production environment.
+(de) Dies ist eine BETA Version der neuen Gpg4win/2 Architektur.
+ Diese Version soll nicht in einer Produktivumgebung
+ eingesetzt werden.
+
+~~~~~~~~~~~~~~~
+GnuPG: 2.0.10-svn4773
+DirMngr: 1.0.2-svn299
+Kleopatra: 20080526-2
+GPA: 0.7.7-svn897
+GpgOL: 0.10.14
+GpgEX: 0.9.0
+Claws-Mail: 3.4.0
+Novices: 1.0.0
+Einsteiger: 2.0.2
+Durchblicker: 2.0.2
+~~~~~~~~~~~~~~~
+
+
Noteworthy changes in version 1.9.2 (2008-05-28)
------------------------------------------------
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-06-05 14:46:05 UTC (rev 832)
+++ trunk/configure.ac 2008-06-05 19:47:35 UTC (rev 833)
@@ -25,8 +25,8 @@
# Set my_issvn to "yes" for non-released code. Remember to run an
# "svn up" and "autogen.sh" right before creating a distribution.
# Right after a release the make target "copy-news" is to be called!
-m4_define([my_version], [1.9.2-beta])
-m4_define([my_issvn], [no])
+m4_define([my_version], [1.9.3-beta])
+m4_define([my_issvn], [svn])
m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
||echo 'Revision: 0')|sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
@@ -182,8 +182,6 @@
GPG4WIN_BPKG_GTK_DEV([pango], [glib pkgconfig])
GPG4WIN_BPKG_GTK_DEV([cairo], [glib pkgconfig])
-GPG4WIN_BPKG_BINSRC([GPGee], [gnupg])
-
GPG4WIN_SPKG([bzip2])
GPG4WIN_SPKG([adns])
GPG4WIN_SPKG([libgpg-error], [libiconv gettext])
@@ -193,15 +191,14 @@
GPG4WIN_SPKG([dirmngr], [libgpg-error libgcrypt libassuan libksba])
GPG4WIN_SPKG([w32pth])
GPG4WIN_SPKG([pinentry], [libiconv gtk+])
-GPG4WIN_SPKG([gpgme], [libgpg-error gnupg glib])
-GPG4WIN_SPKG([gnupg], [libiconv bzip2])
+GPG4WIN_SPKG([gpgme], [libgpg-error gnupg2 glib])
GPG4WIN_SPKG([gnupg2], [libiconv libgcrypt libksba libassuan libgpg-error dnl
w32pth zlib bzip2 adns pinentry])
GPG4WIN_SPKG([pthreads-w32])
GPG4WIN_SPKG([gpgol], [gpgme libassuan])
GPG4WIN_SPKG([gpgex], [libassuan])
GPG4WIN_SPKG([gpa], [libiconv gettext zlib gtk+ libpng glib gpgme])
-GPG4WIN_SPKG([winpt], [gpgme gnupg])
+GPG4WIN_SPKG([winpt], [gpgme gnupg2])
GPG4WIN_SPKG([libgsasl])
GPG4WIN_SPKG([libtasn1])
GPG4WIN_SPKG([opencdk], [libgpg-error libgcrypt])
@@ -221,7 +218,7 @@
GPG4WIN_BPKG_GNUWIN32([qt], [kdesupport])
GPG4WIN_BPKG_BINSRC([oxygen-icons])
GPG4WIN_BPKG_GNUWIN32([kdelibs], [qt oxygen-icons])
-GPG4WIN_BPKG_BINSRC([kleopatra], [gpgme gnupg gnupg2 kdelibs])
+GPG4WIN_BPKG_BINSRC([kleopatra], [gpgme gnupg2 kdelibs])
GPG4WIN_FINALIZE
Modified: trunk/include/config.nsi.in
===================================================================
--- trunk/include/config.nsi.in 2008-06-05 14:46:05 UTC (rev 832)
+++ trunk/include/config.nsi.in 2008-06-05 19:47:35 UTC (rev 833)
@@ -84,10 +84,6 @@
!define gpg4win_pkg_adns @gpg4win_pkg_adns@
!define gpg4win_pkg_adns_version @gpg4win_pkg_adns_version@
- at HAVE_PKG_GNUPG@
-!define gpg4win_pkg_gnupg @gpg4win_pkg_gnupg@
-!define gpg4win_pkg_gnupg_version @gpg4win_pkg_gnupg_version@
-
@HAVE_PKG_GNUPG2@
!define gpg4win_pkg_gnupg2 @gpg4win_pkg_gnupg2@
!define gpg4win_pkg_gnupg2_version @gpg4win_pkg_gnupg2_version@
@@ -112,11 +108,6 @@
!define gpg4win_pkg_winpt @gpg4win_pkg_winpt@
!define gpg4win_pkg_winpt_version @gpg4win_pkg_winpt_version@
- at HAVE_PKG_GPGEE@
-!define gpg4win_pkg_gpgee @gpg4win_pkg_gpgee@
-!define gpg4win_pkg_gpgee_version @gpg4win_pkg_gpgee_version@
-!define gpg4win_pkg_gpgee_src @gpg4win_pkg_gpgee_src@
-
@HAVE_PKG_LIBGSASL@
!define gpg4win_pkg_libgsasl @gpg4win_pkg_libgsasl@
!define gpg4win_pkg_libgsasl_version @gpg4win_pkg_libgsasl_version@
Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current 2008-06-05 14:46:05 UTC (rev 832)
+++ trunk/packages/packages.current 2008-06-05 19:47:35 UTC (rev 833)
@@ -200,8 +200,9 @@
#file 272/winpt-1.0.1.tar.bz2
#chk 574b7766701aaaef6e388d8b3ad68a171c9c071f
-file 312/winpt-1.2.0.tar.bz2
-chk 050f93a0d74385ce90e8934e49c11f171d495c5a
+# No more WinPT - at least for now
+#file 312/winpt-1.2.0.tar.bz2
+#chk 050f93a0d74385ce90e8934e49c11f171d495c5a
#
@@ -270,9 +271,6 @@
#
server ftp://ftp.gnupg.org/gcrypt
-file gnupg/gnupg-1.4.9.tar.bz2
-chk 826f4bef1effce61c3799c8f7d3cc8313b340b55
-
file libgpg-error/libgpg-error-1.6.tar.bz2
chk 2f387d0c34dd55eaf3b5f3c2570e9033eb540bc3
Modified: trunk/po/POTFILES.in
===================================================================
--- trunk/po/POTFILES.in 2008-06-05 14:46:05 UTC (rev 832)
+++ trunk/po/POTFILES.in 2008-06-05 19:47:35 UTC (rev 833)
@@ -6,7 +6,6 @@
src/inst-claws-mail.nsi
src/inst-eudoragpg.nsi
src/inst-gnupg2.nsi
-src/inst-gnupg.nsi
src/inst-gpa.nsi
src/inst-gpg4win.nsi
src/inst-gpgee.nsi
Modified: trunk/po/ar.po
===================================================================
--- trunk/po/ar.po 2008-06-05 14:46:05 UTC (rev 832)
+++ trunk/po/ar.po 2008-06-05 19:47:35 UTC (rev 833)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Gpg4Win\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2008-05-28 11:25+0200\n"
+"POT-Creation-Date: 2008-06-05 21:09+0200\n"
"PO-Revision-Date: 2008-03-11 23:52+0200\n"
"Last-Translator: Ahmad Gharbeia <ahmad at gharbeia.org>\n"
"Language-Team: Arabic <doc at arabeyes.org>\n"
@@ -320,13 +320,9 @@
msgid "EudoraGPG is a plugin for the Eudora mail program"
msgstr "þEudoraGPG åí ãáÍÞÉ áÈÑãÌíÉ ÇáÈÑíÏ Eudora"
-#: src/inst-gnupg2.nsi:118
+#: src/inst-gnupg2.nsi:141
+#, fuzzy
msgctxt "DESC_SEC_gnupg2"
-msgid "GNU Privacy Guard with S/MIME support"
-msgstr "ÍÇÑÓ ÎÕæÕíÉ Ìäæ ãÚ ÏÚã S/MIME"
-
-#: src/inst-gnupg.nsi:108
-msgctxt "DESC_SEC_gnupg"
msgid "GNU Privacy Guard"
msgstr "ÍÇÑÓ ÎÕæÕíÉ Ìäæ"
@@ -344,12 +340,12 @@
"ÔÛá ÃÏÇÉ ÅÏÇÑÉ ÇáãÝÇÊíÍ ãÓÇÚÏ ÎÕæÕíÉ Ìäæ. åÐå ÈÏíá áÃÏÇÉ ÅÏÇÑÉ ÇáãÝÇÊíÍ "
"WinPT."
-#: src/inst-gpg4win.nsi:43
+#: src/inst-gpg4win.nsi:66
msgctxt "DESC_Menu_gpg4win_readme"
msgid "General information on Gpg4Win"
msgstr "ãÚáæãÇÊ ÚÇãÉ Úä Gpg4Win"
-#: src/inst-gpg4win.nsi:46
+#: src/inst-gpg4win.nsi:69
msgctxt "DESC_Menu_gnupg_faq"
msgid "Show the Frequently Asked Questions Document for GnuPG"
msgstr "ØÇáÚ ÇáÃÓÆáÉ ÇáÔÇÆÚÉ Íæá GnuPG"
@@ -473,6 +469,10 @@
"ÔÛá ÃÏÇÉ ÅÏÇÑÉ ÇáãÝÇÊíÍ áæÍÉ ÎÕæÕíÉ æíäÏæÒ. åÐå ÃÏÇÉ ÅÏÇÑÉ ãÝÇÊíÍ æÊÚãíÉ "
"ãÊÚÏÏÉ ÇáÇÓÊÚãÇáÇÊ."
+#~ msgctxt "DESC_SEC_gnupg2"
+#~ msgid "GNU Privacy Guard with S/MIME support"
+#~ msgstr "ÍÇÑÓ ÎÕæÕíÉ Ìäæ ãÚ ÏÚã S/MIME"
+
#~ msgctxt "DESC_SEC_kleopatra"
#~ msgid "Kleopatra"
#~ msgstr "ßáíæÈÇÊÑÇ"
Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po 2008-06-05 14:46:05 UTC (rev 832)
+++ trunk/po/de.po 2008-06-05 19:47:35 UTC (rev 833)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gpg4win 1.1.1-svn417\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2008-05-28 11:25+0200\n"
+"POT-Creation-Date: 2008-06-05 21:09+0200\n"
"PO-Revision-Date: 2008-05-28 11:48+0200\n"
"Last-Translator: Marcus Brinkmann <mb at g10code.com>\n"
"Language-Team: German <translation-team-de at lists.sourceforge.net>\n"
@@ -379,16 +379,8 @@
msgstr ""
"EudoraGPG ist ein Plugin zur Verschlüsselung für das Eudora Mailprogramm"
-#: src/inst-gnupg2.nsi:118
+#: src/inst-gnupg2.nsi:141
msgctxt "DESC_SEC_gnupg2"
-msgid "GNU Privacy Guard with S/MIME support"
-msgstr ""
-"Diese Version von GnuPG kann zusätzlich installiert werden um "
-"Verschlüsselung mittels S/MIME bereitzustellen. Bitte beachten Sie, daß "
-"diese Option noch nicht vollständig unterstützt ist."
-
-#: src/inst-gnupg.nsi:108
-msgctxt "DESC_SEC_gnupg"
msgid "GNU Privacy Guard"
msgstr ""
"Der GNU Privacy Guard (GnuPG) ist der Kernbestandteil dieser Software. "
@@ -412,12 +404,12 @@
"Das Schlüsselverwaltungsprogramm GNU Privacy Assistent aufrufen. Dies ist "
"eine Alternative zu dem WinPT Programm."
-#: src/inst-gpg4win.nsi:43
+#: src/inst-gpg4win.nsi:66
msgctxt "DESC_Menu_gpg4win_readme"
msgid "General information on Gpg4Win"
msgstr "Allgemeine Informationen zu Gpg4Win"
-#: src/inst-gpg4win.nsi:46
+#: src/inst-gpg4win.nsi:69
msgctxt "DESC_Menu_gnupg_faq"
msgid "Show the Frequently Asked Questions Document for GnuPG"
msgstr "Das Dokument mit den häufig gestellten Fragen (FAQ) zu GnuPG anzeigen"
@@ -466,7 +458,9 @@
#: src/inst-kleopatra.nsi:195
msgctxt "DESC_SEC_kleopatra"
msgid "Keymanager for OpenPGP and X.509 and common crypto dialogs."
-msgstr "Schlüsselmanager für OpenPGP und X.509 (S/MIME) sowie einheitliche Benutzerführung für alle Krypto-Operationen."
+msgstr ""
+"Schlüsselmanager für OpenPGP und X.509 (S/MIME) sowie einheitliche "
+"Benutzerführung für alle Krypto-Operationen."
#: src/inst-kleopatra.nsi:199
msgctxt "DESC_Menu_kleopatra"
@@ -551,4 +545,3 @@
"Das Schlüsselverwaltungsprogramm Windows Privacy Tray aufrufen. Dies ist "
"ein vielseitiges Programm zur Schlüsselverwaltung und Verschlüsselung. Es "
"installiert sich in die Startleiste."
-
Modified: trunk/po/es.po
===================================================================
--- trunk/po/es.po 2008-06-05 14:46:05 UTC (rev 832)
+++ trunk/po/es.po 2008-06-05 19:47:35 UTC (rev 833)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gpg4win 1.1.1-svn417\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2008-05-28 11:25+0200\n"
+"POT-Creation-Date: 2008-06-05 21:09+0200\n"
"PO-Revision-Date: 2008-01-30 17:07+0100\n"
"Last-Translator: Diego Escalante Urrelo <diegoe at gnome.org>\n"
"Language-Team: Spanish <diegoe at gnome.org>\n"
@@ -330,13 +330,9 @@
msgid "EudoraGPG is a plugin for the Eudora mail program"
msgstr "EudoraGPG es un plugin para el cliente de correo Eudora"
-#: src/inst-gnupg2.nsi:118
+#: src/inst-gnupg2.nsi:141
+#, fuzzy
msgctxt "DESC_SEC_gnupg2"
-msgid "GNU Privacy Guard with S/MIME support"
-msgstr "GNU Privacy Guard (GnuPG) con soporte para S/MIME"
-
-#: src/inst-gnupg.nsi:108
-msgctxt "DESC_SEC_gnupg"
msgid "GNU Privacy Guard"
msgstr "GNU Privacy Guard (GnuPG)"
@@ -354,12 +350,12 @@
"Ejecutar la herramienta de gestión de llaves GNU Privacy Assistant. Ésta es "
"una alternativa a la herramienta de manejo de llaves WinPT."
-#: src/inst-gpg4win.nsi:43
+#: src/inst-gpg4win.nsi:66
msgctxt "DESC_Menu_gpg4win_readme"
msgid "General information on Gpg4Win"
msgstr "Información general de Gpg4Win"
-#: src/inst-gpg4win.nsi:46
+#: src/inst-gpg4win.nsi:69
msgctxt "DESC_Menu_gnupg_faq"
msgid "Show the Frequently Asked Questions Document for GnuPG"
msgstr "Mostrar las preguntas frecuentes (FAQ) sobre GnuPG"
@@ -486,6 +482,10 @@
"Ejecutar la herramienta de gestión de llaves Windows Privacy Tray. Ésta es "
"una herramienta versátil para la gestión de llaves y cifrado."
+#~ msgctxt "DESC_SEC_gnupg2"
+#~ msgid "GNU Privacy Guard with S/MIME support"
+#~ msgstr "GNU Privacy Guard (GnuPG) con soporte para S/MIME"
+
#~ msgctxt "DESC_SEC_kleopatra"
#~ msgid "Kleopatra"
#~ msgstr "Kleopatra"
Modified: trunk/po/fr.po
===================================================================
--- trunk/po/fr.po 2008-06-05 14:46:05 UTC (rev 832)
+++ trunk/po/fr.po 2008-06-05 19:47:35 UTC (rev 833)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: ngoinabox\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2008-05-28 11:25+0200\n"
+"POT-Creation-Date: 2008-06-05 21:09+0200\n"
"PO-Revision-Date: 2008-03-10 16:46+0100\n"
"Last-Translator: Fabian Rodriguez <magicfab at member.fsf.org>\n"
"Language-Team: FRENCH <aep.lists at it46.se>\n"
@@ -333,13 +333,9 @@
msgstr ""
"EudoraGPG est un plugin pour le logiciel de courrier électronique d'Eudora"
-#: src/inst-gnupg2.nsi:118
+#: src/inst-gnupg2.nsi:141
+#, fuzzy
msgctxt "DESC_SEC_gnupg2"
-msgid "GNU Privacy Guard with S/MIME support"
-msgstr "GNU Privacy Guard avec l'appui de S/MIME"
-
-#: src/inst-gnupg.nsi:108
-msgctxt "DESC_SEC_gnupg"
msgid "GNU Privacy Guard"
msgstr "GNU Privacy Guard"
@@ -357,12 +353,12 @@
"Courez le GNU Privacy Assistant outil pour gestionner le clé. C'est une "
"alternative à l'outil de gestion de clé de WinPT."
-#: src/inst-gpg4win.nsi:43
+#: src/inst-gpg4win.nsi:66
msgctxt "DESC_Menu_gpg4win_readme"
msgid "General information on Gpg4Win"
msgstr "Informations générales sur Gpg4Win"
-#: src/inst-gpg4win.nsi:46
+#: src/inst-gpg4win.nsi:69
msgctxt "DESC_Menu_gnupg_faq"
msgid "Show the Frequently Asked Questions Document for GnuPG"
msgstr "Montrez le document fréquemment demandé de questions pour GnuPG"
@@ -492,6 +488,10 @@
"Courez l'outil de gestion de clé de plateau d'privé de Windows. C'est une "
"clé souple outil de gestion de clé et de cryptage."
+#~ msgctxt "DESC_SEC_gnupg2"
+#~ msgid "GNU Privacy Guard with S/MIME support"
+#~ msgstr "GNU Privacy Guard avec l'appui de S/MIME"
+
#~ msgctxt "DESC_SEC_kleopatra"
#~ msgid "Kleopatra"
#~ msgstr "Kleopatra"
Modified: trunk/po/ru.po
===================================================================
--- trunk/po/ru.po 2008-06-05 14:46:05 UTC (rev 832)
+++ trunk/po/ru.po 2008-06-05 19:47:35 UTC (rev 833)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Gpg4Win Installer\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2008-05-28 11:25+0200\n"
+"POT-Creation-Date: 2008-06-05 21:09+0200\n"
"PO-Revision-Date: 2008-04-22 11:57+0200\n"
"Last-Translator: Sergei Smirnov <moscow at hro.org>\n"
"Language-Team: Human Rights Network <moscow at hro.org>\n"
@@ -328,13 +328,9 @@
msgid "EudoraGPG is a plugin for the Eudora mail program"
msgstr "EudoraGPG - ðàñøèðåíèå ïî÷òîâîãî êëèåíòà Eudora"
-#: src/inst-gnupg2.nsi:118
+#: src/inst-gnupg2.nsi:141
+#, fuzzy
msgctxt "DESC_SEC_gnupg2"
-msgid "GNU Privacy Guard with S/MIME support"
-msgstr "GNU Privacy Guard ñ ïîääåðæêîé S/MIME"
-
-#: src/inst-gnupg.nsi:108
-msgctxt "DESC_SEC_gnupg"
msgid "GNU Privacy Guard"
msgstr "GNU Privacy Guard"
@@ -350,12 +346,12 @@
"the WinPT key management tool."
msgstr "Çàïóñê ìåíåäæåðà êëþ÷åé GNU Privacy Assistant (àëüòåðíàòèâà WinPT)."
-#: src/inst-gpg4win.nsi:43
+#: src/inst-gpg4win.nsi:66
msgctxt "DESC_Menu_gpg4win_readme"
msgid "General information on Gpg4Win"
msgstr "Îáùàÿ èíôîðìàöèÿ î Gpg4Win"
-#: src/inst-gpg4win.nsi:46
+#: src/inst-gpg4win.nsi:69
msgctxt "DESC_Menu_gnupg_faq"
msgid "Show the Frequently Asked Questions Document for GnuPG"
msgstr "FAQ ïî ïðîãðàììå GnuPG"
@@ -481,6 +477,10 @@
"Çàïóñê Windows Privacy Tray. Ýòî óíèâåðñàëüíûé èíñòðóìåíò óïðàâëåíèÿ êëþ÷àìè "
"è øèôðîâàíèÿ äàííûõ."
+#~ msgctxt "DESC_SEC_gnupg2"
+#~ msgid "GNU Privacy Guard with S/MIME support"
+#~ msgstr "GNU Privacy Guard ñ ïîääåðæêîé S/MIME"
+
#~ msgctxt "DESC_SEC_kleopatra"
#~ msgid "Kleopatra"
#~ msgstr "Kleopatra"
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-06-05 14:46:05 UTC (rev 832)
+++ trunk/src/Makefile.am 2008-06-05 19:47:35 UTC (rev 833)
@@ -1,5 +1,5 @@
# Makefile.am - Installer for GnuPG 4 Windows Makefile.
-# Copyright (C) 2005, 2006, 2007 g10 Code GmbH
+# Copyright (C) 2005, 2006, 2007, 2008 g10 Code GmbH
#
# This file is part of Gpg4win.
#
@@ -37,7 +37,6 @@
inst-gettext.nsi uninst-gettext.nsi \
inst-glib.nsi uninst-glib.nsi \
inst-gnupg2.nsi uninst-gnupg2.nsi \
- inst-gnupg.nsi uninst-gnupg.nsi \
inst-gpa.nsi uninst-gpa.nsi \
inst-gpgee.nsi uninst-gpgee.nsi \
inst-gpgme.nsi uninst-gpgme.nsi \
@@ -74,10 +73,11 @@
# Need to clean the dll because we bypassed automake.
CLEANFILES = g4wihelp.dll versioninfo.txt README.en.txt README.de.txt \
- installer-options.ini NEWS.tmp gpgwrap.exe kleowrap.exe
+ installer-options.ini NEWS.tmp \
+ gpgwrap.exe gpgwrap-2.exe kleowrap.exe
# Supported source packages.
-gpg4win_spkgs = glib gnupg libgpg-error gpgme gpgol gpgex \
+gpg4win_spkgs = glib libgpg-error gpgme gpgol gpgex \
gpa winpt libgsasl libtasn1 opencdk gnutls \
libetpan claws-mail gnupg2 pinentry \
libassuan libksba libgcrypt adns dirmngr w32pth
@@ -91,31 +91,20 @@
# The GnuPG package provides man pages which we have to convert.
# We also create the MO files here.
-define gpg4win_pkg_gnupg_post_install
-(man -Tlatin1 -l $$$${pkgidir}/share/man/man1/gpg.1 | \
- sed `printf "s/_\b//g;s/\b.//g"` | \
- sed -e 's/$$$$/\r/' > $$$${pkgidir}/share/man/man1/gpg.man; \
-man -Tlatin1 -l $$$${pkgidir}/share/man/man1/gpgv.1 | \
- sed `printf "s/_\b//g;s/\b.//g"` | \
- sed -e 's/$$$$/\r/' > $$$${pkgidir}/share/man/man1/gpgv.man; \
-man -Tlatin1 -l $$$${pkgidir}/share/man/man7/gnupg.7 | \
- sed `printf "s/_\b//g;s/\b.//g"` | \
- sed -e 's/$$$$/\r/' > $$$${pkgidir}/share/man/man7/gnupg.man)
-endef
-
-
-# The fields FAQ and faq.html conflict with those in GnuPG1.
-# For now remove them.
-define gpg4win_pkg_gnupg2_post_install
-( rm $$$${pkgidir}/share/gnupg/FAQ; \
- rm $$$${pkgidir}/share/gnupg/faq.html; \
- for i in `$(tsdir)/src/potomo --get-linguas $$$${pkgsdir}/po` ; do \
+define gpg4win_pkg_gnupg2_post_install
+(for i in gpg2 gpgv2 gpgsm gpg-agent scdaemon gpg-connect-agent gpgconf ; \
+ do man -Tlatin1 -l $$$${pkgidir}/share/man/man1/$$$${i}.1 | \
+ sed `printf "s/_\b//g;s/\b.//g"` | \
+ sed -e 's/$$$$/\r/' > $$$${pkgidir}/share/man/man1/$$$${i}.man ; \
+ done ; \
+ for i in `$(tsdir)/src/potomo --get-linguas $$$${pkgsdir}/po` ; do \
$(tsdir)/src/potomo $$$${pkgsdir}/po/$$$${i}.po \
$$$${pkgidir}/share/gnupg/$$$${i}.mo ; \
- done)
+ done)
endef
+
# Build the reference manual.
define gpg4win_pkg_gpgol_post_install
( cd $$$${pkgndir}/doc; make pdf )
@@ -148,15 +137,13 @@
--with-libassuan-prefix=$(idir) \
--with-pth-prefix=$(idir)
-gpg4win_pkg_gnupg_configure = \
- --with-bzip2=$(idir)
-
gpg4win_pkg_gnupg2_configure = \
--with-gpg-error-prefix=$(idir) \
--with-ksba-prefix=$(idir) \
--with-libgcrypt-prefix=$(idir) \
--with-libassuan-prefix=$(idir) \
--with-zlib=$(idir) \
+ --with-bzip2=$(idir) \
--with-pth-prefix=$(idir) \
--with-adns=$(idir) \
--without-included-gettext \
@@ -407,19 +394,21 @@
# if makensis changed to the directory of the source file at startup.
# So we have to pull a couple of strings to correct this.
gpg4win-$(VERSION).exe: gpg4win.nsi $(common_nsi) stamps/stamp-final \
- g4wihelp.dll gpgwrap.exe kleowrap.exe README.en.txt \
+ g4wihelp.dll gpgwrap.exe gpgwrap-2.exe kleowrap.exe \
+ README.en.txt \
README.de.txt installer-options.ini versioninfo.txt
$(MAKENSIS) -V3 -DBUILD_DIR=`pwd` -DTOP_SRCDIR=$(top_srcdir) \
-DSRCDIR=$(srcdir) $(srcdir)/gpg4win.nsi
gpg4win-light-$(VERSION).exe: gpg4win.nsi $(common_nsi) stamps/stamp-final \
- g4wihelp.dll gpgwrap.exe kleowrap.exe README.en.txt \
+ g4wihelp.dll gpgwrap.exe gpgwrap-2.exe kleowrap.exe \
+ README.en.txt \
README.de.txt installer-options.ini versioninfo.txt
$(MAKENSIS) -V3 -DBUILD_DIR=`pwd` -DTOP_SRCDIR=$(top_srcdir) \
-DSRCDIR=$(srcdir) -DGPG4WIN_LIGHT=1 $(srcdir)/gpg4win.nsi
gpg4win-$(VERSION).wix: gpg4win.nsi $(common_nsi) stamps/stamp-final \
- gpgwrap.exe kleowrap.exe README.en.txt \
+ gpgwrap.exe gpgwrap-2.exe kleowrap.exe README.en.txt \
README.de.txt versioninfo.txt
perl make-msi.pl --guids $(srcdir)/make-msi.guids \
--manifest gpg4win-$(VERSION).files \
@@ -427,7 +416,7 @@
-DSRCDIR=$(srcdir) $(srcdir)/gpg4win.nsi > $@
gpg4win-light-$(VERSION).wix: gpg4win.nsi $(common_nsi) stamps/stamp-final \
- gpgwrap.exe kleowrap.exe README.en.txt \
+ gpgwrap.exe gpgwrap-2.exe kleowrap.exe README.en.txt \
README.de.txt versioninfo.txt
perl make-msi.pl --guids $(srcdir)/make-msi.guids \
--manifest gpg4win-light-$(VERSION).files \
@@ -456,6 +445,10 @@
$(CC) -I. -I.. -DHAVE_CONFIG_H -O2 -o $@ $^
$(STRIP) $@
+gpgwrap-2.exe: gpgwrap.c
+ $(CC) -I. -I.. -DHAVE_CONFIG_H -DGPGWRAP_VARIANT=2 -O2 -o $@ $^
+ $(STRIP) $@
+
kleowrap.exe: kleowrap.c
$(CC) -I. -I.. -DHAVE_CONFIG_H -O2 -mwindows -o $@ $^
$(STRIP) $@
Modified: trunk/src/gpgwrap.c
===================================================================
--- trunk/src/gpgwrap.c 2008-06-05 14:46:05 UTC (rev 832)
+++ trunk/src/gpgwrap.c 2008-06-05 19:47:35 UTC (rev 833)
@@ -14,11 +14,17 @@
* 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+/* The operation mode of this wrapper can be controlled by the
+ GPGWRAP_VARIANT macro. The following variants are defined:
+
+ 0 = Standard.
+ 2 = Also insert a "2" right before the .exe.
+
+*/
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -29,6 +35,13 @@
#include <windows.h>
+#if GPGWRAP_VARIANT == 2
+# define PGM_SUFFIX "-2"
+#else
+# define PGM_SUFFIX ""
+#endif
+
+
/* Return a copy of ARGV, but with proper quoting. To release the
copy, you have to free argv_quoted[0] and argv_quoted. */
static char **
@@ -108,7 +121,8 @@
char *p, *p0;
char **argv_quoted;
- if (!GetModuleFileNameA (NULL, pgm, sizeof (pgm) - 1))
+ /* Note: We decrement by one to allow inserting one character. */
+ if (!GetModuleFileNameA (NULL, pgm, sizeof (pgm) - 1 - 1))
{
fprintf (stderr, "gpgwrap: error getting my own name: rc=%d\n",
GetLastError());
@@ -128,6 +142,16 @@
*p0++ = *p++;
*p0 = 0;
+#if GPGWRAP_VARIANT == 2
+ p = strrchr (pgm, '.');
+ if (p)
+ {
+ memmove (p+1, p, strlen (p)+1);
+ *p = '2';
+ }
+#endif /* GPGWRAP_VARIANT == 2 */
+
+
/* Hack to output our own version along with the real file name
before the actual, we require that the --version option is given
twice. */
@@ -135,7 +159,7 @@
&& !strcmp(argv[1], "--version")
&& !strcmp(argv[2], "--version"))
{
- fputs ("gpgwrap (Gpg4win) " PACKAGE_VERSION " ;", stdout);
+ fputs ("gpgwrap" PGM_SUFFIX " (Gpg4win) " PACKAGE_VERSION " ;", stdout);
fputs (pgm, stdout);
fputc ('\n', stdout);
fflush (stdout);
Deleted: trunk/src/inst-gnupg.nsi
===================================================================
--- trunk/src/inst-gnupg.nsi 2008-06-05 14:46:05 UTC (rev 832)
+++ trunk/src/inst-gnupg.nsi 2008-06-05 19:47:35 UTC (rev 833)
@@ -1,110 +0,0 @@
-# inst-gnupg.nsi - Installer snippet for gnupg. -*- coding: latin-1; -*-
-# Copyright (C) 2005 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/gnupg-${gpg4win_pkg_gnupg_version}
-
-
-${MementoSection} "GnuPG" SEC_gnupg
- SectionIn RO
-
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- File "${gpg4win_pkg_gnupg}"
-!else
- File "${prefix}/bin/gpg.exe"
- File "${prefix}/bin/gpgsplit.exe"
- File "${prefix}/bin/gpgv.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/gnupg/gpgkeys_finger.exe"
- File "${prefix}/libexec/gnupg/gpgkeys_hkp.exe"
- File "${prefix}/libexec/gnupg/gpgkeys_curl.exe"
- File "${prefix}/libexec/gnupg/gpgkeys_ldap.exe"
-
- SetOutPath "$INSTDIR\pub"
- File /oname=gpg.exe "${BUILD_DIR}/gpgwrap.exe"
- File /oname=gpgv.exe "${BUILD_DIR}/gpgwrap.exe"
- File /oname=gpgsplit.exe "${BUILD_DIR}/gpgwrap.exe"
-
- SetOutPath "$INSTDIR\share\gnupg"
- File "${prefix}/share/gnupg/options.skel"
- File "${prefix}/share/gnupg/FAQ"
- File "${prefix}/share/gnupg/faq.html"
- File "${prefix}/share/man/man1/gpg.man"
- File "${prefix}/share/man/man1/gpgv.man"
- File "${prefix}/share/man/man7/gnupg.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.
-
- # Note that we do not install the mo files for gpg1 anymore. This
- # is because the build systems can't cope with it (stow conflicts)
- # and becuase translations for the server version are usually not
- # required. Instead we install the gnupg2 mo files.
- #SetOutPath "$INSTDIR\gnupg.nls"
-
-
- # If requested, install the configured gpg.conf.
- Var /GLOBAL ConfigGPGConf
- g4wihelp::config_fetch "gpg.conf"
- StrCpy $ConfigGPGConf $R0
- StrCmp $ConfigGPGConf "" no_config_gpg_conf
- ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" AppData
- StrCmp $0 "" no_config_gpg_conf
- CreateDirectory "$0\gnupg"
- CopyFiles $ConfigGPGConf "$0\gnupg\gpg.conf"
- no_config_gpg_conf:
-
-
- WriteRegStr HKLM "Software\GNU\GnuPG" "Install Directory" $INSTDIR
-
- # We used to determine the language using a Registry entry.
- # Although we don't want to delete the user's Lang Resgistry Setting
- # becuase he might have have selected a different language than his
- # default. We delete the gloabl Lang of the installation.
- DeleteRegValue HKLM "Software\GNU\GnuPG" "Lang"
-
- # This old key is required for GPGee. Please do not use in new
- # applications.
- # Note: We don't use it anymore so that gpgme decides what gpg to use
- # For the new gpg4win we actually use gpg2.exe.
- # To cope with old installations we actually remove this value.
- # However we can only remove the HKLM version not those set by
- # the user under HKCU.
- #WriteRegStr HKLM "Software\GNU\GnuPG" "gpgProgram" "$INSTDIR\gpg.exe"
- DeleteRegValue HKLM "Software\GNU\GnuPG" "gpgProgram"
-
- # Add the public directory to the PATH
- Push "$INSTDIR\pub"
- Call AddToPath
-
-!endif
-${MementoSectionEnd}
-
-
-LangString DESC_SEC_gnupg ${LANG_ENGLISH} \
- "GNU Privacy Guard"
-
Modified: trunk/src/inst-gnupg2.nsi
===================================================================
--- trunk/src/inst-gnupg2.nsi 2008-06-05 14:46:05 UTC (rev 832)
+++ trunk/src/inst-gnupg2.nsi 2008-06-05 19:47:35 UTC (rev 833)
@@ -1,5 +1,5 @@
# inst-gnupg2.nsi - Installer snippet for gnupg2. -*- coding: latin-1; -*-
-# Copyright (C) 2007 g10 Code GmbH
+# Copyright (C) 2007, 2008 g10 Code GmbH
#
# This file is part of Gpg4win.
#
@@ -34,8 +34,13 @@
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.
+
ClearErrors
SetOverwrite try
File "${prefix}/bin/gpg-agent.exe"
@@ -60,10 +65,18 @@
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 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"
+ # fixme: gpgsplit is missing; see above
SetOutPath "$INSTDIR\share\gnupg"
File "${prefix}/share/gnupg/qualified.txt"
@@ -71,11 +84,21 @@
# 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 is selected by
- # using a Registry entry; see ints-gnupg.nsi.
+ # using a Registry entry; see inst-gnupg.nsi.
File /nonfatal "${prefix}/share/gnupg/help.*.txt"
SetOutPath "$INSTDIR\gnupg2.nls"
File /nonfatal "${prefix}/share/gnupg/*.mo"
@@ -116,4 +139,4 @@
${MementoSectionEnd}
LangString DESC_SEC_gnupg2 ${LANG_ENGLISH} \
- "GNU Privacy Guard with S/MIME support"
+ "GNU Privacy Guard"
Modified: trunk/src/inst-gpg4win.nsi
===================================================================
--- trunk/src/inst-gpg4win.nsi 2008-06-05 14:46:05 UTC (rev 832)
+++ trunk/src/inst-gpg4win.nsi 2008-06-05 19:47:35 UTC (rev 833)
@@ -36,6 +36,29 @@
FileWrite $0 "${VERSION}$\r$\n"
FileClose $0
+ # Register the install directory.
+ WriteRegStr HKLM "Software\GNU\GnuPG" "Install Directory" $INSTDIR
+
+ # We used to determine the language using a Registry entry.
+ # Although we don't want to delete the user's Lang Resgistry Setting
+ # becuase he might have have selected a different language than his
+ # default. We delete the global Lang of the installation.
+ DeleteRegValue HKLM "Software\GNU\GnuPG" "Lang"
+
+ # This old key is required for GPGee. Please do not use in new
+ # applications.
+ # Note: We don't use it anymore so that gpgme decides what gpg to use
+ # For the new gpg4win we actually use gpg2.exe.
+ # To cope with old installations we actually remove this value.
+ # However we can only remove the HKLM version not those set by
+ # the user under HKCU.
+ #WriteRegStr HKLM "Software\GNU\GnuPG" "gpgProgram" "$INSTDIR\gpg.exe"
+ DeleteRegValue HKLM "Software\GNU\GnuPG" "gpgProgram"
+
+ # Add the public directory to the PATH
+ Push "$INSTDIR\pub"
+ Call AddToPath
+
!endif
SectionEnd
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2008-06-05 14:46:05 UTC (rev 832)
+++ trunk/src/inst-sections.nsi 2008-06-05 19:47:35 UTC (rev 833)
@@ -23,9 +23,6 @@
!include "inst-gpg4win.nsi"
-!ifdef HAVE_PKG_GNUPG
-!include "inst-gnupg.nsi"
-!endif
!ifdef HAVE_PKG_GNUPG2
!include "inst-gnupg2.nsi"
!endif
@@ -110,9 +107,6 @@
!ifdef HAVE_PKG_WINPT
!include "inst-winpt.nsi"
!endif
-!ifdef HAVE_PKG_GPGEE
-!include "inst-gpgee.nsi"
-!endif
!ifdef HAVE_PKG_LIBGSASL
!include "inst-libgsasl.nsi"
!endif
@@ -213,9 +207,6 @@
!ifdef HAVE_PKG_LIBGSASL
!include "uninst-libgsasl.nsi"
!endif
-!ifdef HAVE_PKG_GPGEE
-!include "uninst-gpgee.nsi"
-!endif
!ifdef HAVE_PKG_WINPT
!include "uninst-winpt.nsi"
!endif
@@ -302,9 +293,6 @@
!ifdef HAVE_PKG_GNUPG2
!include "uninst-gnupg2.nsi"
!endif
-!ifdef HAVE_PKG_GNUPG
-!include "uninst-gnupg.nsi"
-!endif
!include "uninst-gpg4win.nsi"
@@ -391,17 +379,6 @@
calc_defaults_winpt_done:
!endif
-!ifdef HAVE_PKG_GPGEE
- g4wihelp::config_fetch_bool "inst_gpgee"
- StrCmp $R0 "1" 0 calc_defaults_gpgee_not_one
- !insertmacro SelectSection ${SEC_gpgee}
- Goto calc_defaults_gpgee_done
- calc_defaults_gpgee_not_one:
- StrCmp $R0 "0" 0 calc_defaults_gpgee_done
- !insertmacro UnselectSection ${SEC_gpgee}
-calc_defaults_gpgee_done:
-!endif
-
!ifdef HAVE_PKG_CLAWS_MAIL
g4wihelp::config_fetch_bool "inst_claws_mail"
StrCmp $R0 "1" 0 calc_defaults_claws_mail_not_one
@@ -560,11 +537,10 @@
!insertmacro UnselectSection ${SEC_kdelibs}
!endif
- # Always install gnupg and gnupg2. This is also ensured by putting
+ # Always install gnupg2. This is also ensured by putting
# 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_gnupg}
!insertmacro SelectSection ${SEC_gnupg2}
# Then enable all dependencies in reverse build list order!
@@ -608,7 +584,7 @@
!insertmacro SelectSection ${SEC_adns}
!insertmacro SelectSection ${SEC_pinentry}
!insertmacro SelectSection ${SEC_dirmngr}
- # Because we need pinnetry, we also need to install GTK+
+ # Because we need pinentry, we also need to install GTK+
!insertmacro SelectSection ${SEC_zlib}
!insertmacro SelectSection ${SEC_gtk_}
!insertmacro SelectSection ${SEC_libpng}
@@ -616,13 +592,6 @@
skip_gnupg2:
!endif
-!ifdef HAVE_PKG_GPGEE
- !insertmacro SectionFlagIsSet ${SEC_gpgee} ${SF_SELECTED} have_gpgee skip_gpgee
- have_gpgee:
- !insertmacro SelectSection ${SEC_gpgme}
- skip_gpgee:
-!endif
-
!ifdef HAVE_PKG_WINPT
!insertmacro SectionFlagIsSet ${SEC_winpt} ${SF_SELECTED} have_winpt skip_winpt
have_winpt:
@@ -757,7 +726,7 @@
!insertmacro SectionFlagIsSet ${SEC_gpgme} \
${SF_SELECTED} have_gpgme skip_gpgme
have_gpgme:
- # GPGME does not depend on gnupg or gnupg2. Do this in the
+ # GPGME does not depend on gnupg2. Do this in the
# actual application instead.
!insertmacro SelectSection ${SEC_libgpg_error}
!ifdef HAVE_PKG_QT
@@ -776,14 +745,6 @@
# Package "zlib" has no dependencies.
# Package "pkgconfig" has no dependencies.
# Package "libgpg-error" has no dependencies.
-
-!ifdef HAVE_PKG_GNUPG
- !insertmacro SectionFlagIsSet ${SEC_gnupg} ${SF_SELECTED} have_gnupg skip_gnupg
- have_gnupg:
- !insertmacro SelectSection ${SEC_libiconv}
- skip_gnupg:
-!endif
-
# Package "libiconv" has no dependencies.
!ifdef HAVE_PKG_KDELIBS
@@ -891,9 +852,6 @@
# This must be in a central place. Urgs.
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-!ifdef HAVE_PKG_GNUPG
- !insertmacro MUI_DESCRIPTION_TEXT ${SEC_gnupg} $(DESC_SEC_gnupg)
-!endif
!ifdef HAVE_PKG_GNUPG2
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_gnupg2} $(DESC_SEC_gnupg2)
!endif
@@ -909,9 +867,6 @@
!ifdef HAVE_PKG_WINPT
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_winpt} $(DESC_SEC_winpt)
!endif
-!ifdef HAVE_PKG_GPGEE
- !insertmacro MUI_DESCRIPTION_TEXT ${SEC_gpgee} $(DESC_SEC_gpgee)
-!endif
!ifdef HAVE_PKG_CLAWS_MAIL
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_claws_mail} $(DESC_SEC_claws_mail)
!endif
@@ -1059,17 +1014,7 @@
no_man_advanced_de_menu:
!endif
-!ifdef HAVE_PKG_GPGEE
- SectionGetFlags ${SEC_gpgee} $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} 0 no_gpgee_menu
CreateShortCut \
- "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\GPGee Manual.lnk" \
- "$INSTDIR\GPGee.hlp" "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gpgee_hlp)
- no_gpgee_menu:
-!endif
-
- CreateShortCut \
"$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\GnuPG FAQ.lnk" \
"$INSTDIR\share\gnupg\faq.html" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gnupg_faq)
@@ -1211,15 +1156,6 @@
no_man_advanced_de_desktop:
!endif
-!ifdef HAVE_PKG_GPGEE
- SectionGetFlags ${SEC_gpgee} $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} 0 no_gpgee_desktop
- CreateShortCut "$DESKTOP\GPGee Manual.lnk" \
- "$INSTDIR\GPGee.hlp" "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gpgee_hlp)
- no_gpgee_desktop:
-!endif
-
CreateShortCut "$DESKTOP\$(DESC_Desktop_manuals)\GnuPG FAQ.lnk" \
"$INSTDIR\share\gnupg\faq.html" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gnupg_faq)
Deleted: trunk/src/uninst-gnupg.nsi
===================================================================
--- trunk/src/uninst-gnupg.nsi 2008-06-05 14:46:05 UTC (rev 832)
+++ trunk/src/uninst-gnupg.nsi 2008-06-05 19:47:35 UTC (rev 833)
@@ -1,69 +0,0 @@
-# uninst-gnupg.nsi - Installer snippet for gnupg. -*- coding: latin-1; -*-
-# Copyright (C) 2005 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/gnupg-${gpg4win_pkg_gnupg_version}
-
-
-; Uninstaller section.
-Section "-un.gnupg"
-!ifdef SOURCES
- Push "${gpg4win_pkg_gnupg}"
- Call un.SourceDelete
-!else
- Delete "$INSTDIR\gpg.exe"
- Delete "$INSTDIR\gpgsplit.exe"
- Delete "$INSTDIR\gpgv.exe"
-
- Delete "$INSTDIR\pub\gpg.exe"
- Delete "$INSTDIR\pub\gpgsplit.exe"
- Delete "$INSTDIR\pub\gpgv.exe"
- RMDir "$INSTDIR\pub"
-
- Delete "$INSTDIR\gpgkeys_finger.exe"
- Delete "$INSTDIR\gpgkeys_hkp.exe"
- Delete "$INSTDIR\gpgkeys_curl.exe"
- Delete "$INSTDIR\gpgkeys_ldap.exe"
- # Old gpg versions come with a separate http keyserver helper.
- Delete "$INSTDIR\gpgkeys_http.exe"
-
- Delete "$INSTDIR\share\gnupg\options.skel"
- Delete "$INSTDIR\share\gnupg\FAQ"
- Delete "$INSTDIR\share\gnupg\faq.html"
- Delete "$INSTDIR\share\gnupg\gpg.man"
- Delete "$INSTDIR\share\gnupg\gpgv.man"
- Delete "$INSTDIR\share\gnupg\gnupg.man"
- RMDir "$INSTDIR\share\gnupg"
- RMDir "$INSTDIR\share"
- RMDir "$INSTDIR"
-
- Delete "$INSTDIR\gnupg.nls\de.mo"
- RMDir "$INSTDIR\gnupg.nls"
-
- DeleteRegValue HKLM "Software\GNU\GnuPG" "Install Directory"
-
- # Remove the public directory from the PATH
- Push "$INSTDIR\pub"
- Call un.RemoveFromPath
-
-!endif
-SectionEnd
Modified: trunk/src/uninst-gnupg2.nsi
===================================================================
--- trunk/src/uninst-gnupg2.nsi 2008-06-05 14:46:05 UTC (rev 832)
+++ trunk/src/uninst-gnupg2.nsi 2008-06-05 19:47:35 UTC (rev 833)
@@ -32,13 +32,17 @@
Call un.SourceDelete
!else
Delete "$INSTDIR\gpg2.exe"
+ Delete "$INSTDIR\gpgv2.exe"
Delete "$INSTDIR\gpgsm.exe"
Delete "$INSTDIR\gpg-agent.exe"
Delete "$INSTDIR\scdaemon.exe"
Delete "$INSTDIR\gpgconf.exe"
Delete "$INSTDIR\gpg-connect-agent.exe"
+ Delete "$INSTDIR\gpgsplit.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"
RMDir "$INSTDIR\pub"
@@ -55,6 +59,7 @@
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"
RMDir "$INSTDIR\share"
@@ -62,8 +67,8 @@
RMDir "$INSTDIR\etc\gnupg"
RMDir "$INSTDIR\etc"
- Delete "$INSTDIR\gnupg.nls\*.mo"
- RMDir "$INSTDIR\gnupg.nls"
+ Delete "$INSTDIR\gnupg2.nls\*.mo"
+ RMDir "$INSTDIR\gnupg2.nls"
RMDir "$INSTDIR"
Modified: trunk/src/uninst-gpg4win.nsi
===================================================================
--- trunk/src/uninst-gpg4win.nsi 2008-06-05 14:46:05 UTC (rev 832)
+++ trunk/src/uninst-gpg4win.nsi 2008-06-05 19:47:35 UTC (rev 833)
@@ -24,10 +24,12 @@
Delete "gpg4win-${VERSION}.tar.bz2"
!else
- # Delete cruft from version prior to 0.8
- Delete "$INSTDIR\share\eudoragpg\eudoragpg.html"
- RMDir "$INSTDIR\share\eudoragpg"
+ DeleteRegValue HKLM "Software\GNU\GnuPG" "Install Directory"
+ # Remove the public directory from the PATH
+ Push "$INSTDIR\pub"
+ Call un.RemoveFromPath
+
# Delete standard stuff.
Delete "$INSTDIR\share\gpg4win\README.en.txt"
Delete "$INSTDIR\share\gpg4win\README.de.txt"
Modified: trunk/src/uninst-gtk+.nsi
===================================================================
--- trunk/src/uninst-gtk+.nsi 2008-06-05 14:46:05 UTC (rev 832)
+++ trunk/src/uninst-gtk+.nsi 2008-06-05 19:47:35 UTC (rev 833)
@@ -60,18 +60,23 @@
RMDir "$INSTDIR\lib\gtk-2.0"
Delete "$INSTDIR\lib\locale\de\LC_MESSAGES\gtk20.mo"
+ Delete "$INSTDIR\lib\locale\de\LC_MESSAGES\gtk20-properties.mo"
RMDir "$INSTDIR\lib\locale\de\LC_MESSAGES"
RMDir "$INSTDIR\lib\locale\de"
Delete "$INSTDIR\lib\locale\ar\LC_MESSAGES\gtk20.mo"
+ Delete "$INSTDIR\lib\locale\ar\LC_MESSAGES\gtk20-properties.mo"
RMDir "$INSTDIR\lib\locale\ar\LC_MESSAGES"
RMDir "$INSTDIR\lib\locale\ar"
Delete "$INSTDIR\lib\locale\es\LC_MESSAGES\gtk20.mo"
+ Delete "$INSTDIR\lib\locale\es\LC_MESSAGES\gtk20-properties.mo"
RMDir "$INSTDIR\lib\locale\es\LC_MESSAGES"
RMDir "$INSTDIR\lib\locale\es"
Delete "$INSTDIR\lib\locale\fr\LC_MESSAGES\gtk20.mo"
+ Delete "$INSTDIR\lib\locale\fr\LC_MESSAGES\gtk20-properties.mo"
RMDir "$INSTDIR\lib\locale\fr\LC_MESSAGES"
RMDir "$INSTDIR\lib\locale\fr"
Delete "$INSTDIR\lib\locale\ru\LC_MESSAGES\gtk20.mo"
+ Delete "$INSTDIR\lib\locale\ru\LC_MESSAGES\gtk20-properties.mo"
RMDir "$INSTDIR\lib\locale\ru\LC_MESSAGES"
RMDir "$INSTDIR\lib\locale\ru"
RMDir "$INSTDIR\lib\locale"
Modified: trunk/src/uninst-kleopatra.nsi
===================================================================
--- trunk/src/uninst-kleopatra.nsi 2008-06-05 14:46:05 UTC (rev 832)
+++ trunk/src/uninst-kleopatra.nsi 2008-06-05 19:47:35 UTC (rev 833)
@@ -164,6 +164,8 @@
RMDir "$INSTDIR\share\apps\libkleopatra"
RMDir "$INSTDIR\share\apps\kleopatra\pics"
RMDir "$INSTDIR\share\apps\kleopatra"
+ RMDir "$INSTDIR\share\apps\kwatchgnupg\pics"
+ RMDir "$INSTDIR\share\apps\kwatchgnupg"
RMDir "$INSTDIR\share\apps"
RMDir "$INSTDIR\share\applications\kde4"
RMDir "$INSTDIR\share\applications"
Modified: trunk/src/uninst-libetpan.nsi
===================================================================
--- trunk/src/uninst-libetpan.nsi 2008-06-05 14:46:05 UTC (rev 832)
+++ trunk/src/uninst-libetpan.nsi 2008-06-05 19:47:35 UTC (rev 833)
@@ -30,7 +30,7 @@
Call un.SourceDelete
!else
- Delete "$INSTDIR\libetpan-11.dll"
+ Delete "$INSTDIR\libetpan-13.dll"
RMDir "$INSTDIR"
!endif
SectionEnd
Modified: trunk/src/uninst-qt.nsi
===================================================================
--- trunk/src/uninst-qt.nsi 2008-06-05 14:46:05 UTC (rev 832)
+++ trunk/src/uninst-qt.nsi 2008-06-05 19:47:35 UTC (rev 833)
@@ -71,6 +71,7 @@
RMDir "$INSTDIR\plugins\designer"
Delete "$INSTDIR\plugins\iconengines\qsvg4.dll"
+ Delete "$INSTDIR\plugins\iconengines\qsvgicon4.dll"
RMDir "$INSTDIR\plugins\iconengines"
@@ -84,10 +85,13 @@
RMDir "$INSTDIR\plugins\imageformats"
Delete "$INSTDIR\plugins\script\qtscriptdbus4.dll"
-
RMDir "$INSTDIR\plugins\script"
- RMDir "$INSTDIR\plugins"
+ Delete "$INSTDIR\plugins\sqldrivers\qsqlite4.dll"
+ RMDir "$INSTDIR\plugins\sqldrivers"
+
+ RMDir "$INSTDIR\plugins"
+
Delete "$INSTDIR\translations\assistant_adp_de.qm"
# Delete "$INSTDIR\translations\assistant_adp_ja.qm"
# Delete "$INSTDIR\translations\assistant_adp_pl.qm"
More information about the Gpg4win-commits
mailing list