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

Conflicts:
	IDMETA

diff --git a/IDMETA b/IDMETA
index 5e9426f..d193fd8 100644 (file)
--- a/IDMETA
+++ b/IDMETA
@@ -1,4 +1,4 @@
 DEBIAN_DIST="jessie wheezy squeeze"
-UBUNTU_DIST="trusty saucy precise"
+UBUNTU_DIST="utopic trusty saucy precise"
 CENTOS_DIST="centos5 centos6"
-VERSION=1.6.0
+VERSION=1.6.1

diff --git a/NEWS b/NEWS
index edc41c8..a2c8080 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+--- 1.6.1 2014/10/27
+
+Build for Ubuntu utopic 14.10.
+
+Documentation: move from sgml to nxml indentation YPP-15
+
 --- 1.6.0 2014/04/19
 
 New method rpn2cql_transform for Yaz_cql2rpn