[git] GpgOL - branch, master, updated. gpgol-1.1.3-69-gbcc002d
by Werner Koch
cvs at cvs.gnupg.org
Mon Aug 19 16:24:25 CEST 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG extension for MS Outlook".
The branch, master has been updated
via bcc002d266e0bbe6a817c74db377218a66dbe105 (commit)
via 36bb811f0dee16e61fe58576e6d1102a8c389da3 (commit)
via 0e767de48ad5178f190cbe3c54bbb13b6a289d7e (commit)
via 9038766c61cbbfeb1d049a9231904fe3cc9b19e9 (commit)
via a124377ef96ee8710ea0a320429d2cf292df7519 (commit)
from e512053443e6f1d7fd2fa87d625535c95c9a400f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit bcc002d266e0bbe6a817c74db377218a66dbe105
Author: Werner Koch <wk at gnupg.org>
Date: Mon Aug 19 15:51:55 2013 +0200
Post release updates.
--
diff --git a/NEWS b/NEWS
index 40d74ab..f5d6f9f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes for version 1.2.1 (unreleased)
+=================================================
+
+
Noteworthy changes for version 1.2.0 (2013-08-19)
=================================================
diff --git a/configure.ac b/configure.ac
index 4950c34..3297975 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ min_automake_version="1.9.4"
# (git tag -s gpgol-k.n.m) and run "./autogen.sh --force". Please
# bump the version number immediately *after* the release and do
# another commit and push so that the git magic is able to work.
-m4_define([mym4_version], [1.2.0])
+m4_define([mym4_version], [1.2.1])
# Below is m4 magic to extract and compute the git revision number,
# the decimalized short revision number, a beta version string and a
commit 36bb811f0dee16e61fe58576e6d1102a8c389da3
Author: Werner Koch <wk at gnupg.org>
Date: Mon Aug 19 15:38:53 2013 +0200
Release 1.2.0.
diff --git a/AUTHORS b/AUTHORS
index b902299..288efac 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,22 +1,24 @@
-Package: gpgol
-Contact: info-gpgol at g10code.com
-Bugs: bug-gpgol at g10code.com
-License: LGPLv2.1+
-
-
-g10 Code GmbH
- New code and packet maintainer.
-
-Timo Schulz <twoaday at freakmail.de>
- All code from the years 2003, 2004
-
-Daniel Nylander <po at danielnylander.se>
- Swedish translation.
-
-Marco A.G.Pinto <marcoagpinto at mail.telepac.pt>
- Portuguese translation.
-
-
-Some files may still contain code from the orginal plugin:
-Copyright (C) 2001 G Data Software AG, http://www.gdata.de
-
+Package: gpgol
+Contact: info-gpgol at g10code.com
+Bugs: http://bugs.gnupg.org
+License: LGPLv2.1+
+
+
+g10 Code GmbH
+ New code and packet maintainer.
+
+Timo Schulz <twoaday at freakmail.de>
+ All code from the years 2003, 2004
+
+Daniel Nylander <po at danielnylander.se>
+ Swedish translation.
+
+Marco A.G.Pinto <marcoagpinto at mail.telepac.pt>
+ Portuguese translation.
+
+Andre Heinecke <aheinecke at intevation.de>
+ Code to support Outlook 2010
+
+
+Some files may still contain code from the orginal plugin:
+Copyright (C) 2001 G Data Software AG, http://www.gdata.de
diff --git a/NEWS b/NEWS
index 56d0a8c..40d74ab 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
-Noteworthy changes for version 1.1.4 (unreleased)
+Noteworthy changes for version 1.2.0 (2013-08-19)
=================================================
+ * Basic support for Outlook 2010 and later.
+
Noteworthy changes for version 1.1.3 (2011-12-27)
=================================================
diff --git a/configure.ac b/configure.ac
index 624dcc0..4950c34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ min_automake_version="1.9.4"
# (git tag -s gpgol-k.n.m) and run "./autogen.sh --force". Please
# bump the version number immediately *after* the release and do
# another commit and push so that the git magic is able to work.
-m4_define([mym4_version], [1.1.4])
+m4_define([mym4_version], [1.2.0])
# Below is m4 magic to extract and compute the git revision number,
# the decimalized short revision number, a beta version string and a
commit 0e767de48ad5178f190cbe3c54bbb13b6a289d7e
Author: Werner Koch <wk at gnupg.org>
Date: Mon Aug 19 15:36:05 2013 +0200
po: Auto updates.
--
diff --git a/po/de.po b/po/de.po
index ad13f19..e7ab3a3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GpgOL 1.0.0\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2013-08-13 09:16+0000\n"
+"POT-Creation-Date: 2013-08-19 15:35+0200\n"
"PO-Revision-Date: 2009-06-18 19:18+0200\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: de\n"
diff --git a/po/pt.po b/po/pt.po
index 1d81748..6d057d4 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GpgOL 1.1.1\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2013-08-13 09:16+0000\n"
+"POT-Creation-Date: 2013-08-19 15:35+0200\n"
"PO-Revision-Date: 2010-07-18 20:41-0000\n"
"Last-Translator: Marco A.G.Pinto <marcoagpinto at mail.telepac.pt>\n"
"Language-Team: Portuguese <marcoagpinto at mail.telepac.pt>\n"
diff --git a/po/sv.po b/po/sv.po
index 9a7c5a2..d66cce2 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GPGol\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2013-08-13 09:16+0000\n"
+"POT-Creation-Date: 2013-08-19 15:35+0200\n"
"PO-Revision-Date: 2006-12-12 23:52+0100\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
commit 9038766c61cbbfeb1d049a9231904fe3cc9b19e9
Author: Werner Koch <wk at gnupg.org>
Date: Mon Aug 19 15:15:55 2013 +0200
Minor configure.ac fixes for newer autoconfs.
diff --git a/configure.ac b/configure.ac
index 45098f6..624dcc0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -212,7 +212,7 @@ if test "$GCC" = yes; then
AC_MSG_CHECKING([if gcc supports -Wno-missing-field-initializers])
_gcc_cflags_save=$CFLAGS
CFLAGS="-Wno-missing-field-initializers"
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]),_gcc_mfi=yes,_gcc_mfi=no)
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],_gcc_mfi=yes,_gcc_mfi=no)
AC_MSG_RESULT($_gcc_mfi)
CFLAGS=$_gcc_cflags_save;
if test x"$_gcc_mfi" = xyes ; then
@@ -224,7 +224,7 @@ if test "$GCC" = yes; then
AC_MSG_CHECKING([if gcc supports -Wno-pointer-sign])
_gcc_cflags_save=$CFLAGS
CFLAGS="-Wno-pointer-sign"
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]),_gcc_psign=yes,_gcc_psign=no)
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],_gcc_psign=yes,_gcc_psign=no)
AC_MSG_RESULT($_gcc_psign)
CFLAGS=$_gcc_cflags_save;
if test x"$_gcc_psign" = xyes ; then
commit a124377ef96ee8710ea0a320429d2cf292df7519
Author: Werner Koch <wk at gnupg.org>
Date: Mon Aug 19 15:10:50 2013 +0200
Update auto version numbering to the modern scheme.
* configure.ac: Add git m4 magic.
diff --git a/configure.ac b/configure.ac
index ebec300..45098f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,18 +13,27 @@
AC_PREREQ(2.59)
min_automake_version="1.9.4"
-# Remember to change the version number immediately *after* a release.
-# Set my_issvn to "yes" for non-released code. Remember to run an
-# "svn up" and "autogen.sh" right before creating a distribution.
-m4_define([my_version], [1.1.4])
-m4_define([my_isgit], [yes])
-
-m4_define([git_commit], m4_esyscmd([git branch -v 2>/dev/null \
- | awk '/^\* / {printf "%s",$3}']))
-m4_define([my_full_version],
- [my_version[]m4_if(my_isgit,[yes],[-git[]git_commit])])
-
-AC_INIT([gpgol],[my_full_version],[bug-gpgol at g10code.com])
+# To build a release you need to create a tag with the version number
+# (git tag -s gpgol-k.n.m) and run "./autogen.sh --force". Please
+# bump the version number immediately *after* the release and do
+# another commit and push so that the git magic is able to work.
+m4_define([mym4_version], [1.1.4])
+
+# Below is m4 magic to extract and compute the git revision number,
+# the decimalized short revision number, a beta version string and a
+# flag indicating a development version (mym4_isgit). Note that the
+# m4 processing is done by autoconf and not during the configure run.
+m4_define([mym4_revision],
+ m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
+m4_define([mym4_revision_dec],
+ m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
+m4_define([mym4_betastring],
+ m4_esyscmd_s([git describe --match 'gpgol-[0-9].[0-9].*[0-9]' \
+ --long | awk -F- '$3!=0{print"-beta"$3}']))
+m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
+m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
+
+AC_INIT([gpgol],[mym4_full_version], [http://bugs.gnupg.org])
# Bump up this value if you changed any form.
GPGOL_FORMS_REVISION=335
@@ -36,8 +45,8 @@ NEED_LIBASSUAN_API=2
NEED_LIBASSUAN_VERSION=2.0.0
-GIT_COMMIT=0x[]git_commit
-GIT_COMMIT_DECIMAL="$((0x$(echo git_commit | head -c 4)))"
+GIT_COMMIT=0x[]mym4_revision
+GIT_COMMIT_DECIMAL=0x[]mym4_revision_dec
PACKAGE=$PACKAGE_NAME
PACKAGE_GT=${PACKAGE_NAME}
VERSION=$PACKAGE_VERSION
-----------------------------------------------------------------------
Summary of changes:
AUTHORS | 46 ++++++++++++++++++++++++----------------------
NEWS | 8 +++++++-
configure.ac | 41 +++++++++++++++++++++++++----------------
po/de.po | 2 +-
po/pt.po | 2 +-
po/sv.po | 2 +-
6 files changed, 59 insertions(+), 42 deletions(-)
hooks/post-receive
--
GnuPG extension for MS Outlook
http://git.gnupg.org
More information about the Gnupg-commits
mailing list