Preparing a new release
authorWerner Koch <wk@gnupg.org>
Thu, 5 Jan 2006 17:03:10 +0000 (17:03 +0000)
committerWerner Koch <wk@gnupg.org>
Thu, 5 Jan 2006 17:03:10 +0000 (17:03 +0000)
21 files changed:
ChangeLog
Makefile.am
NEWS
TODO
configure.ac
doc/manual-de/Makefile.am
doc/manual-de/einsteiger.tex
include/config.nsi.in
packages/packages.current
patches/glib-2.9.2-wk1/01-giowin32.patch [moved from patches/glib-2.8.4/01-giowin32.patch with 100% similarity]
src/Makefile.am
src/inst-glib.nsi
src/inst-gnupg.nsi
src/inst-gpa.nsi
src/inst-sections.nsi
src/inst-sylpheed-claws.nsi
src/uninst-glib.nsi
src/uninst-gnupg.nsi
src/uninst-gpa.nsi
src/uninst-sylpheed-claws.nsi
src/uninst-winpt.nsi

index b4e92d8..dbacf49 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2006-01-05  Werner Koch  <wk@g10code.com>
+
+       * src/inst-sylpheed-claws.nsi, src/uninst-sylpheed-claws.nsi,
+       * src/inst-gpa.nsi, src/uninst-gpa.nsi: Install language files.
+
+2006-01-04  Werner Koch  <wk@g10code.com>
+
+       * src/uninst-winpt.nsi: Deinstall the mo file.
+
+       * src/uninst-gpgee.nsi: Fix Source uninstall.
+       * src/uninst-glib.nsi, src/inst-glib.nsi, include/config.nsi.in:
+       Adjusted for source build.
+
+       * patches/glib-2.9.2-wk: New.
+       
+       * packages/packages.current: Switch to glib 2.9.2-wk1.
+
 2006-01-05  Marcus Brinkmann  <marcus@g10code.de>
 
        * configure.ac: Add libiconv and gettext as dependencies.
index a57ab26..d29cee9 100644 (file)
@@ -27,4 +27,5 @@ EXTRA_DIST = autogen.sh README.SVN \
        patches/gnupg-1.4.2/01-po-subdirs.patch \
        patches/gpgme-1.1.0/01-gpgme-def.patch \
        patches/gpgme-1.1.0/02-libtool-dll.patch \
-        patches/pthreads-w32-2-7-0-release/01-make.patch
+        patches/pthreads-w32-2-7-0-release/01-make.patch \
+        glib-2.9.2-wk1/01-giowin32.patch 
diff --git a/NEWS b/NEWS
index d2c6298..1a74db3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
-Noteworthy changes in version 0.3.2
+Noteworthy changes in version 0.5.0
 ------------------------------------------------
 
+ * Fixed GPA problems.
+
+ * Sylpheed does now actually work.
+
  * Changed the packaging of GPGee.
 
 
diff --git a/TODO b/TODO
index c7e2ee5..d80bcf1 100644 (file)
--- a/TODO
+++ b/TODO
@@ -11,6 +11,8 @@
 ** Some versions of strip don't work.
    Werner's GNU strip 2.15.91 20040904 is fine but
    Marcus'  GNU strip 2.15.94 20050118 does not work.
+** Mo file installation macro
+
 
 * Component related issues:
 ** Check out which locale files to install and where. !!!
index f110722..fc01c29 100644 (file)
@@ -24,7 +24,7 @@ min_automake_version="1.9.3"
 
 # Remember to change the version number immediately *after* a release.
 # Uncomment the my_iscvs macro for non-released code.
-m4_define(my_version, [0.3.2])
+m4_define(my_version, [0.5.0])
 m4_define(my_iscvs, yes)
 AC_INIT([gpg4win], my_version[]m4_ifdef([my_iscvs], [-cvs[]m4_translit(
                   [$Revision$],[Ra-z $:])]),
index 2147314..ed6b220 100644 (file)
@@ -34,9 +34,22 @@ EXTRA_DIST = fdl.tex einsteiger.tex durchblicker.tex $(eps_files)
 
 CLEANFILES = $(eps_files_bb)
 
+pkgdata_DATA = einsteiger.pdf durchblicker.pdf
+
+manual.dvi :  signatures.eps
+
+
 all-local: $(eps_files_bb)
 
 
 %.eps.bb : %.eps.gz
        $(ZCAT) `test -f '$<' || echo '$(srcdir)/'`$< \
           | grep '^%%BoundingBox' | head -1 > $@
+
+
+%.dvi : %.tex
+       latex  `test -f '$<' || echo '$(srcdir)/'`$< 
+       latex  `test -f '$<' || echo '$(srcdir)/'`$< 
+
+%.pdf : %.dvi
+       dvipdf  $< $@
index e2321f2..8b076f0 100644 (file)
@@ -282,6 +282,8 @@ kurzen Readme-Datei
 
 Wenn Sie fertig sind, schließen Sie die Readme-Datei.
 
+% FIXME:  Wir müssen erklären wie man Word als Standard Editor in
+% Outlook ausschaltet.
 
 \clearpage
 %% Original page 14
@@ -1175,3 +1177,5 @@ $\spadesuit$ f
 \input{fdl.tex}
 
 \end{document}
+
+
index 96bbeda..f707dc9 100644 (file)
 @HAVE_PKG_GLIB@
 !define gpg4win_pkg_glib @gpg4win_pkg_glib@
 !define gpg4win_pkg_glib_version @gpg4win_pkg_glib_version@
-!define gpg4win_pkg_glib_dev @gpg4win_pkg_glib_dev@
-!define gpg4win_pkg_glib_src @gpg4win_pkg_glib_src@
+#!define gpg4win_pkg_glib_dev @gpg4win_pkg_glib_dev@
+#!define gpg4win_pkg_glib_src @gpg4win_pkg_glib_src@
 
 @HAVE_PKG_ATK@
 !define gpg4win_pkg_atk @gpg4win_pkg_atk@
index a923b8a..3962a65 100644 (file)
@@ -70,14 +70,25 @@ chk  e9f66acde58136ab67e2167412773f727cd13a9d
 # GTK+ stuff
 # http://www.gimp.org/~tml/gimp/win32/downloads.html
 
+#server ftp://ftp.gtk.org/pub/gtk/v2.9
+#
+#file glib-2.9.1.tar.bz2
+#chk  ab84a8afc60c726c105cba3f542f1425e058b1c4  
+server ftp://ftp.g10code.com/g10code/scratch
+
+file glib-2.9.2-wk1.tar.bz2
+chk  2ba7b74ec3337126d8a56aae1b7a77705a6166d5
+
+
 server ftp://ftp.gtk.org/pub/gtk/v2.6
 
-file win32/glib-2.6.6.zip
-chk  f1cf6ff8831217aac38ecd83c07d02416e571c5d
-file win32/glib-dev-2.6.6.zip
-chk  9445676e9394cd92b1e60e0550ed74d8917414d6
-file glib-2.6.6.tar.bz2
-chk  6bb8860bd29a83964ee66ad53ae3e4950aa2677f
+# We need to build our onw glib - see above.
+#file win32/glib-2.6.6.zip
+#chk  f1cf6ff8831217aac38ecd83c07d02416e571c5d
+#file win32/glib-dev-2.6.6.zip
+#chk  9445676e9394cd92b1e60e0550ed74d8917414d6
+#file glib-2.6.6.tar.bz2
+#chk  6bb8860bd29a83964ee66ad53ae3e4950aa2677f
 
 file win32/atk-1.9.0.zip
 chk  d6f99c56b890051c3b9bc77abe8c5a705d3bc5d4
@@ -112,13 +123,10 @@ chk  1019c8027c0cf94bca680886f4e2ae4e629a2a97
 
 # WinPT
 
-#server http://wald.intevation.org/frs/download.php
-#file 65/winpt-0.11.2.tar.bz2
-#file 66/winpt-0.11.2.tar.bz2.sig
+server http://wald.intevation.org/frs/download.php
 
-server ftp://ftp.g10code.com/g10code/scratch
-file winpt-0.11.3-cvs.tar.bz2
-chk  78c3357c1a8c59209263e1c58e7dd84916799f21
+file 84/winpt-0.11.4.tar.bz2
+chk  f880bd2103b51a8e2f6e94f58a9524c523765ccb  winpt-0.11.4.tar.bz2
 
 
 # GPGee
@@ -161,12 +169,16 @@ server ftp://ftp.g10code.com/g10code/scratch
 
 file libgpg-error-1.2-cvs.tar.bz2
 chk  ad964f78de99c7493dc47f49b0071f34d7d5e53d
-file gpgme-1.2.0-cvs.tar.bz2
-chk  3f8bc76e006577fa7c27173c1b695fba3436c6ba
-file gpa-0.7.1-cvs.tar.bz2
-chk  e9c682982daf3434b0892d7e69ad04da5bac4ae1
-file sylpheed-claws-1.9.99cvs5-wk1.tar.bz2
-chk  0706c278dab540981c5ab40872136aa04e3255cb
+
+file gpgme-1.1.1-cvs1150.tar.bz2
+chk  1116ebddb7ba0858e7c28fdefadaa62c096c3237
+
+file gpa-0.7.1-cvs728.tar.bz2
+chk  a61f292e61e2e0ececbc892fc4174542333269bd  
+
+file sylpheed-claws-1.9.100cvs124.tar.bz2
+chk  950c7795f7348a919910d8e6bb5222565a114328  
+
 file man_novice_de-0.0.0-cvs.tar.gz
 chk  33329175b9b69724870139f383edf6e3edea7c78
 file man_advanced_de-0.0.0-cvs.tar.gz
index 1d327ec..7ed7e23 100644 (file)
@@ -35,7 +35,7 @@ gpg4win_spkgs := glib gnupg libgpg-error gpgme gpgol gpa winpt sylpheed-claws \
 gpg4win_pkg_glib_configure = \
   --with-lib-prefix=$(idir) --with-libiconv-prefix=$(idir) \
   CPPFLAGS=-I$(idir)/include LDFLAGS=-L$(idir)/lib
+
 # We would like to use --with-libiconv-prefix and
 # --with-libintl-prefix, but these don't work with the cheesy
 # non-"libfoo.la" versions of iconv and gettext that we are using.
index 1c4635b..784f75c 100644 (file)
@@ -29,7 +29,7 @@ Section "-glib" SEC_glib
 !endif
   SetOutPath "$INSTDIR"
 !ifdef SOURCES
-  File ${gpg4win_pkg_glib_src}
+  File ${gpg4win_pkg_glib}
 !else
   File ${prefix}/bin/gspawn-win32-helper.exe
   File ${prefix}/bin/libglib-2.0-0.dll
index 6d9e050..f17a0c0 100644 (file)
@@ -40,7 +40,7 @@ Section "GnuPG" SEC_gnupg
   # 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_http.exe"
+  File "${prefix}/libexec/gnupg/gpgkeys_curl.exe"
   File "${prefix}/libexec/gnupg/gpgkeys_ldap.exe"
 
   SetOutPath "$INSTDIR\share\gnupg"
index a5626b1..a72492b 100644 (file)
@@ -31,11 +31,15 @@ Section "GPA" SEC_gpa
 !else
   File ${prefix}/bin/gpa.exe
 
+  SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
+  File ${prefix}/share/locale/de/LC_MESSAGES/gpa.mo
+
   SetOutPath "$INSTDIR\share\gpa"
   File ${prefix}/share/gpa/gpa_tips.en
   File ${prefix}/share/gpa/gpa_tips.de
   File ${prefix}/share/gpa/gpa_logo.ppm
   File ${prefix}/share/gpa/gpa.png
+
 !endif
 SectionEnd
 
index 6be9f21..0f86d12 100644 (file)
 !include "uninst-libiconv.nsi"
 !endif
 !ifdef HAVE_PKG_LIBGPG_ERROR
+# Note that the uninstaller of libgpg-error is supposed to remove the shareed
+# directories.  We might want to move this to an extra section.
 !include "uninst-libgpg-error.nsi"
 !endif
 !ifdef HAVE_PKG_GNUPG
index 4fde7ea..ad1096b 100644 (file)
@@ -31,14 +31,15 @@ Section "Sylpheed" SEC_sylpheed
 !else
   File ${prefix}/bin/sylpheed-claws.exe
 
-  SetOutPath "$INSTDIR\share\sylpheed-claws"
-
   SetOutPath "$INSTDIR\lib\sylpheed-claws\plugins"
   File ${prefix}/lib/sylpheed-claws/plugins/pgpcore.dll
   File ${prefix}/lib/sylpheed-claws/plugins/pgpinline.dll
   File ${prefix}/lib/sylpheed-claws/plugins/pgpinline.deps
   File ${prefix}/lib/sylpheed-claws/plugins/pgpmime.dll
   File ${prefix}/lib/sylpheed-claws/plugins/pgpmime.deps
+
+  SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
+  File ${prefix}/share/locale/de/LC_MESSAGES/sylpheed-claws.mo
 !endif
 SectionEnd
 
index 01a66db..27c6278 100644 (file)
@@ -26,7 +26,7 @@
 ; Uninstaller section.
 Section "-un.glib"
 !ifdef SOURCES
-  Push "${gpg4win_pkg_glib_src}"
+  Push "${gpg4win_pkg_glib}"
   Call un.SourceDelete
 !else
   Delete "$INSTDIR\gspawn-win32-helper.exe"
index fe8a4fb..4d45672 100644 (file)
@@ -36,7 +36,7 @@ Section "-un.gnupg"
 
   Delete "$INSTDIR\gpgkeys_finger.exe"
   Delete "$INSTDIR\gpgkeys_hkp.exe"
-  Delete "$INSTDIR\gpgkeys_http.exe"
+  Delete "$INSTDIR\gpgkeys_curl.exe"
   Delete "$INSTDIR\gpgkeys_ldap.exe"
 
   Delete "$INSTDIR\share\gnupg\options.skel"
index 0a217d4..b6d56b8 100644 (file)
@@ -32,6 +32,8 @@ Section "-un.gpa"
 !else
   Delete "$INSTDIR\gpa.exe"
 
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\gpa.mo"
+
   Delete "$INSTDIR\share\gpa\gpa_tips.en"
   Delete "$INSTDIR\share\gpa\gpa_tips.de"
   Delete "$INSTDIR\share\gpa\gpa_logo.ppm"
index fd1fe2e..48ef48b 100644 (file)
@@ -41,6 +41,8 @@ Section "-un.sylpheed"
   RMDir "$INSTDIR\lib\sylpheed-claws"
   RMDir "$INSTDIR\lib"
 
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\sylpheed-claws.mo"
+
   RMDir "$INSTDIR\share\sylpheed-claws"
   RMDir "$INSTDIR\share"
   RMDir "$INSTDIR"
index 3f3eae0..63dce30 100644 (file)
@@ -33,6 +33,9 @@ Section "-un.winpt"
   Delete "$INSTDIR\WinPT.exe"
   Delete "$INSTDIR\PTD.dll"
 
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\winpt.mo"
+  RMDir  "$INSTDIR\share\locale\de\LC_MESSAGES"
+
   Delete "$INSTDIR\share\winpt\keyserver.conf"
   Delete "$INSTDIR\share\winpt\NEWS-0.10.txt"
   Delete "$INSTDIR\share\winpt\README-0.10.txt"