Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

diff --git a/NEWS b/NEWS
index e93ed19..03049cd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+--- 1.5.7 2011/08/19
+
+ICU default maps remove backquote (`).
+
+Command 'search' takes limit parameter (optional).  The limit parameter
+allows a search to be limited one or more facets and the corresponding
+values. This is for server side filtering.
+
+Configure tweak: Use -lm for log(3) if needed
+
 --- 1.5.6 2011/04/15
 
 Fix a problem with skiparticle sortkey that could be completely

diff --git a/configure.ac b/configure.ac
index 4ae0cdd..fc6ab7e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 
 # Autoconf and automake setup
 AC_PREREQ(2.60)
-AC_INIT([pazpar2],[1.5.6],[pazpar2-help@indexdata.dk])
+AC_INIT([pazpar2],[1.5.7],[pazpar2-help@indexdata.dk])
 
 AC_CONFIG_HEADERS(src/config.h)
 
@@ -80,12 +80,8 @@ echo \
   Linked libs:                ${LIBS}
   Host System Type:           ${host}
   Install path:               ${prefix}
-  Automake:                   ${AUTOMAKE}
-  Archiver:                   ${AR}
-  Ranlib:                     ${RANLIB}
   YAZ Version:                ${YAZVERSION}
   YAZ Include:                ${YAZINC}
-  YAZ La Lib:                 ${YAZLALIB}
   YAZ Lib:                    ${YAZLIB}
   Bugreport:                  ${PACKAGE_BUGREPORT}
 

diff --git a/debian/changelog b/debian/changelog
index 4cde1a3..9915130 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pazpar2 (1.5.7-1indexdata) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 19 Aug 2011 13:29:58 +0200
+
 pazpar2 (1.5.6-1indexdata) unstable; urgency=low
 
   * Upstream.

diff --git a/pazpar2.spec b/pazpar2.spec
index ea255bd..789c74b 100644 (file)
--- a/pazpar2.spec
+++ b/pazpar2.spec
@@ -1,6 +1,6 @@
 Summary: Metasearcher
 Name: pazpar2
-Version: 1.5.6
+Version: 1.5.7
 Release: 1indexdata
 License: GPL
 Group: Applications/Internet

diff --git a/win/makefile b/win/makefile
index 623ea4a..07bb0d2 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -4,7 +4,7 @@
 DEBUG=0   # 0 for release, 1 for debug
 USE_MANIFEST = 1 # Can be enabled Visual Studio 2005/2008
 PACKAGE_NAME=pazpar2
-PACKAGE_VERSION=1.5.6
+PACKAGE_VERSION=1.5.7
 
 # YAZ
 YAZ_DIR=..\..\yaz