[SCM] GNU libidn branch, master, updated. libidn-1-21-3-g6ed3a9f

[Simon Josefsson]

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 "GNU libidn".

http://git.savannah.gnu.org/cgit/libidn.git/commit/?id=6ed3a9fc8addaa2b7e2197b2dc6bcaec13b9cb45

The branch, master has been updated
       via  6ed3a9fc8addaa2b7e2197b2dc6bcaec13b9cb45 (commit)
       via  87f5ef5a149b4054e9926f6ca77c447fcd030aed (commit)
       via  9d8b5a57467ee2eabc49447bbb46db60b293b746 (commit)
      from  0f4e3805f73c9c021470466301a82f88a8e88732 (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 6ed3a9fc8addaa2b7e2197b2dc6bcaec13b9cb45
Author: Simon Josefsson <address@hidden>
Date:   Sun Apr 24 18:11:56 2011 +0200

    Fix.

commit 87f5ef5a149b4054e9926f6ca77c447fcd030aed
Author: Simon Josefsson <address@hidden>
Date:   Sun Apr 24 17:48:31 2011 +0200

    build: Really distribute win32/libidn4win.mk.

commit 9d8b5a57467ee2eabc49447bbb46db60b293b746
Author: Simon Josefsson <address@hidden>
Date:   Sun Apr 24 17:48:04 2011 +0200

    Bump version.

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

Summary of changes:
 Makefile.am         |    2 +-
 NEWS                |    6 ++++++
 configure.ac        |    4 ++--
 win32/libidn4win.mk |    4 ++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b99472f..2c60d76 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,7 @@ EXTRA_DIST += FAQ libc/README libc/getaddrinfo-idn.txt 
libc/example.c \
 EXTRA_DIST += win32/libidn.sln win32/libidn.vcproj                     \
        win32/include/unistd.h win32/include/idn-int.h                  \
        win32/include/stdbool.h win32/include/ac-stdint.h               \
-       win32/include/config.h
+       win32/include/config.h win32/libidn4win.mk
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libidn.pc
diff --git a/NEWS b/NEWS
index 8e47511..0aeba37 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,12 @@ Libidn NEWS -- History of user-visible changes.                
 -*- outline -*-
 Copyright (C) 2002-2011 Simon Josefsson
 See the end for copying conditions.
 
+* Version 1.22 (unreleased) [?]
+
+** build: Really distribute win32/libidn4win.mk.
+
+** API and ABI is backwards compatible with the previous version.
+
 * Version 1.21 (released 2011-04-24) [stable]
 
 ** build/gettext: Demand gettext >= 0.18.1 in order to get newer M4 files.
diff --git a/configure.ac b/configure.ac
index a1b6cd6..8dbdb66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ dnl You should have received a copy of the GNU General Public 
License
 dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.61)
-AC_INIT([GNU Libidn], [1.21], address@hidden)
+AC_INIT([GNU Libidn], [1.22], address@hidden)
 AC_COPYRIGHT([Copyright (c) 2002-2011 Simon Josefsson <address@hidden>.])
 
 # Library code modified:                              REVISION++
@@ -27,7 +27,7 @@ AC_COPYRIGHT([Copyright (c) 2002-2011 Simon Josefsson 
<address@hidden>.])
 # Interfaces added:                             AGE++
 # Interfaces removed:                           AGE=0
 AC_SUBST(LT_CURRENT, 17)
-AC_SUBST(LT_REVISION, 4)
+AC_SUBST(LT_REVISION, 5)
 AC_SUBST(LT_AGE, 6)
 
 # For DEF file.
diff --git a/win32/libidn4win.mk b/win32/libidn4win.mk
index 1aa1149..080258f 100644
--- a/win32/libidn4win.mk
+++ b/win32/libidn4win.mk
@@ -50,6 +50,6 @@ doit:
        cd root && \
        zip -r ../../$(distdir)-win$(ARCH).zip *
 
-upload: libidn4win
-       build-aux/gnupload --to ftp.gnu.org:$(PACKAGE) $(distdir)-win32.zip 
$(distdir)-win64.zip
+upload:
+       ../build-aux/gnupload --to ftp.gnu.org:$(PACKAGE) $(distdir)-win32.zip 
$(distdir)-win64.zip
        cp $(distdir)-win32.zip $(distdir)-win32.zip.sig $(distdir)-win64.zip 
$(distdir)-win64.zip.sig ../../releases/$(PACKAGE)/


hooks/post-receive
-- 
GNU libidn