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

Conflicts:
	win/yaz.nsi

diff --git a/NEWS b/NEWS
index 2775141..db88861 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+--- 4.1.7 2011/03/15
+
+Add -lCrun when linking with ICU on Solaris.
+
+More quicks character set conversions for OPAC records.
+
 --- 4.1.6 2011/03/10
 
 fix problem with record_render: records were converted (character set

diff --git a/configure.ac b/configure.ac
index bc71bc2..441b971 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl This file is part of the YAZ toolkit.
 dnl Copyright (C) 1995-2011 Index Data
 AC_PREREQ([2.60])
-AC_INIT([yaz],[4.1.6],[yaz-help@indexdata.dk])
+AC_INIT([yaz],[4.1.7],[yaz-help@indexdata.dk])
 AC_CONFIG_HEADERS(include/config.h)
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_AUX_DIR([config])

diff --git a/debian/changelog b/debian/changelog
index 1be65a5..dc2cf57 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+yaz (4.1.7-1indexdata) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 15 Mar 2011 13:59:18 +0100
+
 yaz (4.1.6-1indexdata) unstable; urgency=low
 
   * Upstream.

diff --git a/win/yaz.nsi b/win/yaz.nsi
index e6723b5..be73f62 100644 (file)
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -143,7 +143,7 @@ SectionEnd
 Section "YAZ Source" YAZ_Source
        SectionIn 1
        SetOutPath $INSTDIR
-       File ../configure.ac
+       File ..\configure.ac
        File /r ..\*.c
        File /r /x yaz ..\*.h
        SetOutPath $INSTDIR\util

diff --git a/yaz.spec b/yaz.spec
index fb7f68e..ac8fcc7 100644 (file)
--- a/yaz.spec
+++ b/yaz.spec
@@ -5,7 +5,7 @@
 
 Name: yaz
 Summary: Z39.50 Programs
-Version: 4.1.6
+Version: 4.1.7
 Release: 1indexdata
 
 # determine system