About to release 0.5.1
authorWerner Koch <wk@gnupg.org>
Mon, 9 Jan 2006 19:29:09 +0000 (19:29 +0000)
committerWerner Koch <wk@gnupg.org>
Mon, 9 Jan 2006 19:29:09 +0000 (19:29 +0000)
ChangeLog
Makefile.am
NEWS
configure.ac
packages/packages.current
patches/sylpheed-claws-1.9.100cvs124/01-fix-plugin-dir.patch [new file with mode: 0755]
src/Makefile.am
src/inst-gpg4win.nsi
src/inst-sections.nsi
src/uninst-gpg4win.nsi

index f90c037..84b9af3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-01-09  Werner Koch  <wk@g10code.com>
+
+       Released 0.5.1.
+
+       * src/gpg4win.mk (stamps/stamp-directories): Touch versioninfo.
+
+       * src/inst-gpg4win.nsi, src/uninst-gpg4win.nsi:
+       * src/Makefile.am (stamps/stamp-dist-selft): Include ourself in the
+       source installer.
+
 2006-01-06  Werner Koch  <wk@g10code.com>
 
        * src/gpg4win.mk.in (VERSIONINFO_macro): New.  Use it where
index b468363..f6ed357 100644 (file)
@@ -28,5 +28,5 @@ EXTRA_DIST = autogen.sh README.SVN \
        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/glib-2.9.2-wk1/01-giowin32.patch 
-
+        patches/glib-2.9.2-wk1/01-giowin32.patch \
+       patches/sylpheed-claws-1.9.100cvs124/01-fix-plugin-dir.patch
diff --git a/NEWS b/NEWS
index b8a1ed7..93fc9e2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,14 @@
-Noteworthy changes in version 0.5.1
+Noteworthy changes in version 0.5.1 (2006-01-09)
 ------------------------------------------------
 
+ * Get plugin directory for sylpheed right.
+
+ * WinPT starts again.
+
+ * Included very early versions of the manuals as PDFs.
+
+ * Include gpg4win in the source installer.
+
 
 Noteworthy changes in version 0.5.0 (2006-01-05)
 ------------------------------------------------
index 9dbf3e3..8c20eff 100644 (file)
@@ -25,7 +25,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.5.1])
-m4_define(my_iscvs, yes)
+#m4_define(my_iscvs, yes)
 AC_INIT([gpg4win], my_version[]m4_ifdef([my_iscvs], [-cvs[]m4_translit(
                   [$Revision$],[Ra-z $:])]),
                   [gpg4win-devel@wald.intevation.org])
index b4a9bc5..7d9467a 100644 (file)
@@ -127,9 +127,8 @@ chk  1019c8027c0cf94bca680886f4e2ae4e629a2a97
 #chk  f880bd2103b51a8e2f6e94f58a9524c523765ccb
 
 server ftp://ftp.g10code.com/g10code/scratch
-file winpt-0.11.5-cvs.tar.bz2
-chk  8299a0d2556e56623b188b9d23583ef88b9607f0
-
+file  winpt-0.11.5-cvs.tar.bz2
+chk   99290e405d036904eca5002ba4aec9f9a16caa3e
 
 # GPGee
 # Note that the -bin package has been repackaged from the
@@ -163,8 +162,10 @@ server ftp://ftp.gnupg.org/gcrypt
 file gnupg/gnupg-1.4.2.tar.gz
 chk  cc7e9a5268bf309ac652a7343b62dff8cfb68d38
 
+file alpha/gpa/gpa-0.7.1.tar.bz2
+chk  db850a43e69c6677765cbaf95718b930fe439612
 
-# libgpg-error, GPA and GPGol currently come from manually crafted
+# libgpg-error and GPGol currently come from manually crafted
 # packages.  However, we make them available at a scratch location
 
 server ftp://ftp.g10code.com/g10code/scratch
@@ -175,9 +176,6 @@ chk  ad964f78de99c7493dc47f49b0071f34d7d5e53d
 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  
 
diff --git a/patches/sylpheed-claws-1.9.100cvs124/01-fix-plugin-dir.patch b/patches/sylpheed-claws-1.9.100cvs124/01-fix-plugin-dir.patch
new file mode 100755 (executable)
index 0000000..d2eccfb
--- /dev/null
@@ -0,0 +1,84 @@
+#! /bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+Fix a bug in the W32 plugin directory handling.
+
+2006-01-09  Werner Koch  <wk@g10code.com>
+
+       * src/common/utils.c (w32_get_locale_dir): Removed.
+       (w32_get_module_dir): New.
+       (get_local_dir): Use new function.
+       (get_plugin_dir): Ditto.
+
+
+diff -ru sylpheed-claws.orig/src/common/utils.c sylpheed-claws/src/common/utils.c
+--- sylpheed-claws.orig/src/common/utils.c     2006-01-05 16:36:51.000000000 +0100
++++ sylpheed-claws/src/common/utils.c  2006-01-09 18:59:18.000000000 +0100
+@@ -1980,24 +1980,28 @@
+     return -1;
+ }
+-/* Return a malloced string with the locale dir.  Return NULL on
+-   error. */
+-static char *w32_get_locale_dir(void)
+-{
+-        char name[MAX_PATH+35];
+-        char *p;
+-
+-        if ( !GetModuleFileNameA (0, name, sizeof (name)-30) )
+-                return NULL;
+-        p = strrchr (name, '\\');
+-        if (!p)
+-        {
+-                *name = '\\';
+-                p = name;
++/* Returns a static string with the directroy from which the module
++   has been loaded.  Returns an empty string on error. */
++static char *w32_get_module_dir(void)
++{
++        static char *moddir;
++
++        if (!moddir) {
++                char name[MAX_PATH+10];
++                char *p;
++
++                if ( !GetModuleFileNameA (0, name, sizeof (name)-10) )
++                        *name = 0;
++                else {
++                        p = strrchr (name, '\\');
++                        if (p)
++                                *p = 0;
++                        else
++                                *name = 0;
++                }
++                moddir = g_strdup (name);
+         }
+-        p++;
+-        strcpy (p, "\\share\\locale");
+-        return g_strdup (name);
++        return moddir;
+ }
+ #endif /* G_OS_WIN32 */
+@@ -2008,7 +2012,8 @@
+ #ifdef G_OS_WIN32
+       if (!loc_dir)
+-                loc_dir = w32_get_locale_dir();
++              loc_dir = g_strconcat(w32_get_module_dir(), G_DIR_SEPARATOR_S,
++                                      "\\share\\locale", NULL);
+ #endif
+       if (!loc_dir)
+               loc_dir = LOCALEDIR;
+@@ -2133,7 +2138,7 @@
+       static gchar *plugin_dir = NULL;
+       if (!plugin_dir)
+-                plugin_dir = g_strconcat(get_locale_dir(),
++                plugin_dir = g_strconcat(w32_get_module_dir(),
+                                          "\\lib\\sylpheed-claws\\plugins\\",
+                                          NULL);
+       return plugin_dir;
+
+
index 7fd4906..23a9402 100644 (file)
@@ -204,7 +204,12 @@ gpg4win-$(VERSION).exe: gpg4win.nsi $(common_nsi) stamps/stamp-final \
        $(MAKENSIS) -V3 -DBUILD_DIR=`pwd` -DTOP_SRCDIR=$(top_srcdir) \
                -DSRCDIR=$(srcdir) $(srcdir)/gpg4win.nsi
 
-gpg4win-src-$(VERSION).exe: gpg4win-src.nsi $(common_nsi) stamps/stamp-final
+stamps/stamp-dist-self: versioninfo.txt
+       (set -e; cd ..; make dist-bzip2)
+       touch stamps/stamp-dist-self
+
+gpg4win-src-$(VERSION).exe: gpg4win-src.nsi $(common_nsi) stamps/stamp-final \
+                            stamps/stamp-dist-self
        $(MAKENSIS) -V3 -DBUILD_DIR=`pwd` -DTOP_SRCDIR=$(top_srcdir) \
                -DSRCDIR=$(srcdir) $(srcdir)/gpg4win-src.nsi
 
index b8f5c21..fdc2812 100644 (file)
 
 # This is the very first section installed.
 Section "-gpg4win"
-
 !ifdef SOURCES
-  #
-!else
+  SetOutPath "$INSTDIR"
+  File "${BUILD_DIR}/../gpg4win-${VERSION}.tar.bz2"
+!else 
   SetOutPath "$INSTDIR\share\gpg4win"
 
   File "${BUILD_DIR}/versioninfo.txt"
index 6f367a9..cd4e1ff 100644 (file)
@@ -366,7 +366,7 @@ Function .onInit
   File /oname=gpgspltmp.bmp "${TOP_SRCDIR}/src/gpg4win-splash.bmp"
   File /oname=gpgspltmp.wav "${TOP_SRCDIR}/src/gpg4win-splash.wav"
   g4wihelp::playsound $TEMP\gpgspltmp.wav
-  g4wihelp::showsplash 3000 $TEMP\gpgspltmp.bmp
+  g4wihelp::showsplash 2000 $TEMP\gpgspltmp.bmp
 
   Delete $TEMP\gpgspltmp.bmp
   ; Note that we delete gpgspltmp.wav in .onInst{Failed,Success}
index 4cdf146..8100340 100644 (file)
@@ -21,7 +21,7 @@
 # This is the very last section of the uninstaller.
 Section "-un.gpg4win"
 !ifdef SOURCES
-
+  Delete "gpg4win-${VERSION}.tar.bz2"
 !else
 
   Delete "$INSTDIR\share\gpg4win\versioninfo.txt"