[Gpg4win-commits] r451 - in trunk: . po src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Jul 10 10:50:22 CEST 2007
Author: werner
Date: 2007-07-10 10:50:20 +0200 (Tue, 10 Jul 2007)
New Revision: 451
Modified:
trunk/ChangeLog
trunk/NEWS
trunk/po/ChangeLog
trunk/po/POTFILES.in
trunk/po/de.po
trunk/src/gpg4win-src.nsi
trunk/src/gpg4win.nsi
trunk/src/inst-gnupg2.nsi
trunk/src/inst-sections.nsi
trunk/src/installer-finish.nsi
trunk/src/installer.nsi
trunk/src/uninst-claws-mail.nsi
trunk/src/uninst-gnupg2.nsi
trunk/src/uninst-sylpheed-claws.nsi
Log:
Cleanup fixes.
Exclude gnupg2 from the light installer.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-07-09 15:05:06 UTC (rev 450)
+++ trunk/ChangeLog 2007-07-10 08:50:20 UTC (rev 451)
@@ -1,3 +1,28 @@
+2007-07-10 Werner Koch <wk at g10code.com>
+
+ * src/gpg4win.nsi [GPG4WIN_LIGHT]: Undef gnupg2 and related libs.
+ Undef the English novices manual.
+ * src/installer-finish.nsi: Delete the link for the English novices
+ manual and the claws manual.
+
+ * src/uninst-sylpheed-claws.nsi: Delete the manual even when using
+ the lighjt version. This is to allow updating with a light version.
+ * src/uninst-claws-mail.nsi: Ditto.
+
+ * src/installer-finish.nsi: Changed publisher name to "The Gpg4win
+ Project".
+
+ * src/gpg4win.nsi: Fixed capitalization of some Gpg4win strings.
+ * src/gpg4win-src.nsi: Ditto.
+
+2007-07-09 Werner Koch <wk at g10code.com>
+
+ * src/uninst-gnupg2.nsi: Need to remove com-certs.pem.
+
+ * src/inst-gnupg2.nsi: Make it an optional package.
+ Add description.
+ * src/inst-sections.nsi: Include language macro for description.
+
2007-07-09 Marcus Brinkmann <marcus at g10code.de>
* patches/gpgol-0.9.91/01-gpgme.patch: New file.
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2007-07-09 15:05:06 UTC (rev 450)
+++ trunk/NEWS 2007-07-10 08:50:20 UTC (rev 451)
@@ -6,7 +6,35 @@
Noteworthy changes in version 1.1.1
------------------------------------------------
+(en) Replaced Sylpheed-Claws by a current Claws-Mail package.
+(de) Sylpheed-Claws ist durch eine aktuelle Claws-Mail Version ersetzt worden.
+(en) Add command line tools for CMS (S/MIME) to the standard installer.
+(de) Der Standardinstaller ist um Kommandozeilenwerkzeuge für CMS
+ (S/MIME) erweitert worden.
+
+(en) Translations of the installer are now done in the usual GNU
+ gettext way.
+(de) Übersetzungen des Installers werden nun auf dem gebräuchlichen
+ GNU gettext Weg erstellt.
+
+(en) Fixed a couple of bugs.
+(de) Einige Programmfehler wurden behoben.
+
+
+~~~~~~~~~~~~~~~
+GnuPG: 1.4.7 + 2.0.5
+GPA: 0.7.6
+GPGol: 0.9.91
+GPGee: 1.3.1
+WinPT: 1.2.0
+Claws-Mail: 2.10.0
+Novices: 1.0.0
+Einsteiger: 2.0.2
+Durchblicker: 2.0.2
+~~~~~~~~~~~~~~~
+
+
Noteworthy changes in version 1.1.0 (2007-05-24)
------------------------------------------------
Modified: trunk/po/ChangeLog
===================================================================
--- trunk/po/ChangeLog 2007-07-09 15:05:06 UTC (rev 450)
+++ trunk/po/ChangeLog 2007-07-10 08:50:20 UTC (rev 451)
@@ -1,3 +1,9 @@
+2007-07-09 Werner Koch <wk at g10code.com>
+
+ * de.po: Add description for gnupg2.
+
+ * POTFILES.in: Include gnupg2.
+
2007-07-02 Marcus Brinkmann <marcus at g10code.de>
* POTFILES.in: Add src/inst-claws-mail.nsi.
Modified: trunk/po/POTFILES.in
===================================================================
--- trunk/po/POTFILES.in 2007-07-09 15:05:06 UTC (rev 450)
+++ trunk/po/POTFILES.in 2007-07-10 08:50:20 UTC (rev 451)
@@ -3,6 +3,7 @@
src/installer.nsi
src/inst-eudoragpg.nsi
src/inst-gnupg.nsi
+src/inst-gnupg2.nsi
src/inst-gpa.nsi
src/inst-gpg4win.nsi
src/inst-gpgee.nsi
Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po 2007-07-09 15:05:06 UTC (rev 450)
+++ trunk/po/de.po 2007-07-10 08:50:20 UTC (rev 451)
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: gpg4win 1.1.1-svn417\n"
"Report-Msgid-Bugs-To: gpg4win-devel at wald.intevation.org\n"
-"POT-Creation-Date: 2007-07-06 18:45+0200\n"
-"PO-Revision-Date: 2007-07-02 21:35+0200\n"
+"POT-Creation-Date: 2007-07-09 17:06+0200\n"
+"PO-Revision-Date: 2007-07-09 17:09+0200\n"
"Last-Translator: Marcus Brinkmann <mb at g10code.com>\n"
"Language-Team: German <translation-team-de at lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
@@ -279,6 +279,14 @@
"GnuPG stellt die eigentliche Verschlüsselung sowie die Verwaltung der "
"Schlüssel bereit."
+#: src/inst-gnupg2.nsi:70
+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-gpa.nsi:50
msgctxt "DESC_SEC_gpa"
msgid "GNU Privacy Assistant"
Modified: trunk/src/gpg4win-src.nsi
===================================================================
--- trunk/src/gpg4win-src.nsi 2007-07-09 15:05:06 UTC (rev 450)
+++ trunk/src/gpg4win-src.nsi 2007-07-10 08:50:20 UTC (rev 451)
@@ -1,14 +1,14 @@
# gpg4win-src.nsi - Installer for GPG4Win sources. -*- coding: latin-1; -*-
-# Copyright (C) 2005 g10 Code GmbH
+# Copyright (C) 2005, 2007 g10 Code GmbH
#
-# This file is part of GPG4Win.
+# This file is part of Gpg4win.
#
-# GPG4Win is free software; you can redistribute it and/or modify
+# 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,
+# 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.
@@ -30,21 +30,23 @@
# The package name and version. PRETTY_PACKAGE is a user visible name
# only while PACKAGE is useful for filenames etc. PROD_VERSION is the
# product version and needs to be in the format "MAJ.MIN.MIC.BUILDNR".
+# NOTE: Please keep the capitalization of PRETTY_PACKAGE_SHORT as it is
+# used as registry key.
!define PACKAGE "${_PACKAGE}-src"
!define PRETTY_PACKAGE "GnuPG For Windows Sources"
!define PRETTY_PACKAGE_SHORT "GPG4WinSrc"
!define VERSION "${_VERSION}"
!define PROD_VERSION "${_BUILD_FILEVERSION}"
!define COMPANY "g10 Code GmbH"
-!define COPYRIGHT "Copyright (C) 2005 g10 Code GmbH"
-!define DESCRIPTION "GPG4Win: The GNU Privacy Guard and tools for Windows (Source Files)"
+!define COPYRIGHT "Copyright (C) 2007 g10 Code GmbH"
+!define DESCRIPTION "Gpg4win: The GNU Privacy Guard and tools for Windows (Source Files)"
!define INSTALL_DIR "GnuPG\Source"
!define WELCOME_TITLE_ENGLISH \
- "Welcome to the installation of the Gpg4Win sources"
+ "Welcome to the installation of the Gpg4win sources"
!define WELCOME_TITLE_GERMAN \
- "Willkommen bei der Installation der Gpg4Win Quellen"
+ "Willkommen bei der Installation der Gpg4win Quellen"
!define ABOUT_ENGLISH \
"GnuPG is GNU's tool for secure communication and data storage. \
@@ -52,14 +54,14 @@
It includes an advanced key management facility and is compliant \
with the proposed OpenPGP Internet standard as described in RFC2440. \
\r\n\r\n$_CLICK \
- \r\n\r\n\r\n\r\n\r\nThis is GPG4WIN version ${VERSION}\r\n\
+ \r\n\r\n\r\n\r\n\r\nThis is Gpg4win version ${VERSION}\r\n\
file version ${PROD_VERSION}\r\n\
release date ${_BUILD_ISODATE}"
!define ABOUT_GERMAN \
"GnuPG is das Werkzeug aus dem GNU Projekt zur sicheren Kommunikation \
sowie zum sicheren Speichern von Daten. \
\r\n\r\n$_CLICK \
- \r\n\r\n\r\n\r\n\r\nDies ist GPG4WIN Version ${VERSION}\r\n\
+ \r\n\r\n\r\n\r\n\r\nDies ist Gpg4win Version ${VERSION}\r\n\
Dateiversion ${PROD_VERSION}\r\n\
Releasedatum ${_BUILD_ISODATE}"
Modified: trunk/src/gpg4win.nsi
===================================================================
--- trunk/src/gpg4win.nsi 2007-07-09 15:05:06 UTC (rev 450)
+++ trunk/src/gpg4win.nsi 2007-07-10 08:50:20 UTC (rev 451)
@@ -1,5 +1,5 @@
# gpg4win.nsi - Installer for GnuPG 4 Windows. -*- coding: latin-1; -*-
-# Copyright (C) 2005 g10 Code GmbH
+# Copyright (C) 2005, 2007 g10 Code GmbH
#
# This file is part of GPG4Win.
#
@@ -28,29 +28,50 @@
# of the packages right after including config.nsi.
!ifdef GPG4WIN_LIGHT
!undef HAVE_PKG_MAN_NOVICE_DE
+!undef HAVE_PKG_MAN_NOVICE_EN
!undef HAVE_PKG_MAN_ADVANCED_DE
+!ifdef HAVE_PKG_GNUPG2
+!undef HAVE_PKG_GNUPG2
!endif
+!ifdef HAVE_PKG_DIRMNGR
+!undef HAVE_PKG_DIRMNGR
+!endif
+!ifdef HAVE_PKG_LIBGCRYPT
+!undef HAVE_PKG_LIBGCRYPT
+!endif
+!ifdef HAVE_PKG_LIBKSBA
+!undef HAVE_PKG_LIBKSBA
+!endif
+!ifdef HAVE_PKG_LIBASSUAN
+!undef HAVE_PKG_LIBASSUAN
+!endif
+!ifdef HAVE_PKG_W32PTH
+!undef HAVE_PKG_W32PTH
+!endif
+!endif
# The package name and version. PRETTY_PACKAGE is a user visible name
# only while PACKAGE is useful for filenames etc. PROD_VERSION is the
# product version and needs to be in the format "MAJ.MIN.MIC.BUILDNR".
+# NOTE: Please keep the capitalization of PRETTY_PACKAGE_SHORT as it is
+# used as registry key.
!define PACKAGE "${_PACKAGE}"
!define PRETTY_PACKAGE "GnuPG For Windows"
!define PRETTY_PACKAGE_SHORT "GPG4Win"
!define VERSION "${_VERSION}"
!define PROD_VERSION "${_BUILD_FILEVERSION}"
!define COMPANY "g10 Code GmbH"
-!define COPYRIGHT "Copyright (C) 2005 g10 Code GmbH"
-!define DESCRIPTION "GPG4Win: The GNU Privacy Guard and tools for Windows"
+!define COPYRIGHT "Copyright (C) 2007 g10 Code GmbH"
+!define DESCRIPTION "Gpg4win: The GNU Privacy Guard and tools for Windows"
!define INSTALL_DIR "GnuPG"
!define WELCOME_TITLE_ENGLISH \
- "Welcome to the installation of Gpg4Win"
+ "Welcome to the installation of Gpg4win"
!define WELCOME_TITLE_GERMAN \
- "Willkommen bei der Installation von Gpg4Win"
+ "Willkommen bei der Installation von Gpg4win"
!define ABOUT_ENGLISH \
"GnuPG is GNU's tool for secure communication and data storage. \
@@ -58,14 +79,14 @@
It includes an advanced key management facility and is compliant \
with the proposed OpenPGP Internet standard as described in RFC2440. \
\r\n\r\n$_CLICK \
- \r\n\r\n\r\n\r\n\r\nThis is GPG4WIN version ${VERSION}\r\n\
+ \r\n\r\n\r\n\r\n\r\nThis is Gpg4win version ${VERSION}\r\n\
file version ${PROD_VERSION}\r\n\
release date ${_BUILD_ISODATE}"
!define ABOUT_GERMAN \
"GnuPG is das Werkzeug aus dem GNU Projekt zur sicheren Kommunikation \
sowie zum sicheren Speichern von Daten. \
\r\n\r\n$_CLICK \
- \r\n\r\n\r\n\r\n\r\nDies ist GPG4WIN Version ${VERSION}\r\n\
+ \r\n\r\n\r\n\r\n\r\nDies ist Gpg4win Version ${VERSION}\r\n\
Dateiversion ${PROD_VERSION}\r\n\
Releasedatum ${_BUILD_ISODATE}"
Modified: trunk/src/inst-gnupg2.nsi
===================================================================
--- trunk/src/inst-gnupg2.nsi 2007-07-09 15:05:06 UTC (rev 450)
+++ trunk/src/inst-gnupg2.nsi 2007-07-10 08:50:20 UTC (rev 451)
@@ -25,7 +25,7 @@
!define prefix ${ipdir}/gnupg2-${gpg4win_pkg_gnupg2_version}
-Section "GnuPG2" SEC_gnupg2
+Section /o "GnuPG2" SEC_gnupg2
SetOutPath "$INSTDIR"
!ifdef SOURCES
@@ -67,3 +67,5 @@
!endif
SectionEnd
+LangString DESC_SEC_gnupg2 ${LANG_ENGLISH} \
+ "GNU Privacy Guard with S/MIME support"
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2007-07-09 15:05:06 UTC (rev 450)
+++ trunk/src/inst-sections.nsi 2007-07-10 08:50:20 UTC (rev 451)
@@ -572,6 +572,9 @@
!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
!ifdef HAVE_PKG_GPGOL
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_gpgol} $(DESC_SEC_gpgol)
!endif
Modified: trunk/src/installer-finish.nsi
===================================================================
--- trunk/src/installer-finish.nsi 2007-07-09 15:05:06 UTC (rev 450)
+++ trunk/src/installer-finish.nsi 2007-07-10 08:50:20 UTC (rev 451)
@@ -30,7 +30,7 @@
WriteRegStr HKLM $MYTMP "DisplayName" "${PRETTY_PACKAGE}"
WriteRegStr HKLM $MYTMP "DisplayIcon" "$INSTDIR\gpg.exe,0"
WriteRegStr HKLM $MYTMP "DisplayVersion" "${VERSION}"
- WriteRegStr HKLM $MYTMP "Publisher" "g10 Code GmbH"
+ WriteRegStr HKLM $MYTMP "Publisher" "The Gpg4win Project"
WriteRegStr HKLM $MYTMP "URLInfoAbout" "http://www.gpg4win.org/"
WriteRegDWORD HKLM $MYTMP "NoModify" "1"
WriteRegDWORD HKLM $MYTMP "NoRepair" "1"
@@ -76,9 +76,16 @@
# We better delete also the name we used prior to 1.0.3
Delete "$DESKTOP\Sylpheed.lnk"
!endif
+!ifdef HAVE_PKG_CLAWS_MAIL
+ Delete "$DESKTOP\Claws-Mail.lnk"
+ Delete "$DESKTOP\Claws-Mail Manual.lnk"
+!endif
!ifdef HAVE_PKG_MAN_NOVICE_DE
Delete "$DESKTOP\$(DESC_Name_man_novice_de).lnk"
!endif
+!ifdef HAVE_PKG_MAN_NOVICE_EN
+ Delete "$DESKTOP\$(DESC_Name_man_novice_en).lnk"
+!endif
!ifdef HAVE_PKG_MAN_ADVANCED_DE
Delete "$DESKTOP\$(DESC_Name_man_advanced_de).lnk"
!endif
@@ -101,6 +108,9 @@
# We better delete also the name we used prior to 1.0.3
Delete "$QUICKLAUNCH\Sylpheed.lnk"
!endif
+!ifdef HAVE_PKG_CLAWS_MAIL
+ Delete "$QUICKLAUNCH\Claws-Mail.lnk"
+!endif
!ifdef HAVE_PKG_MAN_NOVICE_DE
Delete "$QUICKLAUNCH\$(DESC_Name_man_novice_de).lnk"
!endif
Modified: trunk/src/installer.nsi
===================================================================
--- trunk/src/installer.nsi 2007-07-09 15:05:06 UTC (rev 450)
+++ trunk/src/installer.nsi 2007-07-10 08:50:20 UTC (rev 451)
@@ -97,7 +97,7 @@
VIAddVersionKey "FileDescription" "${DESCRIPTION}"
VIAddVersionKey "FileVersion" "${PROD_VERSION}"
-# Set to the name of another GnupG installation if one has been detected
+# Set to the name of another GnuPG installation if one has been detected
Var OtherGnuPGDetected
# Interface Settings
Modified: trunk/src/uninst-claws-mail.nsi
===================================================================
--- trunk/src/uninst-claws-mail.nsi 2007-07-09 15:05:06 UTC (rev 450)
+++ trunk/src/uninst-claws-mail.nsi 2007-07-10 08:50:20 UTC (rev 451)
@@ -32,9 +32,7 @@
!else
Delete "$INSTDIR\claws-mail.exe"
-!ifndef GPG4WIN_LIGHT
Delete "$INSTDIR\claws-mail-manual.pdf"
-!endif
Delete "$INSTDIR\lib\claws-mail\plugins\pgpcore.dll"
Delete "$INSTDIR\lib\claws-mail\plugins\pgpinline.dll"
Modified: trunk/src/uninst-gnupg2.nsi
===================================================================
--- trunk/src/uninst-gnupg2.nsi 2007-07-09 15:05:06 UTC (rev 450)
+++ trunk/src/uninst-gnupg2.nsi 2007-07-10 08:50:20 UTC (rev 451)
@@ -51,7 +51,7 @@
Delete "$INSTDIR\gpg-preset-passphrase.exe"
Delete "$INSTDIR\share\gnupg\qualified.txt"
- Delete "$INSTDIR\share\gnupg\com-certs.txt"
+ Delete "$INSTDIR\share\gnupg\com-certs.pem"
Delete "$INSTDIR\share\gnupg\gpg-conf.skel"
RMDir "$INSTDIR\share\gnupg"
Modified: trunk/src/uninst-sylpheed-claws.nsi
===================================================================
--- trunk/src/uninst-sylpheed-claws.nsi 2007-07-09 15:05:06 UTC (rev 450)
+++ trunk/src/uninst-sylpheed-claws.nsi 2007-07-10 08:50:20 UTC (rev 451)
@@ -32,9 +32,7 @@
!else
Delete "$INSTDIR\sylpheed-claws.exe"
-!ifndef GPG4WIN_LIGHT
Delete "$INSTDIR\sylpheed-claws-manual.pdf"
-!endif
Delete "$INSTDIR\lib\sylpheed-claws\plugins\pgpcore.dll"
Delete "$INSTDIR\lib\sylpheed-claws\plugins\pgpinline.dll"
More information about the Gpg4win-commits
mailing list