[Gpg4win-commits] r784 - in trunk: . patches patches/gnupg2 patches/gpa src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Apr 23 17:16:55 CEST 2008
Author: werner
Date: 2008-04-23 17:16:54 +0200 (Wed, 23 Apr 2008)
New Revision: 784
Added:
trunk/patches/gnupg2/
trunk/patches/gnupg2/01-version.patch.in
trunk/patches/gpa/
trunk/patches/gpa/01-no-uiserver.patch
Modified:
trunk/ChangeLog
trunk/Makefile.am
trunk/NEWS
trunk/README
trunk/configure.ac
trunk/src/Makefile.am
Log:
Preparing the first public BETA release.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-04-23 08:57:09 UTC (rev 783)
+++ trunk/ChangeLog 2008-04-23 15:16:54 UTC (rev 784)
@@ -1,5 +1,11 @@
2008-04-23 Werner Koch <wk at g10code.com>
+ Release 1.9.0 beta version.
+
+ * src/Makefile.am (EXTRA_DIST): Add Memento.nsh
+
+ * patches/gpa/01-no-uiserver.patch: New.
+
* autogen.sh <build-w32>: Pass --enable-maintainer-mode.
* patches/gnupg2/01-version.patch.in: New.
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2008-04-23 08:57:09 UTC (rev 783)
+++ trunk/Makefile.am 2008-04-23 15:16:54 UTC (rev 784)
@@ -14,8 +14,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
@@ -67,6 +66,7 @@
patches/gnupg2-2.0.9/03-i18n+etc.patch \
patches/gnupg2-2.0.9/04-ks-w32init.patch \
patches/gnupg2-2.0.9/05-w32-http.patch \
+ patches/gpa/01-no-uiserver.patch \
patches/gpgol-0.9.91/01-gpgme.patch
copy-news:
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-04-23 08:57:09 UTC (rev 783)
+++ trunk/NEWS 2008-04-23 15:16:54 UTC (rev 784)
@@ -3,11 +3,31 @@
# The version number given below are for the standard installers as
# distributed by www.gpg4win.org.
-Noteworthy changes in version 1.9.0
+Noteworthy changes in version 1.9.0 (2008-04-23)
------------------------------------------------
+(en) This is a BETA version of the new Gpg4win/2 architecture.
+ This version shall not be used in a production environment.
+(de) Dies ist eine BETA Version der neuen Gpg4win/2 Architektur.
+ Diese Version soll nicht in einer Produktivumgebung
+ eingesetzt werden.
+~~~~~~~~~~~~~~~
+GnuPG: 1.4.9
+GnuPG2: 2.0.9
+DirMngr: 1.0.2-svn297
+Kleopatra: 20080421
+GPA: 0.7.7-svn859
+GpgOL: 0.10.12
+GpgEX: 0.9.0
+WinPT: 1.2.0
+Claws-Mail: 3.1.0cvs70
+Novices: 1.0.0
+Einsteiger: 2.0.2
+Durchblicker: 2.0.2
+~~~~~~~~~~~~~~~
+
Noteworthy changes in version 1.1.3 (2007-09-17)
------------------------------------------------
@@ -506,7 +526,7 @@
(en) Initial release.
-# Copyright 2005, 2006 g10 Code GmbH
+# Copyright 2005, 2006, 2007, 2008 g10 Code GmbH
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
Modified: trunk/README
===================================================================
--- trunk/README 2008-04-23 08:57:09 UTC (rev 783)
+++ trunk/README 2008-04-23 15:16:54 UTC (rev 784)
@@ -117,7 +117,7 @@
The entire Gpg4win package is
- Copyright (C) 2005, 2006, 2007 g10 Code GmbH
+ Copyright (C) 2005, 2006, 2007, 2008 g10 Code GmbH
GPG4Win is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
@@ -138,7 +138,7 @@
This file
=========
-Copyright 2005, 2006 g10 Code GmbH
+Copyright 2005, 2006, 2008 g10 Code GmbH
This file is free software; as a special exception the author gives
unlimited permission to copy and/or distribute it, with or without
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-04-23 08:57:09 UTC (rev 783)
+++ trunk/configure.ac 2008-04-23 15:16:54 UTC (rev 784)
@@ -14,8 +14,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
# (Process this file with autoconf to produce a configure script.)
@@ -27,7 +26,7 @@
# "svn up" and "autogen.sh" right before creating a distribution.
# Right after a release the make target "copy-news" is to be called!
m4_define([my_version], [1.9.0])
-m4_define([my_issvn], [yes])
+m4_define([my_issvn], [no])
m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
||echo 'Revision: 0')|sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
Added: trunk/patches/gnupg2/01-version.patch.in
===================================================================
--- trunk/patches/gnupg2/01-version.patch.in 2008-04-23 08:57:09 UTC (rev 783)
+++ trunk/patches/gnupg2/01-version.patch.in 2008-04-23 15:16:54 UTC (rev 784)
@@ -0,0 +1,22 @@
+#! /bin/sh
+patch -p0 -f $* < $0
+exit $?
+
+Make --version also print the version number of Gpg4win so that we
+can see in bug reports what patches have been used.
+
+
+
+--- jnlib/argparse.c
++++ jnlib/argparse.c
+@@ -868,7 +868,7 @@
+ fputs (strusage (11), stdout);
+ if ((s=strusage (12)))
+ printf (" (%s)", s );
+- printf (" %s\n", strusage (13) );
++ printf (" %s %s\n", strusage (13), "(Gpg4win @PACKAGE_VERSION@)");
+ /* Additional version lines. */
+ for (i=20; i < 30; i++)
+ if ((s=strusage (i)))
+
+
Property changes on: trunk/patches/gnupg2/01-version.patch.in
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/patches/gpa/01-no-uiserver.patch
===================================================================
--- trunk/patches/gpa/01-no-uiserver.patch 2008-04-23 08:57:09 UTC (rev 783)
+++ trunk/patches/gpa/01-no-uiserver.patch 2008-04-23 15:16:54 UTC (rev 784)
@@ -0,0 +1,31 @@
+#! /bin/sh
+patch -p0 -f $* < $0
+exit $?
+
+To avoid problems with other UI servers (e.g.Kleopatra), we do not
+want to start in server mode by default.
+
+
+--- src/gpa.c (revision 874)
++++ src/gpa.c (working copy)
+@@ -410,11 +410,14 @@
+ keyservers->data);
+ }
+
+- /* Fire up the server. */
+- gpa_start_server ();
+-
+- if (! args.start_only_server)
++ if (args.start_only_server)
+ {
++ /* Fire up the server. Note that the server allows to start the
++ other parts too. */
++ gpa_start_server ();
++ }
++ else
++ {
+ /* Don't open the keyring editor if any files are given on the
+ command line. Dito for the clipboard. */
+ if (args.start_keyring_editor && (optind >= argc))
+
+
Property changes on: trunk/patches/gpa/01-no-uiserver.patch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-04-23 08:57:09 UTC (rev 783)
+++ trunk/src/Makefile.am 2008-04-23 15:16:54 UTC (rev 784)
@@ -14,15 +14,14 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi config.site \
installer-options.ini.in libiconv.def libintl.def loreley.mid \
gpg4win-splash.wav gpgwrap.c exdll.h g4wihelp.c g4wihelp.nsi \
inst-sections.nsi installer.nsi installer-finish.nsi \
- qt.conf kleowrap.c potomo \
+ qt.conf kleowrap.c potomo Memento.nsh \
inst-gpg4win.nsi uninst-gpg4win.nsi \
inst-atk.nsi uninst-atk.nsi \
inst-cairo.nsi uninst-cairo.nsi \
More information about the Gpg4win-commits
mailing list