[Gpg4win-commits] r783 - in trunk: . doc
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Apr 23 10:57:10 CEST 2008
Author: werner
Date: 2008-04-23 10:57:09 +0200 (Wed, 23 Apr 2008)
New Revision: 783
Modified:
trunk/ChangeLog
trunk/Makefile.am
trunk/autogen.sh
trunk/configure.ac
trunk/doc/README.de.txt
trunk/doc/README.en.txt
trunk/doc/pkg-copyright.txt
Log:
Updated copyright file.
Show the gpg4win version number with gpg2 --version.
Enable maintainer-mode when using ./autogen.sh --build-w32.
Minor doc fixes.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-04-22 13:44:53 UTC (rev 782)
+++ trunk/ChangeLog 2008-04-23 08:57:09 UTC (rev 783)
@@ -1,3 +1,11 @@
+2008-04-23 Werner Koch <wk at g10code.com>
+
+ * autogen.sh <build-w32>: Pass --enable-maintainer-mode.
+
+ * patches/gnupg2/01-version.patch.in: New.
+ * configure.ac (AC_CONFIG_FILES): Patch the version of GnuPG.
+ (AC_CONFIG_COMMANDS): New.
+
2008-04-22 Marcus Brinkmann <marcus at ulysses.g10code.com>
* packages/packages.current: Update gpgme.
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2008-04-22 13:44:53 UTC (rev 782)
+++ trunk/Makefile.am 2008-04-23 08:57:09 UTC (rev 783)
@@ -61,6 +61,7 @@
patches/gnupg-1.4.8/01-gpgconf-list.patch \
patches/winpt/01-gpg-path.patch \
patches/gpgol/01-always-decrypt.patch \
+ patches/gnupg2/01-version.patch.in \
patches/gnupg2-2.0.9/01-close-all-handle.patch \
patches/gnupg2-2.0.9/02-de.po-fix.patch \
patches/gnupg2-2.0.9/03-i18n+etc.patch \
Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh 2008-04-22 13:44:53 UTC (rev 782)
+++ trunk/autogen.sh 2008-04-23 08:57:09 UTC (rev 783)
@@ -81,7 +81,7 @@
fi
fi
- ./configure --host=${host} --build=${build} \
+ ./configure --host=${host} --build=${build} --enable-maintainer-mode \
--disable-pkg-man_advanced_en "$@"
rc=$?
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-04-22 13:44:53 UTC (rev 782)
+++ trunk/configure.ac 2008-04-23 08:57:09 UTC (rev 783)
@@ -265,6 +265,10 @@
# Finalize.
+AC_CONFIG_COMMANDS([gpg4win-conf],[[
+chmod +x patches/gnupg2/01-version.patch
+]])
+
AC_CONFIG_FILES(Makefile)
AC_CONFIG_FILES(packages/Makefile include/Makefile src/Makefile po/Makefile.in)
AC_CONFIG_FILES(include/config.nsi src/gpg4win.mk)
@@ -272,4 +276,5 @@
AC_CONFIG_FILES(doc/logo/Makefile)
AC_CONFIG_FILES(doc/manual/Makefile doc/manual/version.tex)
AC_CONFIG_FILES(doc/website/Makefile)
+AC_CONFIG_FILES(patches/gnupg2/01-version.patch)
AC_OUTPUT
Modified: trunk/doc/README.de.txt
===================================================================
--- trunk/doc/README.de.txt 2008-04-22 13:44:53 UTC (rev 782)
+++ trunk/doc/README.de.txt 2008-04-23 08:57:09 UTC (rev 783)
@@ -1,11 +1,11 @@
;; README.de.txt -*- coding: latin-1; -*-
-;; This is the README installed with gpg4win (German version). Lines
+;; 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
+ Deutsche README Datei for Gpg4win
=================================
Dies ist GnuPG for Windows, Version !VERSION!.
@@ -24,15 +24,15 @@
1. Wichtige Hinweise
====================
-Informationen zur Benutzung sind den Handbüchern "Gpg4Win für
-Einsteiger" und "Gpg4Win für Durchblicker" zu entnehmen. Diese können
+Informationen zur Benutzung sind den Handbüchern "Gpg4win für
+Einsteiger" und "Gpg4win für Durchblicker" zu entnehmen. Diese können
Sie auch, in einer möglicherweise bereits überarbeiteten Fassung,
online unter http://www.gpg4win.de lesen.
-3. Liste der Änderungen an Gpg4Win
+3. Liste der Änderungen an Gpg4win
==================================
Eine aktuelle deutschsprachige Übersicht der Änderungen finden online
@@ -154,7 +154,7 @@
Frohes GiPiGien,
- Ihr Gpg4Win Team
+ Ihr Gpg4win Team
*** Ende der Datei ***
Modified: trunk/doc/README.en.txt
===================================================================
--- trunk/doc/README.en.txt 2008-04-22 13:44:53 UTC (rev 782)
+++ trunk/doc/README.en.txt 2008-04-23 08:57:09 UTC (rev 783)
@@ -1,10 +1,10 @@
;; README.en.txt -*- coding: latin-1; -*-
-;; This is the README installed with gpg4win. with a ; in the first
+;; This is the README installed with Gpg4win. 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.
- English README file for Gpg4Win
+ English README file for Gpg4win
===============================
This is GnuPG for Windows, vesion !VERSION!.
@@ -23,7 +23,7 @@
1. Important Notes
==================
-Manuals describing the installation of Gpg4Win are currently only
+Manuals describing the installation of Gpg4win are currently only
available in German. Check out http://www/gpg4win.org for latest
news.
@@ -133,6 +133,6 @@
Happy GiPiGing,
- Your Gpg4Win Team
+ Your Gpg4win Team
***end of file ***
Modified: trunk/doc/pkg-copyright.txt
===================================================================
--- trunk/doc/pkg-copyright.txt 2008-04-22 13:44:53 UTC (rev 782)
+++ trunk/doc/pkg-copyright.txt 2008-04-23 08:57:09 UTC (rev 783)
@@ -1,16 +1,17 @@
Here is a list with collected copyright notices. For details see the
-description of each individual package. [Compiled by wk 2006-02-15]
+description of each individual package. [Compiled by wk 2006-02-15,
+last updated 2008-04-23]
-Gpw4Win is
+Gpg4win is
- Copyright (C) 2005, 2006 g10 Code GmbH
+ Copyright (C) 2005, 2006, 2007, 2008 g10 Code GmbH
- GPG4Win is free software; you can redistribute it and/or modify it
+ Gpg4win is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- GPG4Win is distributed in the hope that it will be useful, but
+ Gpg4win is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
@@ -24,11 +25,11 @@
GnuPG is
Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- 2005, 2006 Free Software Foundation, Inc.
+ 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
GnuPG is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
GnuPG is distributed in the hope that it will be useful, but WITHOUT
@@ -37,9 +38,7 @@
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., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA
+ along with this program; if not, see <http://www.gnu.org/licenses/>.
See the files AUTHORS and THANKS for credits, further legal
information and bug reporting addresses pertaining to GnuPG.
@@ -108,7 +107,7 @@
Copyright (C) 2000-2002 G-N-U GmbH (http://www.g-n-u.de)
Copyright (C) 2002-2003 Miguel Coca.
- Copyright (C) 2005 g10 Code GmbH.
+ Copyright (C) 2005, 2008 g10 Code GmbH.
GPA uses fragments from the following programs and libraries:
JNLIB, Copyright (C) 1998-2000 Free Software Foundation, Inc.
@@ -118,7 +117,7 @@
GPA is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
GPA is distributed in the hope that it will be useful, but
@@ -127,13 +126,13 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with GPA; 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/>.
+
GPGME is
Copyright (C) 2000 Werner Koch (dd9jn)
- Copyright (C) 2001, 2002, 2003, 2004, 2005 g10 Code GmbH
+ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007 g10 Code GmbH
GPGME is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as
@@ -146,32 +145,34 @@
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser 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. */
+ License along with this program; if not, see <http://www.gnu.org/licenses/>.
+ See the files AUTHORS and THANKS for credits, further legal
+ information and bug reporting addresses pertaining to GPGME.
-GPGol is
+GpgOL is
+
Copyright (C) 2001 G Data Software AG, http://www.gdata.de
- Copyright (C) 2004, 2005 g10 Code GmbH
+ Copyright (C) 2004, 2005, 2007, 2008 g10 Code GmbH
- GPGol is free software; you can redistribute it and/or
+ GpgOL is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
- GPGol is distributed in the hope that it will be useful,
+ GpgOL is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA.
+ License along with this program; if not, see <http://www.gnu.org/licenses/>.
+ See the files AUTHORS and THANKS for credits, further legal
+ information and bug reporting addresses pertaining to GpgOL.
+
LIBGPG-ERROR is
Copyright (C) 2003, 2004 g10 Code GmbH
@@ -187,9 +188,7 @@
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
- License along with libgpg-error; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA. */
+ License along with this program; if not, see <http://www.gnu.org/licenses/>.
Pthreads-win32 is
More information about the Gpg4win-commits
mailing list