From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 8 Oct 2012 16:13:30 +0000 (+0200)
Subject: Version 1.3.48
X-Git-Tag: v1.3.48
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=5533ba9a6d3ccb4d202de8c330a00ce7edccfeed;p=metaproxy-moved-to-github.git

Version 1.3.48
---

diff --git a/IDMETA b/IDMETA
index f8bee2e..2d0b096 100644
--- a/IDMETA
+++ b/IDMETA
@@ -1,4 +1,4 @@
 DEBIAN_DIST="wheezy squeeze"
 UBUNTU_DIST="precise oneiric natty lucid"
 CENTOS_DIST="centos5"
-VERSION=1.3.47
+VERSION=1.3.48
diff --git a/NEWS b/NEWS
index f5a2103..fc0d691 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+--- 1.3.48 2012/10/08
+
+z3950_client: fix string handling for init diagnostics in the case where
+addinfo was absent.
+
+query_rewrite: no charset conversion for error queries. Avoid performing
+charset conversion for query conversion errors. The resulting Type-1
+query is invalid in this case.
+
 --- 1.3.47 2012/10/04
 
 For graceful stop (SIGUSR1), metaproxy will kill children processes.
diff --git a/debian/changelog b/debian/changelog
index c21bfba..6d6e368 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+metaproxy (1.3.48-1indexdata) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@debian-testing>  Mon, 08 Oct 2012 18:11:44 +0200
+
 metaproxy (1.3.47-1indexdata) unstable; urgency=low
 
   * Upstream.
diff --git a/win/makefile b/win/makefile
index 38050c4..24af6d7 100644
--- a/win/makefile
+++ b/win/makefile
@@ -7,7 +7,7 @@
 DEBUG=0   # 0 for release, 1 for debug
 
 # Metaproxy version
-VERSION=1.3.47
+VERSION=1.3.48
 
 # YAZ and YAZ++ directories
 YAZ_DIR=..\..\yaz