[git] Assuan - branch, master, updated. libassuan-2.0.2-9-g3ebe00d

by Werner Koch cvs at cvs.gnupg.org
Tue Dec 20 12:43:53 CET 2011


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 "IPC library used by GnuPG".

The branch, master has been updated
       via  3ebe00d6854f110301a2742041d6d5c3e95d8e6b (commit)
       via  132c70fe697346a1c9f75d51572835f6d4951b3b (commit)
      from  edbe8fdcea1a2c05999861f58d5f67d2e76610e0 (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 3ebe00d6854f110301a2742041d6d5c3e95d8e6b
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Dec 20 11:27:27 2011 +0100

    Release version 2.0.3.
    
    * configure.ac: Bump LT version to C3/A3/R0.

diff --git a/NEWS b/NEWS
index 9775be2..a4979c9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Noteworthy changes in version 2.0.3 (unreleased)
+Noteworthy changes in version 2.0.3 (2011-12-20)
 ------------------------------------------------
 
  * Make assuan_get_pid work correctly for pipe server.
diff --git a/configure.ac b/configure.ac
index b0e9e34..05c7deb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,6 @@
 # configure.ac - for libassuan
-# Copyright (C) 2001-2003, 2006, 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2006, 2007, 2009,
+#               2011 Free Software Foundation, Inc.
 #
 # This file is part of Assuan.
 #
@@ -25,7 +26,7 @@ min_automake_version="1.10"
 # 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], [2.0.3])
-m4_define([my_issvn], [yes])
+m4_define([my_issvn], [no])
 
 m4_define([svn_revision], m4_esyscmd([printf "%d" $( (svn info 2>/dev/null \
             || echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q;}')]))
@@ -42,8 +43,8 @@ AC_INIT([libassuan],[my_full_version],[http://bugs.gnupg.org])
 #   (Interfaces added:			AGE++)
 #   (Interfaces removed/changed:	AGE=0)
 #
-LIBASSUAN_LT_CURRENT=2
-LIBASSUAN_LT_AGE=2
+LIBASSUAN_LT_CURRENT=3
+LIBASSUAN_LT_AGE=3
 LIBASSUAN_LT_REVISION=0
 
 # If the API is changed in an incompatible way: increment the next counter.
diff --git a/doc/assuan.texi b/doc/assuan.texi
index 9907803..637ad84 100644
--- a/doc/assuan.texi
+++ b/doc/assuan.texi
@@ -3,7 +3,7 @@
 @setfilename assuan.info
 
 @macro copyrightnotice
-Copyright @copyright{} 2002, 2003, 2006, 2007 Free Software Foundation, Inc.
+Copyright @copyright{} 2002, 2003, 2006, 2007, 2011 Free Software Foundation, Inc.
 @end macro
 @macro permissionnotice
 Permission is granted to copy, distribute and/or modify this document
diff --git a/src/assuan.h.in b/src/assuan.h.in
index 7aae362..5c30a99 100644
--- a/src/assuan.h.in
+++ b/src/assuan.h.in
@@ -1,6 +1,6 @@
 /* assuan.h - Definitions for the Assuan IPC library             -*- c -*-
-   Copyright (C) 2001, 2002, 2003, 2005, 2007, 2008, 2009,
-                 2010  Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2005, 2007, 2008, 2009, 2010,
+                 2011  Free Software Foundation, Inc.
 
    This file is part of Assuan.
 

commit 132c70fe697346a1c9f75d51572835f6d4951b3b
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Dec 20 11:24:35 2011 +0100

    Update gitlog-to-changelog to support --tear-off.

diff --git a/Makefile.am b/Makefile.am
index e7eeee5..3103c7d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # Assuan top level Makefile
-# Copyright (C) 2001, 2002, 2003, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2007, 2011 Free Software Foundation, Inc.
 #
 # This file is part of Assuan.
 #
@@ -40,7 +40,7 @@ gen-ChangeLog:
 	if test -d $(top_srcdir)/.git; then				\
 	  (cd $(top_srcdir) &&                      			\
 	    ./build-aux/gitlog-to-changelog				\
-	    --amend=build-aux/git-log-fix				\
+	    --amend=build-aux/git-log-fix  --tear-off			\
 	    --since=$(gen_start_date) ) > $(distdir)/cl-t;		\
           cat $(top_srcdir)/build-aux/git-log-footer >> $(distdir)/cl-t;\
 	  rm -f $(distdir)/ChangeLog;					\
diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
index 40a8035..d9f594f 100755
--- a/build-aux/gitlog-to-changelog
+++ b/build-aux/gitlog-to-changelog
@@ -64,6 +64,7 @@ OPTIONS:
                   makes a change to SHA1's commit log text or metadata.
    --append-dot append a dot to the first line of each commit message if
                   there is no other punctuation or blank at the end.
+   --tear-off   tear off all commit log lines after a '--' line.
    --since=DATE convert only the logs since DATE;
                   the default is to convert all log entries.
    --format=FMT set format string for commit subject and body;
@@ -175,6 +176,7 @@ sub parse_amend_file($)
   my $format_string = '%s%n%b%n';
   my $amend_file;
   my $append_dot = 0;
+  my $tear_off = 0;
   GetOptions
     (
      help => sub { usage 0 },
@@ -183,6 +185,7 @@ sub parse_amend_file($)
      'format=s' => \$format_string,
      'amend=s' => \$amend_file,
      'append-dot' => \$append_dot,
+     'tear-off' => \$tear_off,
     ) or usage 1;
 
 
@@ -281,6 +284,18 @@ sub parse_amend_file($)
       @line = grep !/^Signed-off-by: .*>$/, @line;
       @line = grep !/^Co-authored-by: /, @line;
 
+      # Remove everything after a line with 2 dashes at the beginning.
+      if ($tear_off)
+        {
+           my @tmpline;
+           foreach (@line)
+             {
+	       last if /^--\s*$/;
+               push @tmpline,$_;
+             }
+           @line = @tmpline;
+        }
+
       # Remove leading and trailing blank lines.
       if (@line)
         {

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am                   |    4 ++--
 NEWS                          |    2 +-
 build-aux/gitlog-to-changelog |   15 +++++++++++++++
 configure.ac                  |    9 +++++----
 doc/assuan.texi               |    2 +-
 src/assuan.h.in               |    4 ++--
 6 files changed, 26 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
IPC library used by GnuPG
http://git.gnupg.org




More information about the Gnupg-commits mailing list