[Gpg4win-commits] r131 - in trunk: . doc m4 packages src
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Wed Jan 25 20:19:32 CET 2006
Author: werner
Date: 2006-01-25 20:19:31 +0100 (Wed, 25 Jan 2006)
New Revision: 131
Added:
trunk/doc/README.de.txt
trunk/doc/README.en.txt
Modified:
trunk/ChangeLog
trunk/doc/ChangeLog
trunk/doc/Makefile.am
trunk/m4/gpg4win.m4
trunk/packages/packages.current
trunk/src/Makefile.am
trunk/src/inst-eudoragpg.nsi
trunk/src/inst-gnupg.nsi
trunk/src/inst-gpa.nsi
trunk/src/inst-gpg4win.nsi
trunk/src/inst-gpgol.nsi
trunk/src/inst-sections.nsi
trunk/src/inst-sylpheed-claws.nsi
trunk/src/installer.nsi
trunk/src/uninst-gpg4win.nsi
Log:
Install a README file, updated WinPT and GPGee and minor fixes all over the
place.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-01-20 18:42:52 UTC (rev 130)
+++ trunk/ChangeLog 2006-01-25 19:19:31 UTC (rev 131)
@@ -1,3 +1,23 @@
+2006-01-25 Werner Koch <wk at g10code.com>
+
+ * m4/gpg4win.m4 (GPG4WIN_BPKG_BINSRC): Kludge to allow
+ "noinstaller" as an alternative to "bin".
+
+2006-01-23 Werner Koch <wk at g10code.com>
+
+ * src/Makefile.am (README.en.txt, README.de.txt): New.
+ (gpg4win-$(VERSION).exe): Depend on them.
+ (CLEANFILES): Clean them up.
+
+ * src/installer.nsi (T_LangCode): new.
+ (MUI_FINISHPAGE_SHOWREADME): Use this intead of running the key
+ manager. This makes sense becuase gpg4win needs to be insalled as
+ Administartor but the Administrator should in general not use
+ gpg4win.
+
+ * src/inst-gpg4win.nsi: Install README.de.txt and README.en.txt.
+ * src/uninst-gpg4win.nsi: Uninstall them.
+
2006-01-20 Werner Koch <wk at g10code.com>
* configure.ac: Create doc/log/Makefile.
Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog 2006-01-20 18:42:52 UTC (rev 130)
+++ trunk/doc/ChangeLog 2006-01-25 19:19:31 UTC (rev 131)
@@ -1,3 +1,7 @@
+2006-01-23 Werner Koch <wk at g10code.com>
+
+ * README.de.txt, README.en.txt: New.
+
2006-01-20 Werner Koch <wk at g10code.com>
* Makefile.am (SUBDIRS): Add logo.
Modified: trunk/doc/Makefile.am
===================================================================
--- trunk/doc/Makefile.am 2006-01-20 18:42:52 UTC (rev 130)
+++ trunk/doc/Makefile.am 2006-01-25 19:19:31 UTC (rev 131)
@@ -17,6 +17,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-EXTRA_DIST = nsi-mode.el
+EXTRA_DIST = nsi-mode.el README.en.txt README.de.txt
SUBDIRS = logo manual-de website
Added: trunk/doc/README.de.txt
===================================================================
--- trunk/doc/README.de.txt 2006-01-20 18:42:52 UTC (rev 130)
+++ trunk/doc/README.de.txt 2006-01-25 19:19:31 UTC (rev 131)
@@ -0,0 +1,37 @@
+;; README.de.txt -*- coding: latin-1; -*-
+;; This is the README installed with gpg4win (German version). Lines
+;; with a ; in the first column are considered a comment and not
+;; included in the actually installed version. Certain keywords are
+;; replaced by the Makefile; those words are enclosed by exclamation
+;; marks.
+
+ Deutsche README Datei for Gpg4Win
+ =================================
+
+Dies ist GnuPG for Windows, Version !VERSION!.
+
+
+
+
+ Versionsnummern der einzenen Bestandteile
+ =========================================
+
+!VERSIONINFO!
+
+
+
+
+ Rechtliche Hinweise zu den einzelnen Bestandteilen der Software
+ =================================================================
+
+
+
+
+ Liste der Änderungen an Gpg4Win
+ =================================
+ (englische NEWS Datei)
+
+!NEWSFILE!
+
+
+ *** Ende der Datei ***
Added: trunk/doc/README.en.txt
===================================================================
--- trunk/doc/README.en.txt 2006-01-20 18:42:52 UTC (rev 130)
+++ trunk/doc/README.en.txt 2006-01-25 19:19:31 UTC (rev 131)
@@ -0,0 +1,22 @@
+;; README.en.txt -*- coding: latin-1; -*-
+;; This is the README installed with gpg4win. with a ; in the first
+;; column are considered a comment and not included in the actually
+;; installed version. Certain keywords are replaced by the Makefile;
+;; those words are enclosed by exclamation marks.
+English README file for Gpg4Win
+================================
+
+Bla bla
+
+
+
+
+Version numbers of included software:
+
+!VERSIONINFO!
+
+
+Happy GiPiGing,
+
+ Your Gpg4Win Team
+
Modified: trunk/m4/gpg4win.m4
===================================================================
--- trunk/m4/gpg4win.m4 2006-01-20 18:42:52 UTC (rev 130)
+++ trunk/m4/gpg4win.m4 2006-01-25 19:19:31 UTC (rev 131)
@@ -532,7 +532,7 @@
# GPG4WIN_BPKG_BINSRC([PKG],[DEPENDS],[IF-FOUND],[IF-NOT-FOUND])
# Set up package PKG which is expected to be delivered as two ZIP files
-# with a "-(src|source)" and a "-bin" suffix.
+# with a "-(src|source)" and a "-(bin|noinstaller)" suffix.
AC_DEFUN([GPG4WIN_BPKG_BINSRC],
[
AC_REQUIRE([GPG4WIN_INIT])
@@ -548,6 +548,11 @@
$_gpg4win_pkg,
_gpg4win_bpkg=$gpg4win_val
_gpg4win_version=$gpg4win_version)])
+ AS_IF([test x$_gpg4win_pkg != xno -a x$_gpg4win_bpkg = xno],
+ [GPG4WIN_FIND($1-noinstaller, [$1-\(.*\)-noinstaller],,
+ $_gpg4win_pkg,
+ _gpg4win_bpkg=$gpg4win_val
+ _gpg4win_version=$gpg4win_version)])
# At this point, _gpg4win_bpkg is no, or the actual package binary file.
Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current 2006-01-20 18:42:52 UTC (rev 130)
+++ trunk/packages/packages.current 2006-01-25 19:19:31 UTC (rev 131)
@@ -127,9 +127,10 @@
#chk f880bd2103b51a8e2f6e94f58a9524c523765ccb
server ftp://ftp.g10code.com/g10code/scratch
-file winpt-0.11.5-cvs.tar.bz2
-chk 99290e405d036904eca5002ba4aec9f9a16caa3e
+file winpt-0.11.7-cvs.tar.bz2
+chk 839dce06ab87f50513ce076ba049e61d9de40e39
+
# GPGee
# Note that the -bin package has been repackaged from the
# -noinstaller package using these commands:
@@ -142,12 +143,14 @@
server ftp://ftp.gnupg.org/gcrypt/gpgee
-file GPGee-1.2.3-bin.zip
-chk 911a30208094acc30ffb5f8f43e95be1d29d99e6
-file GPGee-1.2.3-source.zip
-chk 8255044586f5b7ef63f7937c496d925e942829e8
+file GPGee-1.3.0-noinstaller.zip
+chk a7aa1ee4a92922b33ca45e2dca0e4dbfa5a7b1fd
+file GPGee-1.3.0-source.zip
+chk fa398ea4ca857f11d6c60cbb69b29c6c27bd379c
+
+
# GPGol
server ftp://ftp.g10code.com/g10code/gpgol
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2006-01-20 18:42:52 UTC (rev 130)
+++ trunk/src/Makefile.am 2006-01-25 19:19:31 UTC (rev 131)
@@ -24,7 +24,7 @@
exdll.h g4wihelp.c g4wihelp.nsi config.site loreley.mid
# Need to clean the dll because we bypassed automake.
-CLEANFILES = g4wihelp.dll versioninfo.txt
+CLEANFILES = g4wihelp.dll versioninfo.txt README.en.txt README.de.txt
# Supported source packages.
gpg4win_spkgs := glib gnupg libgpg-error gpgme gpgol gpa winpt sylpheed-claws \
@@ -196,11 +196,23 @@
echo '=========== SHA-1 checksum ============= == package ==' \
) | tac | awk '{printf "%s\r\n", $$0}' > versioninfo.txt
+README.en.txt : versioninfo.txt $(top_srcdir)/doc/README.en.txt
+ sed -e '/^;.*/d;/!VERSIONINFO!/{r versioninfo.txt' -e 'd;}' \
+ < $(top_srcdir)/doc/README.en.txt \
+ | awk '{printf "%s\r\n", $$0}' >README.en.txt
+
+README.de.txt : versioninfo.txt $(top_srcdir)/doc/README.de.txt
+ sed -e '/^;.*/d;/!VERSIONINFO!/{r versioninfo.txt' -e 'd;}' \
+ -e '/!NEWSFILE!/{r $(top_srcdir)/NEWS' -e 'd;}' \
+ -e 's,!VERSION!,$(VERSION),g' \
+ < $(top_srcdir)/doc/README.de.txt \
+ | awk '{printf "%s\r\n", $$0}' >README.de.txt
+
# For some nut-crazy reason someone thought it would be a great idea
# 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 versioninfo.txt
+ g4wihelp.dll README.en.txt README.de.txt
$(MAKENSIS) -V3 -DBUILD_DIR=`pwd` -DTOP_SRCDIR=$(top_srcdir) \
-DSRCDIR=$(srcdir) $(srcdir)/gpg4win.nsi
Modified: trunk/src/inst-eudoragpg.nsi
===================================================================
--- trunk/src/inst-eudoragpg.nsi 2006-01-20 18:42:52 UTC (rev 130)
+++ trunk/src/inst-eudoragpg.nsi 2006-01-25 19:19:31 UTC (rev 131)
@@ -40,6 +40,6 @@
LangString DESC_SEC_eudoragpg ${LANG_ENGLISH} \
"EudoraGPG is a plugin for the Eudora mail program"
LangString DESC_SEC_eudoragpg ${LANG_GERMAN} \
- "EudoraGPG ist ein Plugin für das Eudora Mailprogramm"
+ "EudoraGPG ist ein Plugin zur Verschlüsselung für das Eudora Mailprogramm"
Modified: trunk/src/inst-gnupg.nsi
===================================================================
--- trunk/src/inst-gnupg.nsi 2006-01-20 18:42:52 UTC (rev 130)
+++ trunk/src/inst-gnupg.nsi 2006-01-25 19:19:31 UTC (rev 131)
@@ -58,8 +58,8 @@
"GNU Privacy Guard"
LangString DESC_SEC_gnupg ${LANG_GERMAN} \
"Der GNU Privacy Guard (GnuPG) ist der Kernbestandteil \
- dieser Software. GnuPG stellt die eigentlichen \
- Verschlüsselungsfunktionen sowie die Schlüsselverwaltung bereit."
+ dieser Software. GnuPG stellt die eigentliche \
+ Verschlüsselung sowie die Verwaltung der Schlüssel bereit."
LangString DESC_Menu_gnupg_faq ${LANG_ENGLISH} \
"Show the Frequently Asked Questions Document for GnuPG"
Modified: trunk/src/inst-gpa.nsi
===================================================================
--- trunk/src/inst-gpa.nsi 2006-01-20 18:42:52 UTC (rev 130)
+++ trunk/src/inst-gpa.nsi 2006-01-25 19:19:31 UTC (rev 131)
@@ -47,8 +47,8 @@
LangString DESC_SEC_gpa ${LANG_ENGLISH} \
"GNU Privacy Assistant"
LangString DESC_SEC_gpa ${LANG_GERMAN} \
- "GNU Privacy Assistent (GPA) ist ein Schlüsselverwaltungsprogramm \
- welches für mehrere Betriebsysteme verfügbar ist. Es kann zusammen \
+ "GNU Privacy Assistent (GPA) ist ein Proramm zum Verwalten von Schlüsseln \
+ welches für mehrere Plattformen verfügbar ist. Es kann zusammen \
oder anstatt von WinPT benutzt werden."
Modified: trunk/src/inst-gpg4win.nsi
===================================================================
--- trunk/src/inst-gpg4win.nsi 2006-01-20 18:42:52 UTC (rev 130)
+++ trunk/src/inst-gpg4win.nsi 2006-01-25 19:19:31 UTC (rev 131)
@@ -26,11 +26,18 @@
!else
SetOutPath "$INSTDIR\share\gpg4win"
+ File "${BUILD_DIR}/README.en.txt"
+ File "${BUILD_DIR}/README.de.txt"
File "${BUILD_DIR}/versioninfo.txt"
!endif
SectionEnd
+LangString DESC_Menu_gpg4win_readme ${LANG_ENGLISH} \
+ "General information on Gpg4Win"
+LangString DESC_Menu_gpg4win_readme ${LANG_GERMAN} \
+ "Allgemeine Informationen zu Gpg4Win"
+
Modified: trunk/src/inst-gpgol.nsi
===================================================================
--- trunk/src/inst-gpgol.nsi 2006-01-20 18:42:52 UTC (rev 130)
+++ trunk/src/inst-gpgol.nsi 2006-01-25 19:19:31 UTC (rev 131)
@@ -60,5 +60,5 @@
LangString DESC_SEC_gpgol ${LANG_ENGLISH} \
"GnuPG for Outlook"
LangString DESC_SEC_gpgol ${LANG_GERMAN} \
- "GnuPG für Outlook (GPGol) is eine Erweiterung für Outlook 2000, die \
+ "GnuPG für Outlook (GPGol) is eine Erweiterung für Outlook 2003, die \
verwendet wird um Nachrichten mit OpenPGP zu verschlüsseln."
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2006-01-20 18:42:52 UTC (rev 130)
+++ trunk/src/inst-sections.nsi 2006-01-25 19:19:31 UTC (rev 131)
@@ -533,6 +533,12 @@
"$INSTDIR\share\gnupg\faq.html" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gnupg_faq)
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Gpg4Win README.lnk" \
+ "$INSTDIR\share\gpg4win\README.$(T_LangCode).txt" \
+ "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gpg4win_readme)
+
+
+
# No more uninstall link becuase Windows has its wom feature to call
# the uninstaller.
# CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" \
Modified: trunk/src/inst-sylpheed-claws.nsi
===================================================================
--- trunk/src/inst-sylpheed-claws.nsi 2006-01-20 18:42:52 UTC (rev 130)
+++ trunk/src/inst-sylpheed-claws.nsi 2006-01-25 19:19:31 UTC (rev 131)
@@ -48,7 +48,7 @@
"Sylpheed Mail-User-Agent"
LangString DESC_SEC_sylpheed ${LANG_GERMAN} \
"Sylpheed ist ein vollständiges Mail- und News-Programm mit sehr guter \
- Unterstützung for GnuPG. Dies ist die Sylpheed-Claws Variante."
+ Unterstützung für GnuPG. Dies ist die Sylpheed-Claws Variante."
LangString DESC_Menu_sylpheed ${LANG_ENGLISH} \
"Run the Sylpheed mailprogram."
Modified: trunk/src/installer.nsi
===================================================================
--- trunk/src/installer.nsi 2006-01-20 18:42:52 UTC (rev 130)
+++ trunk/src/installer.nsi 2006-01-25 19:19:31 UTC (rev 131)
@@ -123,10 +123,12 @@
!define MUI_PAGE_CUSTOMFUNCTION_PRE PrintCloseOtherApps
!insertmacro MUI_PAGE_INSTFILES
-!define MUI_FINISHPAGE_RUN
-!define MUI_FINISHPAGE_RUN_FUNCTION RunOnFinish
-!define MUI_FINISHPAGE_RUN_TEXT "$(T_RunKeyManager)"
-!define MUI_FINISHPAGE_RUN_NOTCHECKED
+!define MUI_FINISHPAGE_SHOWREADME "README.$(T_LangCode).txt"
+!define MUI_FINISHPAGE_SHOWREADME_TEXT "$(T_ShowReadme)"
+#!define MUI_FINISHPAGE_RUN
+#!define MUI_FINISHPAGE_RUN_FUNCTION RunOnFinish
+#!define MUI_FINISHPAGE_RUN_TEXT "$(T_RunKeyManager)"
+#!define MUI_FINISHPAGE_RUN_NOTCHECKED
!define MUI_FINISHPAGE_LINK "$(T_MoreInfo)"
!define MUI_FINISHPAGE_LINK_LOCATION http://www.gpg4win.org
!insertmacro MUI_PAGE_FINISH
@@ -161,6 +163,10 @@
# Language support
+LangString T_LangCode ${LANG_ENGLISH} "en"
+LangString T_LangCode ${LANG_GERMAN} "de"
+
+
# The WelcomeTitle is displayed on the first page.
LangString T_WelcomeTitle ${LANG_ENGLISH} "${WELCOME_TITLE_ENGLISH}"
LangString T_WelcomeTitle ${LANG_GERMAN} "${WELCOME_TITLE_GERMAN}"
@@ -198,6 +204,11 @@
LangString T_MoreInfo ${LANG_GERMAN} \
"Hier klicken um zur Homepage des Projekts zu gelangen"
+LangString T_ShowReadme ${LANG_ENGLISH} \
+ "Show the README file"
+LangString T_ShowReadme ${LANG_GERMAN} \
+ "Die README Datei anzeigen"
+
LangString T_NoKeyManager ${LANG_ENGLISH} \
"No key manager has been installed, thus we can't run one now."
LangString T_NoKeyManager ${LANG_GERMAN} \
Modified: trunk/src/uninst-gpg4win.nsi
===================================================================
--- trunk/src/uninst-gpg4win.nsi 2006-01-20 18:42:52 UTC (rev 130)
+++ trunk/src/uninst-gpg4win.nsi 2006-01-25 19:19:31 UTC (rev 131)
@@ -24,6 +24,8 @@
Delete "gpg4win-${VERSION}.tar.bz2"
!else
+ Delete "$INSTDIR\share\gpg4win\README.en.txt"
+ Delete "$INSTDIR\share\gpg4win\README.de.txt"
Delete "$INSTDIR\share\gpg4win\versioninfo.txt"
RMDir "$INSTDIR\share\gpg4win"
More information about the Gpg4win-commits
mailing list