Version 1.2.0

diff --git a/NEWS b/NEWS
index 106bb99..ea4a6b8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,24 @@
+--- 1.2.0 2009/09/10
+
+Configuration may now have multiple server areas. This means that a
+Pazpar2 instance may listen on multiple ports. Virtual hosting is not
+yet supported - on a server basis. Configuration may also have multiple
+services .. That is repeating service elements inside a server. Each
+has an attribute 'id' which serves as service ID. This ID in turn may
+be used in a Pazpar2 session, by specifying parameter service=ID for
+command init. There can be at most one unnamed service inside a server
+which can be referred to by not specifying an service ID for command
+init (backwards compatible). In order to partition multiple servers and
+services a new include directive has been added. This takes an attribute
+'src' which specifies one or more sub-files. For example to include
+service files, one might use:
+  <server >.. <include src=/"etc/pazpar2/conf.d/*.xml"/> .. </server>.
+It is the intention that that completely makes the settings directive
+redundant.
+
+Fix problem where the record command would wait forever if there were
+no targets to wait for (activeclients == 0).
+
 --- 1.1.1 2009/08/28
 
 One result set is created per session (last search) rather than for

diff --git a/configure.ac b/configure.ac
index 49f0715..97a2099 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 
 # Autoconf and automake setup
 AC_PREREQ(2.60)
-AC_INIT([pazpar2],[1.1.1],[pazpar2-help@indexdata.dk])
+AC_INIT([pazpar2],[1.2.0],[pazpar2-help@indexdata.dk])
 
 AC_CONFIG_HEADERS(src/config.h)
 
@@ -19,7 +19,7 @@ AC_PROG_RANLIB
 
 AC_LANG(C)
 
-YAZ_INIT([static icu threads],[3.0.39])
+YAZ_INIT([static icu threads],[3.0.46])
 if test -z "$YAZLIB"; then
        AC_MSG_ERROR([YAZ development libraries missing])
 fi

diff --git a/debian/changelog b/debian/changelog
index 626907b..380fd99 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pazpar2 (1.2.0-1indexdata) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Thu, 10 Sep 2009 09:48:25 +0200
+
 pazpar2 (1.1.1-1indexdata) unstable; urgency=low
 
   * Upstream.

diff --git a/win/makefile b/win/makefile
index 9a35e1c..551397e 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -4,7 +4,7 @@
 DEBUG=0   # 0 for release, 1 for debug
 USE_MANIFEST = 0 # Can be enabled Visual Studio 2005/2008
 PACKAGE_NAME=pazpar2
-PACKAGE_VERSION=1.1.1
+PACKAGE_VERSION=1.2.0
 
 # YAZ
 YAZ_DIR=..\..\yaz