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

diff --git a/configure.ac b/configure.ac
index 2e5b338..4cac17d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 # Autoconf and automake setup
 AC_PREREQ([2.60])
-AC_INIT([metaproxy],[1.0.13.1],[metaproxy-help@indexdata.dk])
+AC_INIT([metaproxy],[1.0.14],[metaproxy-help@indexdata.dk])
 
 AC_CONFIG_HEADERS([src/config.hpp])
 
@@ -36,7 +36,7 @@ AC_CHECK_LIB([m],[main])
 AC_CHECK_FUNCS([localtime_r])
 
 ## YAZPP checks
-YAZPP_INIT([threads],[1.1.0])
+YAZPP_INIT([threads],[1.1.1])
 if test -z "$YAZPPLIB"; then
     AC_MSG_ERROR([YAZ++ development libraries missing])
 fi

diff --git a/debian/changelog b/debian/changelog
index f2c2758..ed41436 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+metaproxy (1.0.14-1) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Sun, 08 Jun 2008 22:00:05 +0200
+
 metaproxy (1.0.13-1) unstable; urgency=low
 
   * Initial Debian Packages

diff --git a/debian/control b/debian/control
index 73cb0a2..970defa 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Standards-Version: 3.6.2
 Maintainer: Adam Dickmeiss <adam@indexdata.dk>
 Priority: extra
-Build-Depends: debhelper (>= 4), libyaz3-dev, libyazpp3-dev (>= 1.1.0), libxslt1-dev, libboost-dev, libboost-thread-dev, libboost-test-dev
+Build-Depends: debhelper (>= 4), libyaz3-dev, libyazpp3-dev (>= 1.1.1), libxslt1-dev, libboost-dev, libboost-thread-dev, libboost-test-dev
 
 Package: metaproxy
 Section: net

diff --git a/win/makefile b/win/makefile
index bb65ab5..d3336bf 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -8,7 +8,7 @@
 DEBUG=0   # 0 for release, 1 for debug
 
 # Metaproxy version
-VERSION=1.0.13.1
+VERSION=1.0.14
 
 # YAZ and YAZ++ directories
 YAZ_DIR=..\..\yaz