From e6f087568c5d1188b208514169e13e0bcfc310e5 Mon Sep 17 00:00:00 2001
From: Dennis Schafroth <dennis@indexdata.com>
Date: Wed, 7 Mar 2012 12:13:19 +0100
Subject: [PATCH] Prepare for 1.6.11 release

---
 IDMETA |    2 +-
 NEWS   |   24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/IDMETA b/IDMETA
index cd89226..0a62d5c 100644
--- a/IDMETA
+++ b/IDMETA
@@ -1,3 +1,3 @@
 DEBIAN_DIST="wheezy squeeze lenny"
 UBUNTU_DIST="oneiric natty maverick lucid"
-VERSION=1.6.10
+VERSION=1.6.11
diff --git a/NEWS b/NEWS
index 4a20ccb..87f4698 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,27 @@
+--- 1.6.11 2012/03/07
+
+Revert the behavior of returning errors when unable to block 
+on termlist, bytarget and search, when unable to block due to 
+other block. The client will now receive a regular response, 
+but it will be logged in the server. A parameter (report) is
+added to change behavior to return error response or WARNING 
+status message. Consider this "API" as private, as it is mostly 
+untested and could be changed in future releases. 
+
+Fix spell error in pz2.js fix in 1.6.10.
+
+New Marc2TurboMarc.xsl (contribution from Sven Porst). 
+Can solve the missing marc21.xsl updates in some cases. 
+
+tmarc.xsl: Simplify the 6xx to subject-long and fix 1-based 
+substring (contribtion from Sven Porst)
+
+marc21.xsl: fix 1-based substring call
+
+tmarc.xsl and marc21.xsl: use 856$a as last option for electronic-text. 
+
+Add test_termlist_block to test suite
+
 --- 1.6.10 2012/02/23
 
 Fix SEGV for invalid PQFs and SRU/SOLR targets
-- 
1.7.10.4