Merge branch 'master' into develop

This commit is contained in:
Tim Rühsen 2014-07-03 17:48:14 +02:00
commit 06f5c7b89b
2 changed files with 10 additions and 2 deletions

8
NEWS
View File

@ -1,5 +1,13 @@
Copyright (C) 2014 Tim Rühsen Copyright (C) 2014 Tim Rühsen
02.07.2014 Release V0.5.0
* added configure --enable-runtime to allow for IDNA library
selection as runtime dependency
* added configure --enable-builtin to allow for IDNA library
selection for generating the built-in PSL data
* fixed psl_str_to_utf8lower prototype
* fixed authors name to UTF-8
23.06.2014 Release V0.4.0 23.06.2014 Release V0.4.0
* depend on libicu for punycode, utf-8 and lowercase conversions * depend on libicu for punycode, utf-8 and lowercase conversions
* added function psl_str_to_utf8lower() * added function psl_str_to_utf8lower()

View File

@ -1,5 +1,5 @@
AC_INIT([libpsl], [0.4.0], [tim.ruehsen@gmx.de], [libpsl], [http://github.com/rockdaboot/libpsl]) AC_INIT([libpsl], [0.5.0], [tim.ruehsen@gmx.de], [libpsl], [http://github.com/rockdaboot/libpsl])
AC_PREREQ([2.59]) AC_PREREQ([2.59])
AM_INIT_AUTOMAKE([1.10 -Wall no-define foreign]) AM_INIT_AUTOMAKE([1.10 -Wall no-define foreign])
@ -63,7 +63,7 @@ AS_IF([ test "$enable_man" != no ], [
# 4. If any interfaces have been added, removed, or changed since the last update, increment current, and set revision to 0. # 4. If any interfaces have been added, removed, or changed since the last update, increment current, and set revision to 0.
# 5. If any interfaces have been added since the last public release, then increment age. # 5. If any interfaces have been added since the last public release, then increment age.
# 6. If any existing interfaces have been removed or changed since the last public release, then set age to 0. # 6. If any existing interfaces have been removed or changed since the last public release, then set age to 0.
AC_SUBST([LIBPSL_SO_VERSION], [2:0:2]) AC_SUBST([LIBPSL_SO_VERSION], [2:1:2])
AC_SUBST([LIBPSL_VERSION], $VERSION) AC_SUBST([LIBPSL_VERSION], $VERSION)
# Check for enable/disable builtin PSL data # Check for enable/disable builtin PSL data