[Gpg4win-commits] r210 - in trunk: . doc include packages src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Thu Mar 9 17:57:52 CET 2006
Author: werner
Date: 2006-03-09 17:57:51 +0100 (Thu, 09 Mar 2006)
New Revision: 210
Modified:
trunk/ChangeLog
trunk/NEWS
trunk/README
trunk/configure.ac
trunk/doc/README.de.txt
trunk/include/config.nsi.in
trunk/packages/packages.current
trunk/src/Makefile.am
trunk/src/inst-sections.nsi
trunk/src/inst-sylpheed-claws.nsi
trunk/src/installer.nsi
trunk/src/uninst-gpg4win.nsi
Log:
About to release 0.8.0
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-03-09 15:28:24 UTC (rev 209)
+++ trunk/ChangeLog 2006-03-09 16:57:51 UTC (rev 210)
@@ -1,3 +1,18 @@
+2006-03-09 Werner Koch <wk at g10code.com>
+
+ Released 0.8.0.
+
+ * src/inst-sylpheed-claws.nsi: Don't select be Default.
+
+ * include/config.nsi.in: Disabled Eudora.
+ * src/inst-sections.nsi: Ditto.
+ * src/Makefile.am: Ditto
+
+2006-03-08 Werner Koch <wk at g10code.com>
+
+ * src/inst-sections.nsi: Play the tune only for the source installer.
+ * src/installer.nsi: And don't reserve the tune file.
+
2006-03-07 Werner Koch <wk at g10code.com>
* configure.ac: Don't build Eudora due to license problems.
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2006-03-09 15:28:24 UTC (rev 209)
+++ trunk/NEWS 2006-03-09 16:57:51 UTC (rev 210)
@@ -1,3 +1,20 @@
+Noteworthy changes in version 0.8.0 (2006-03-09)
+------------------------------------------------
+
+ * The sound will not be played for the regular installer.
+
+ * The unfinished support for the Eudora plugin as been removed
+ because Qualcomm was not able to come up with a free license for
+ the EMS API as used by this plugin. That code makes up about an
+ quarter of the entire plugin and it should be possible to
+ re-implement it under a free license.
+
+ * Updated GnuPG to 1.4.3rc2 which fixes the non-detached signature
+ verification bug.
+
+ * Updated WinPT, GPA and the manuals.
+
+
Noteworthy changes in version 0.7.0 (2006-02-15)
------------------------------------------------
Modified: trunk/README
===================================================================
--- trunk/README 2006-03-09 15:28:24 UTC (rev 209)
+++ trunk/README 2006-03-09 16:57:51 UTC (rev 210)
@@ -52,7 +52,9 @@
This has not been automated. See the README file in the doc/website
directory. To build the HTML version of the manuals you need to go to
doc/manual-de, run the command "make webversion" and copy the require
-files to the desired location.
+files to the desired location. If you are a developer with write
+access to the Sibversion, you may use the "online" target to actually
+update the website.
Adding new packages to the installer:
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2006-03-09 15:28:24 UTC (rev 209)
+++ trunk/configure.ac 2006-03-09 16:57:51 UTC (rev 210)
@@ -24,7 +24,7 @@
# Remember to change the version number immediately *after* a release.
# Uncomment the my_iscvs macro for non-released code.
-m4_define(my_version, [0.8.0-cvs])
+m4_define(my_version, [0.8.0])
#m4_define(my_iscvs, yes)
AC_INIT([gpg4win], my_version[]m4_ifdef([my_iscvs], [-cvs[]m4_translit(
Modified: trunk/doc/README.de.txt
===================================================================
--- trunk/doc/README.de.txt 2006-03-09 15:28:24 UTC (rev 209)
+++ trunk/doc/README.de.txt 2006-03-09 16:57:51 UTC (rev 210)
@@ -17,6 +17,10 @@
Versionsnummern der einzenen Bestandteile
=========================================
+Zur Übersicht sind hier die Prüfsummen sowie die Namen der einzelnen
+Bestandteile aufgelistet. Sie finden dieselben Informationen auch in
+der Datei versioninfo.txt.
+
!VERSIONINFO!
Modified: trunk/include/config.nsi.in
===================================================================
--- trunk/include/config.nsi.in 2006-03-09 15:28:24 UTC (rev 209)
+++ trunk/include/config.nsi.in 2006-03-09 16:57:51 UTC (rev 210)
@@ -81,9 +81,9 @@
!define gpg4win_pkg_sylpheed_claws @gpg4win_pkg_sylpheed_claws@
!define gpg4win_pkg_sylpheed_claws_version @gpg4win_pkg_sylpheed_claws_version@
- at HAVE_PKG_EUDORAGPG@
-!define gpg4win_pkg_eudoragpg @gpg4win_pkg_eudoragpg@
-!define gpg4win_pkg_eudoragpg_version @gpg4win_pkg_eudoragpg_version@
+#@HAVE_PKG_EUDORAGPG@
+#!define gpg4win_pkg_eudoragpg @gpg4win_pkg_eudoragpg@
+#!define gpg4win_pkg_eudoragpg_version @gpg4win_pkg_eudoragpg_version@
@HAVE_PKG_ZLIB@
!define gpg4win_pkg_zlib @gpg4win_pkg_zlib@
Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current 2006-03-09 15:28:24 UTC (rev 209)
+++ trunk/packages/packages.current 2006-03-09 16:57:51 UTC (rev 210)
@@ -122,15 +122,11 @@
# WinPT
-#server http://wald.intevation.org/frs/download.php
-#file 84/winpt-0.11.4.tar.bz2
-#chk f880bd2103b51a8e2f6e94f58a9524c523765ccb
+server http://wald.intevation.org/frs/download.php
+file 137/winpt-0.11.8.tar.bz2
+chk b87a6d0d4f53fa305d27632f4ad5d6a5a5219e15
-server ftp://ftp.g10code.com/g10code/scratch
-file winpt-0.11.8rc1.tar.bz2
-chk 4195420ba82c5852c7b30192fda2c6627e5b31fd
-
# GPGee
# Note that the -bin package has been repackaged from the
# -noinstaller package using these commands:
@@ -160,8 +156,8 @@
server ftp://ftp.gnupg.org/gcrypt
-file alpha/gnupg/gnupg-1.4.3rc1.tar.bz2
-chk 6c2d5f65c2acde6eaeb1ae3a4bc9ae971f942126
+file alpha/gnupg/gnupg-1.4.3rc2.tar.bz2
+chk eb5b839555ff1957b5956aaf4c96505223a2f9d0
file libgpg-error/libgpg-error-1.2.tar.bz2
chk 468657e5bccd534f350b1a0109e19d2a9cc5d027
@@ -190,5 +186,4 @@
chk 33329175b9b69724870139f383edf6e3edea7c78
file man_advanced_de-0.0.0-cvs.tar.gz
chk b4a8b05b181f20c5ba9d937b6347095905323318
-file eudoragpg-0.0.0-cvs.tar.gz
-chk 79e3a24e4baa19f23e955b1a4b1c41b8083345b7
+
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2006-03-09 15:28:24 UTC (rev 209)
+++ trunk/src/Makefile.am 2006-03-09 16:57:51 UTC (rev 210)
@@ -28,7 +28,7 @@
# Supported source packages.
gpg4win_spkgs := glib gnupg libgpg-error gpgme gpgol gpa winpt sylpheed-claws \
- eudoragpg man_novice_de man_advanced_de
+ man_novice_de man_advanced_de
# Extra options to configure for individual packages.
# We can use $(idir) here for the installation prefix.
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2006-03-09 15:28:24 UTC (rev 209)
+++ trunk/src/inst-sections.nsi 2006-03-09 16:57:51 UTC (rev 210)
@@ -81,9 +81,9 @@
!ifdef HAVE_PKG_SYLPHEED_CLAWS
!include "inst-sylpheed-claws.nsi"
!endif
-!ifdef HAVE_PKG_EUDORAGPG
-!include "inst-eudoragpg.nsi"
-!endif
+#!ifdef HAVE_PKG_EUDORAGPG
+#!include "inst-eudoragpg.nsi"
+#!endif
!ifdef HAVE_PKG_MAN_NOVICE_DE
!include "inst-man_novice_de.nsi"
!endif
@@ -99,9 +99,9 @@
!ifdef HAVE_PKG_MAN_NOVICE_DE
!include "uninst-man_novice_de.nsi"
!endif
-!ifdef HAVE_PKG_EUDORAGPG
-!include "uninst-eudoragpg.nsi"
-!endif
+#!ifdef HAVE_PKG_EUDORAGPG
+#!include "uninst-eudoragpg.nsi"
+#!endif
!ifdef HAVE_PKG_SYLPHEED_CLAWS
!include "uninst-sylpheed-claws.nsi"
!endif
@@ -266,17 +266,17 @@
skip_sylpheed:
!endif
-!ifdef HAVE_PKG_EUDORAGPG
- !insertmacro SectionFlagIsSet ${SEC_eudoragpg} ${SF_SELECTED} have_eudoragpg skip_eudoragpg
- have_eudoragpg:
- !insertmacro SelectSection ${SEC_zlib}
- !insertmacro SelectSection ${SEC_gtk_}
- !insertmacro SelectSection ${SEC_libpng}
- !insertmacro SelectSection ${SEC_glib}
- !insertmacro SelectSection ${SEC_gpgme}
- !insertmacro SelectSection ${SEC_gnupg}
- skip_eudoragpg:
-!endif
+#!ifdef HAVE_PKG_EUDORAGPG
+# !insertmacro SectionFlagIsSet ${SEC_eudoragpg} ${SF_SELECTED} have_eudoragpg skip_eudoragpg
+# have_eudoragpg:
+# !insertmacro SelectSection ${SEC_zlib}
+# !insertmacro SelectSection ${SEC_gtk_}
+# !insertmacro SelectSection ${SEC_libpng}
+# !insertmacro SelectSection ${SEC_glib}
+# !insertmacro SelectSection ${SEC_gpgme}
+# !insertmacro SelectSection ${SEC_gnupg}
+# skip_eudoragpg:
+#!endif
!ifdef HAVE_PKG_GTK_
!insertmacro SectionFlagIsSet ${SEC_gtk_} \
@@ -364,8 +364,11 @@
SetOutPath $TEMP
File /oname=gpgspltmp.bmp "${TOP_SRCDIR}/doc/logo/gpg4win-logo-400px.bmp"
+ # We play the tune only for the soruce installer
+!ifdef SOURCES
File /oname=gpgspltmp.wav "${TOP_SRCDIR}/src/gpg4win-splash.wav"
g4wihelp::playsound $TEMP\gpgspltmp.wav
+!endif
g4wihelp::showsplash 2500 $TEMP\gpgspltmp.bmp
Delete $TEMP\gpgspltmp.bmp
@@ -431,9 +434,9 @@
!ifdef HAVE_PKG_SYLPHEED_CLAWS
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_sylpheed} $(DESC_SEC_sylpheed)
!endif
-!ifdef HAVE_PKG_EUDORAGPG
- !insertmacro MUI_DESCRIPTION_TEXT ${SEC_eudoragpg} $(DESC_SEC_eudoragpg)
-!endif
+#!ifdef HAVE_PKG_EUDORAGPG
+# !insertmacro MUI_DESCRIPTION_TEXT ${SEC_eudoragpg} $(DESC_SEC_eudoragpg)
+#!endif
!ifdef HAVE_PKG_MAN_NOVICE_DE
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_man_novice_de} $(DESC_SEC_man_novice_de)
!endif
@@ -487,15 +490,15 @@
no_sylpheed_menu:
!endif
-!ifdef HAVE_PKG_EUDORAGPG
- SectionGetFlags ${SEC_eudoragpg} $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} 0 no_eudoragpg_menu
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\EudoraGPG Plugin.lnk" \
- "$INSTDIR\share\eudoragpg\eudoragpg.html" \
- "" "" "" SW_SHOWNORMAL "" ""
- no_eudoragpg_menu:
-!endif
+#!ifdef HAVE_PKG_EUDORAGPG
+# SectionGetFlags ${SEC_eudoragpg} $R0
+# IntOp $R0 $R0 & ${SF_SELECTED}
+# IntCmp $R0 ${SF_SELECTED} 0 no_eudoragpg_menu
+# CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\EudoraGPG Plugin.lnk" \
+# "$INSTDIR\share\eudoragpg\eudoragpg.html" \
+# "" "" "" SW_SHOWNORMAL "" ""
+# no_eudoragpg_menu:
+#!endif
!ifdef HAVE_PKG_MAN_NOVICE_DE
SectionGetFlags ${SEC_man_novice_de} $R0
Modified: trunk/src/inst-sylpheed-claws.nsi
===================================================================
--- trunk/src/inst-sylpheed-claws.nsi 2006-03-09 15:28:24 UTC (rev 209)
+++ trunk/src/inst-sylpheed-claws.nsi 2006-03-09 16:57:51 UTC (rev 210)
@@ -24,7 +24,7 @@
!define prefix ${ipdir}/sylpheed-claws-${gpg4win_pkg_sylpheed_claws_version}
-Section "Sylpheed" SEC_sylpheed
+Section /o "Sylpheed" SEC_sylpheed
SetOutPath "$INSTDIR"
!ifdef SOURCES
File "${gpg4win_pkg_sylpheed_claws}"
Modified: trunk/src/installer.nsi
===================================================================
--- trunk/src/installer.nsi 2006-03-09 15:28:24 UTC (rev 209)
+++ trunk/src/installer.nsi 2006-03-09 16:57:51 UTC (rev 210)
@@ -158,7 +158,9 @@
#!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
ReserveFile "${BUILD_DIR}\g4wihelp.dll"
ReserveFile "${TOP_SRCDIR}\doc\logo\gpg4win-logo-400px.bmp"
+!ifdef SOURCES
ReserveFile "${TOP_SRCDIR}\src\gpg4win-splash.wav"
+!endif
ReserveFile "${TOP_SRCDIR}\COPYING"
# Language support
Modified: trunk/src/uninst-gpg4win.nsi
===================================================================
--- trunk/src/uninst-gpg4win.nsi 2006-03-09 15:28:24 UTC (rev 209)
+++ trunk/src/uninst-gpg4win.nsi 2006-03-09 16:57:51 UTC (rev 210)
@@ -24,6 +24,11 @@
Delete "gpg4win-${VERSION}.tar.bz2"
!else
+ # Delete cruft from version prior to 0.8
+ Delete "$INSTDIR\share\eudoragpg\eudoragpg.html"
+ RMDir "$INSTDIR\share\eudoragpg"
+
+ # Delete standard stuff.
Delete "$INSTDIR\share\gpg4win\README.en.txt"
Delete "$INSTDIR\share\gpg4win\README.de.txt"
Delete "$INSTDIR\share\gpg4win\versioninfo.txt"
More information about the Gpg4win-commits
mailing list