[Gpg4win-commits] r951 - in trunk: . packages po src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Oct 7 23:28:51 CEST 2008
Author: marcus
Date: 2008-10-07 23:28:50 +0200 (Tue, 07 Oct 2008)
New Revision: 951
Modified:
trunk/ChangeLog
trunk/NEWS
trunk/configure.ac
trunk/packages/packages.current
trunk/po/ChangeLog
trunk/po/de.po
trunk/src/inst-gpg4win.nsi
trunk/src/inst-kleopatra.nsi
trunk/src/inst-sections.nsi
trunk/src/installer-finish.nsi
trunk/src/installer.nsi
trunk/src/uninst-kleopatra.nsi
Log:
2008-10-07 Marcus Brinkmann <marcus at g10code.com>
Release 1.9.8-beta.
* configure.ac: Make gnupg2 dependent on curl.
* packages/packages.current: Update dirmngr and kleopatra.
* src/inst-sections.nsi (CalcDepends): Likewise.
* src/installer.nsi: Test for major upgrade.
(T_FoundExistingOldVersion): New translatable string.
* src/installer-finish.nsi (Uninstall): Clean up more registry
keys.
* src/installer.nsi (MUI_STARTMENUPAGE_REGISTRY_ROOT): Use HKLM
instead of HKCU.
* src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: Install
handbook.
po/
2008-10-07 Marcus Brinkmann <marcus at g10code.com>
* de.po: Add string for T_FoundExistingOldVersion.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-10-07 13:12:27 UTC (rev 950)
+++ trunk/ChangeLog 2008-10-07 21:28:50 UTC (rev 951)
@@ -1,3 +1,20 @@
+2008-10-07 Marcus Brinkmann <marcus at g10code.com>
+
+ Release 1.9.8-beta.
+
+ * configure.ac: Make gnupg2 dependent on curl.
+ * src/inst-sections.nsi (CalcDepends): Likewise.
+ * packages/packages.current: Update dirmngr.
+ * src/installer.nsi: Test for major upgrade.
+ (T_FoundExistingOldVersion): New translatable string.
+ * src/installer-finish.nsi (Uninstall): Clean up more registry
+ keys.
+ * src/installer.nsi (MUI_STARTMENUPAGE_REGISTRY_ROOT): Use HKLM
+ instead of HKCU.
+ * packages/packages.current: Update kleopatra.
+ * src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: Install
+ handbook.
+
2008-10-07 Emanuel Schuetze <emanuel.schuetze at intevation.de>
* packages/packages.current: Update kleopatra
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-10-07 13:12:27 UTC (rev 950)
+++ trunk/NEWS 2008-10-07 21:28:50 UTC (rev 951)
@@ -3,7 +3,7 @@
# The version number given below are for the standard installers as
# distributed by www.gpg4win.org.
-Noteworthy changes in version 1.9.8
+Noteworthy changes in version 1.9.8 (2008-10-08)
------------------------------------------------
(en) This is a BETA version of the new Gpg4win/2 architecture.
@@ -14,12 +14,12 @@
~~~~~~~~~~~~~~~
GnuPG: 2.0.10-svn4835
-DirMngr: 1.0.3-svn307
-Kleopatra:
+DirMngr: 1.0.3-svn309
+Kleopatra: 20081007-3
GPA: 0.8.0
GpgOL: 0.10.15
GpgEX: 0.9.1
-Claws-Mail: 3.4.0
+Claws-Mail: 3.6.0cvs7
Kompendium: 3.0.0-beta
~~~~~~~~~~~~~~~
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-10-07 13:12:27 UTC (rev 950)
+++ trunk/configure.ac 2008-10-07 21:28:50 UTC (rev 951)
@@ -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.8])
-m4_define([my_issvn], [yes])
+m4_define([my_version], [1.9.8-beta])
+m4_define([my_issvn], [no])
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)]))
@@ -196,8 +196,9 @@
GPG4WIN_SPKG([dirmngr], [libgpg-error libgcrypt libassuan libksba w32pth])
GPG4WIN_SPKG([pinentry], [libiconv gtk+])
GPG4WIN_SPKG([gpgme], [libgpg-error gnupg2 glib])
+GPG4WIN_SPKG([curl], [zlib gnutls])
GPG4WIN_SPKG([gnupg2], [libiconv libgcrypt libksba libassuan libgpg-error dnl
- w32pth zlib bzip2 adns pinentry])
+ w32pth zlib bzip2 adns pinentry curl])
GPG4WIN_SPKG([pthreads-w32])
GPG4WIN_SPKG([gpgol], [gpgme libassuan])
GPG4WIN_SPKG([gpgex], [libassuan])
@@ -209,7 +210,6 @@
GPG4WIN_SPKG([opencdk], [libgpg-error libgcrypt])
GPG4WIN_SPKG([gnutls], [libgsasl libtasn1 opencdk])
GPG4WIN_SPKG([libetpan], [pthreads-w32 gnutls])
-GPG4WIN_SPKG([curl], [zlib gnutls])
GPG4WIN_SPKG([libxml2], [zlib])
GPG4WIN_SPKG([claws-mail], [libiconv gettext zlib gtk+ libpng jpeg glib dnl
gpgme pthreads-w32 crypt regex libetpan gnutls])
Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current 2008-10-07 13:12:27 UTC (rev 950)
+++ trunk/packages/packages.current 2008-10-07 21:28:50 UTC (rev 951)
@@ -337,11 +337,11 @@
file gnupg-2.0.10-svn4835.tar.bz2
chk aaaa650f4ae5ef01dca554b241be77ac1dfce7ac
-file gpgme-1.1.7-svn1327.tar.bz2
-chk 4a0b67c6678cfe5b1e8c0fb3cef5a14677015221
+file gpgme-1.1.7-svn1334.tar.bz2
+chk ffd778b51b8db2e72cccf4d03250a40428fb243b
-file dirmngr-1.0.3-svn307.tar.bz2
-chk 57e70e72f8cbd99a2adadc6c9db5255929c48a26
+file dirmngr-1.0.3-svn309.tar.bz2
+chk 5f8d228c55ff2b6ebf244bdf01dff2b8f7051107
#
@@ -428,13 +428,13 @@
server ftp://ftp.kdab.net/pub/gpg4win
-file kleopatra-20081007-2-bin.zip
-chk 0ee04522e9d36bef2a46e9d0e26c82edf0aaecef
+file kleopatra-20081007-3-bin.zip
+chk 9cc0b6626a20abe1f02a9765f4d4e8cb54255e70
# FIXME: These belong in the bin package.
-name kleopatra-20081007-2-lib.zip
-file kleopatra-20081007-2-doc.zip
+name kleopatra-20081007-3-lib.zip
+file kleopatra-20081007-3-doc.zip
chk 375afcf982d9fe4c87a244198bbe5989af11c181
-file kleopatra-20081007-2-src.zip
-chk 5b4fa319f0948e329c91295a8afb06d937f97c58
+file kleopatra-20081007-3-src.zip
+chk 3fff1ddc1a87c69c055ca8e8253615884263e45d
Modified: trunk/po/ChangeLog
===================================================================
--- trunk/po/ChangeLog 2008-10-07 13:12:27 UTC (rev 950)
+++ trunk/po/ChangeLog 2008-10-07 21:28:50 UTC (rev 951)
@@ -1,3 +1,7 @@
+2008-10-07 Marcus Brinkmann <marcus at g10code.com>
+
+ * de.po: Add string for T_FoundExistingOldVersion.
+
2008-04-25 Marcus Brinkmann <marcus at ulysses.g10code.com>
* POTFILES.in: Remove src/inst-sylpheed.nsi.
Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po 2008-10-07 13:12:27 UTC (rev 950)
+++ trunk/po/de.po 2008-10-07 21:28:50 UTC (rev 951)
@@ -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-09-30 08:41+0200\n"
+"POT-Creation-Date: 2008-10-07 19:57+0200\n"
"PO-Revision-Date: 2008-09-09 13:24+0200\n"
"Last-Translator: Marcus Brinkmann <mb at g10code.com>\n"
"Language-Team: German <translation-team-de at lists.sourceforge.net>\n"
@@ -20,12 +20,12 @@
msgid "An instance of this installer is already running."
msgstr "Ein Exemplar dieses Installers läuft bereits."
-#: src/gpg4win.nsi:110
+#: src/gpg4win.nsi:114
msgctxt "T_WelcomeTitleGpg4win"
msgid "Welcome to the installation of Gpg4win"
msgstr "Willkommen bei der Installation von Gpg4win"
-#: src/gpg4win.nsi:114
+#: src/gpg4win.nsi:118
msgctxt "T_AboutGpg4win"
msgid ""
"GnuPG is GNU's tool for secure communication and data storage. It can be "
@@ -36,17 +36,17 @@
"GnuPG ist das Werkzeug aus dem GNU Projekt zur sicheren Kommunikation sowie "
"zum sicheren Speichern von Daten."
-#: src/gpg4win.nsi:120
+#: src/gpg4win.nsi:124
msgctxt "T_AboutGpg4winVersion"
msgid "This is Gpg4win version ${VERSION}"
msgstr "Dies ist Gpg4win Version ${VERSION}"
-#: src/gpg4win.nsi:123
+#: src/gpg4win.nsi:127
msgctxt "T_AboutGpg4winFileVersion"
msgid "file version ${PROD_VERSION}"
msgstr "Dateiversion ${PROD_VERSION}"
-#: src/gpg4win.nsi:126
+#: src/gpg4win.nsi:130
msgctxt "T_AboutGpg4winReleaseDate"
msgid "release date ${_BUILD_ISODATE}"
msgstr "Releasedatum ${_BUILD_ISODATE}"
@@ -144,43 +144,43 @@
msgid "Gpg4win Documentation"
msgstr "Gpg4win Dokumentation"
-#: src/installer.nsi:446
+#: src/installer.nsi:453
msgctxt "T_InstallOptions"
msgid "Install Options"
msgstr "Installationsoptionen"
-#: src/installer.nsi:449
+#: src/installer.nsi:456
msgctxt "T_InstallOptLinks"
msgid "Start links"
msgstr "Startlinks"
-#: src/installer.nsi:451
+#: src/installer.nsi:458
msgctxt "T_InstOptLabelA"
msgid "Please select where Gpg4win shall install links:"
msgstr "Bitte wählen Sie, welche Verknüpfungen angelegt werden sollen:"
-#: src/installer.nsi:454
+#: src/installer.nsi:461
msgctxt "T_InstOptLabelB"
msgid "(Only programs will be linked into the quick launch bar.)"
msgstr ""
"(In die Schnellstartleiste werden nur Verknüpfungen für Programme angelegt.)"
-#: src/installer.nsi:457
+#: src/installer.nsi:464
msgctxt "T_InstOptFieldA"
msgid "Start Menu"
msgstr "Startmenü"
-#: src/installer.nsi:460
+#: src/installer.nsi:467
msgctxt "T_InstOptFieldB"
msgid "Desktop"
msgstr "Arbeitsfläche"
-#: src/installer.nsi:463
+#: src/installer.nsi:470
msgctxt "T_InstOptFieldC"
msgid "Quick Launch Bar"
msgstr "Schnellstartleiste"
-#: src/installer.nsi:469
+#: src/installer.nsi:476
msgctxt "T_FoundExistingVersion"
msgid ""
"Version $R1 has already been installed.\n"
@@ -192,7 +192,19 @@
"(Sie können in jedem Fall mit JA antworten, falls es sich um eine neuere "
"oder dieselbe Version handelt.)"
-#: src/installer.nsi:472
+#: src/installer.nsi:479
+msgctxt "T_FoundExistingOldVersion"
+msgid ""
+"An old version $R1 has already been installed. It is strongly recommended "
+"to deinstall previous versions on major upgrades.\n"
+"Do you want to continue installing Gpg4win ${VERSION} anyway?"
+msgstr ""
+"Eine alte Version $R1 ist hier bereits installiert. Es wird dringend "
+"Empfohlen, bei einer großen Aktualisierung alte Versionen zu "
+"deinstallieren.\n"
+"Möchten Sie trotzdem fortfahren, Version ${VERSION} zu installieren?"
+
+#: src/installer.nsi:484
msgctxt "T_FoundExistingVersionB"
msgid ""
"A version of Gpg4Win has already been installed on the system. There will be "
@@ -205,7 +217,7 @@
"\n"
"Möchten die die Installation von Gpg4win fortführen?"
-#: src/installer.nsi:483
+#: src/installer.nsi:495
msgctxt "T_FoundOldSeeManual"
msgid ""
"Please see the Gpg4win user manual to learn how to migrate existing keys "
@@ -216,7 +228,7 @@
"überführen. Es wird dringend geraten Gpg4win nicht zusammen mit diesen "
"anderen Installation zu betreiben."
-#: src/installer.nsi:488
+#: src/installer.nsi:500
msgctxt "T_FoundOldGnuPP"
msgid ""
"An old installation of GnuPP (GNU Privacy Project) has been been detected. "
@@ -239,7 +251,7 @@
"Möchten Sie die Installation von Gpg4win weiter durchführen und sich dann "
"später um die Entfernung von GnuPP kümmern?"
-#: src/installer.nsi:497
+#: src/installer.nsi:509
msgctxt "T_FoundOldGnuPT"
msgid ""
"An installation of GnuPT has been been detected. This may cause problems "
@@ -262,7 +274,7 @@
"\n"
"Möchten Sie die Installation von Gpg4win fortführen?"
-#: src/installer.nsi:504
+#: src/installer.nsi:516
msgctxt "T_FoundOldWinPTSF"
msgid ""
"An old installation of the Sourceforge hosted WinPT has been been detected. "
@@ -287,7 +299,7 @@
"\n"
"Möchten Sie die Installation von Gpg4win trotzdem jetzt weiter durchführen?"
-#: src/installer.nsi:514
+#: src/installer.nsi:526
msgctxt "T_FoundOldGnuPack"
msgid ""
"An installation of GnuPG-Pack has been been detected. You need to uninstall "
@@ -301,7 +313,7 @@
"\n"
"Die Installation von Gpg4win wird nun abgebrochen!"
-#: src/installer.nsi:523
+#: src/installer.nsi:535
msgctxt "T_BetaWarning"
msgid ""
"Note: This is a BETA version of Gpg4win.\n"
@@ -325,7 +337,7 @@
"\n"
" http://www.gpg4win.de/download-de.html "
-#: src/installer.nsi:530
+#: src/installer.nsi:542
msgctxt "T_AdminNeeded"
msgid ""
"Warning: Administrator permissions required for a successful installation"
@@ -333,7 +345,7 @@
"Achtung: Für eine erfolgreiche Installation werden Administratorrechte "
"benötigt."
-#: src/installer.nsi:534
+#: src/installer.nsi:546
msgctxt "T_CloseOtherApps"
msgid ""
"Please make sure that other applications are not running. In particular you "
@@ -346,29 +358,29 @@
"eine Installation durchzuführen; es ist dann aber u.U. notwendig, das System "
"neu zu starten."
-#: src/installer.nsi:539
+#: src/installer.nsi:551
msgctxt "T_ShuttingDownWinPT"
msgid "Trying to shutdown a possible running instance of WinPT."
msgstr "Ein möglicherweise laufendes WinPT wird jetzt automatisch beendet."
-#: src/installer.nsi:541
+#: src/installer.nsi:553
msgctxt "T_ShuttingDownDirMngr"
msgid "Trying to shutdown a possible running instance of DirMngr."
msgstr "Ein möglicherweise laufender DirMngr wird jetzt automatisch beendet."
-#: src/inst-claws-mail.nsi:53
+#: src/inst-claws-mail.nsi:55
msgctxt "DESC_SEC_claws_mail"
msgid "Claws Mail-User-Agent"
msgstr ""
"Claws Mail ist ein vollständiges Mail- und News-Programm mit sehr guter "
"Unterstützung für GnuPG."
-#: src/inst-claws-mail.nsi:56
+#: src/inst-claws-mail.nsi:58
msgctxt "DESC_Menu_claws_mail"
msgid "Run the Claws mailprogram."
msgstr "Das Mailprogramm Claws Mail aufrufen."
-#: src/inst-claws-mail.nsi:59
+#: src/inst-claws-mail.nsi:61
msgctxt "DESC_Menu_claws_mail_pdf"
msgid "Show the online manual of Claws Mail"
msgstr "Das englische Handbuch zu Claws Mail anzeigen"
@@ -455,14 +467,14 @@
"GnuPG für Outlook (GpgOL) is eine Erweiterung für Outlook 2003, die "
"verwendet wird um Nachrichten mit OpenPGP oder S/MIME zu verschlüsseln."
-#: src/inst-kleopatra.nsi:227
+#: src/inst-kleopatra.nsi:299
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."
-#: src/inst-kleopatra.nsi:231
+#: src/inst-kleopatra.nsi:303
msgctxt "DESC_Menu_kleopatra"
msgid "Run the Kleopatra key management tool."
msgstr "Das Schlüsselverwaltungsprogramm Kleopatra aufrufen."
Modified: trunk/src/inst-gpg4win.nsi
===================================================================
--- trunk/src/inst-gpg4win.nsi 2008-10-07 13:12:27 UTC (rev 950)
+++ trunk/src/inst-gpg4win.nsi 2008-10-07 21:28:50 UTC (rev 951)
@@ -36,9 +36,13 @@
FileWrite $0 "${VERSION}$\r$\n"
FileClose $0
- # Register the install directory.
+ # Register the install directory for the GnuPG suite.
WriteRegStr HKLM "Software\GNU\GnuPG" "Install Directory" $INSTDIR
+ # Also write it to be recalled on new installation. Currently
+ # disabled.
+ # WriteRegStr HKLM "Software\GNU\${PRETTY_PACKAGE_SHORT}" "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
Modified: trunk/src/inst-kleopatra.nsi
===================================================================
--- trunk/src/inst-kleopatra.nsi 2008-10-07 13:12:27 UTC (rev 950)
+++ trunk/src/inst-kleopatra.nsi 2008-10-07 21:28:50 UTC (rev 951)
@@ -220,6 +220,78 @@
File ${prefix}/share/locale/de/LC_MESSAGES/phonon_kde.mo
File ${prefix}/share/locale/de/LC_MESSAGES/timezones4.mo
+ SetOutPath "$INSTDIR\share\doc\HTML\en\kleopatra"
+
+ File ${prefix}/share/doc/HTML/en/kleopatra/admin-key-filters.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/admin.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/commandline-options.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/configuration-appearance.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/configuration-dn-order.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/configuration.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/credits-and-license.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/favicon.ico
+ File ${prefix}/share/doc/HTML/en/kleopatra/fdl-notice.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/functions-keylist-management.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/functions-newkey.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/functions-search.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/functions.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/header.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/index.cache
+ File ${prefix}/share/doc/HTML/en/kleopatra/index.cache.bz2
+ File ${prefix}/share/doc/HTML/en/kleopatra/index.docbook
+ File ${prefix}/share/doc/HTML/en/kleopatra/index.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/introduction.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/mainfooter.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/mainheader.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/menu.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/menucertificates.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/menucrls.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/menuhelp.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/menusettings.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/menutools.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/xml.dcl
+
+ SetOutPath "$INSTDIR\share\doc\HTML\en\kleopatra\common"
+
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/1.png
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/10.png
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/2.png
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/3.png
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/4.png
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/5.png
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/6.png
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/7.png
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/8.png
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/9.png
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/artistic-license.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/block_title_bottom.png
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/block_title_mid.png
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/block_title_top.png
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/bottom-left.png
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/bottom-middle.png
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/bottom-right.png
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/bsd-license.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/doxygen.css
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/fdl-license
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/fdl-license.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/footer.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/gpl-license
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/gpl-license.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/kde-default.css
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/kde_logo_bg.png
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/lgpl-license
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/lgpl-license.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/qpl-license.html
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/tabs.css
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/top-kde.jpg
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/top-left.jpg
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/top-left.png
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/top-middle.png
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/top-right.jpg
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/top-right.png
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/top.jpg
+ File ${prefix}/share/doc/HTML/en/kleopatra/common/x11-license.html
+
!endif
${MementoSectionEnd}
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2008-10-07 13:12:27 UTC (rev 950)
+++ trunk/src/inst-sections.nsi 2008-10-07 21:28:50 UTC (rev 951)
@@ -732,6 +732,7 @@
!insertmacro SelectSection ${SEC_zlib}
!insertmacro SelectSection ${SEC_adns}
!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}
Modified: trunk/src/installer-finish.nsi
===================================================================
--- trunk/src/installer-finish.nsi 2008-10-07 13:12:27 UTC (rev 950)
+++ trunk/src/installer-finish.nsi 2008-10-07 21:28:50 UTC (rev 951)
@@ -153,7 +153,10 @@
# Clean the registry.
DeleteRegValue HKLM "Software\GNU\${PRETTY_PACKAGE_SHORT}" \
"Install Directory"
- DeleteRegKey /ifempty HKLM "Software\GNU\${PRETTY_PACKAGE_SHORT}" \
+ DeleteRegKey /ifempty HKLM "Software\GNU\${PRETTY_PACKAGE_SHORT}"
+ DeleteRegKey /ifempty HKLM "Software\GNU\GnuPG"
+ DeleteRegKey /ifempty HKLM "Software\GNU"
+
# Remove Windows Add/Remove Programs support.
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRETTY_PACKAGE_SHORT}"
SectionEnd
Modified: trunk/src/installer.nsi
===================================================================
--- trunk/src/installer.nsi 2008-10-07 13:12:27 UTC (rev 950)
+++ trunk/src/installer.nsi 2008-10-07 21:28:50 UTC (rev 951)
@@ -148,7 +148,7 @@
!define MUI_PAGE_CUSTOMFUNCTION_PRE CheckIfStartMenuWanted
!define MUI_STARTMENUPAGE_NODISABLE
-!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
+!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\GNU\${PRETTY_PACKAGE_SHORT}"
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
@@ -362,6 +362,13 @@
Call TrimNewLines
Pop $R1
+ # Extract major version.
+ StrCpy $0 $R1 2
+ StrCmp $0 "1." 0 secondtest
+ MessageBox MB_YESNO "$(T_FoundExistingOldVersion)" IDYES leave
+ Abort
+
+ secondtest:
MessageBox MB_YESNO "$(T_FoundExistingVersion)" IDYES leave
Abort
@@ -469,6 +476,11 @@
LangString T_FoundExistingVersion ${LANG_ENGLISH} \
"Version $R1 has already been installed. $\r$\n\
Do you want to overwrite it with version ${VERSION}?"
+LangString T_FoundExistingOldVersion ${LANG_ENGLISH} \
+ "An old version $R1 has already been installed. It is \
+ strongly recommended to deinstall previous versions on \
+ major upgrades. $\r$\n\
+ Do you want to continue installing Gpg4win ${VERSION} anyway?"
LangString T_FoundExistingVersionB ${LANG_ENGLISH} \
"A version of Gpg4Win has already been installed on the system. \
There will be no problem installing and thus overwriting this \
Modified: trunk/src/uninst-kleopatra.nsi
===================================================================
--- trunk/src/uninst-kleopatra.nsi 2008-10-07 13:12:27 UTC (rev 950)
+++ trunk/src/uninst-kleopatra.nsi 2008-10-07 21:28:50 UTC (rev 951)
@@ -148,6 +148,81 @@
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\akregator.mo"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\akonaditray.mo"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\1.png"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\10.png"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\2.png"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\3.png"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\4.png"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\5.png"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\6.png"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\7.png"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\8.png"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\9.png"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\artistic-license.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\block_title_bottom.png"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\block_title_mid.png"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\block_title_top.png"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\bottom-left.png"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\bottom-middle.png"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\bottom-right.png"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\bsd-license.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\doxygen.css"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\fdl-license"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\fdl-license.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\footer.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\gpl-license"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\gpl-license.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\kde-default.css"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\kde_logo_bg.png"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\lgpl-license"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\lgpl-license.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\qpl-license.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\tabs.css"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-kde.jpg"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-left.jpg"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-left.png"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-middle.png"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-right.jpg"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top-right.png"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\top.jpg"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\common\x11-license.html"
+
+ RMDir "$INSTDIR\share\doc\HTML\en\kleopatra\common"
+
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\admin-key-filters.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\admin.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\commandline-options.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\configuration-appearance.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\configuration-dn-order.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\configuration.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\credits-and-license.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\favicon.ico"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\fdl-notice.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\functions-keylist-management.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\functions-newkey.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\functions-search.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\functions.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\header.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\index.cache"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\index.cache.bz2"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\index.docbook"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\index.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\introduction.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\mainfooter.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\mainheader.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menu.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menucertificates.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menucrls.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menuhelp.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menusettings.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menutools.html"
+ Delete "$INSTDIR\share\doc\HTML\en\kleopatra\xml.dcl"
+
+ RMDir "$INSTDIR\share\doc\HTML\en\kleopatra"
+ RMDir "$INSTDIR\share\doc\HTML\en"
+ RMDir "$INSTDIR\share\doc\HTML"
+ RMDir "$INSTDIR\share\doc"
+
Delete "$INSTDIR\share\icons\oxygen\scalable\apps\kleopatra.svgz"
Delete "$INSTDIR\share\icons\oxygen\64x64\apps\kleopatra.png"
Delete "$INSTDIR\share\icons\oxygen\48x48\apps\kleopatra.png"
More information about the Gpg4win-commits
mailing list