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

diff --git a/NEWS b/NEWS
index 86e4e39..ff42413 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,20 @@
+--- 4.1.3 2011/01/27
+
+Update yaz.spec to operate on both SLES11 / Centos 5.5.
+
+RPM: Release includes 'indexdata' name. Use indexdata in release name so
+this package can be distinguished from other vendors.
+
+yaz-config: Use exec_prefix, libdir, includedir .  Use these variables
+as determined by configure
+
+yaz-config: set YAZ_VERSION env. php_yaz relies on it.
+
+GFS: Z_PresentStatus_partial_4 for missing record. If bend_fetch handler
+returns no error and no record, the present request is considered
+partial (only a subset of the records could be returned by backend), and
+so it is appropriate to set Present Status to partial-4.
+
 --- 4.1.2 2010/11/02
 
 Move yaz-config man pages to section 1.

diff --git a/configure.ac b/configure.ac
index 02c118f..d6cd276 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.2],[yaz-help@indexdata.dk])
+AC_INIT([yaz],[4.1.3],[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 7bc857c..b3d30a9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+yaz (4.1.3-1indexdata) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Thu, 27 Jan 2011 13:56:54 +0100
+
 yaz (4.1.2-1indexdata) unstable; urgency=low
 
   * Upstream.

diff --git a/yaz.spec b/yaz.spec
index db6c5ef..e0c1052 100644 (file)
--- a/yaz.spec
+++ b/yaz.spec
@@ -3,15 +3,16 @@
 #
 # spec file for YAZ
 
+Name: yaz
+Summary: Z39.50 Programs
+Version: 4.1.3
+Release: 1indexdata
+
 # determine system
 %define is_mandrake %(test -e /etc/mandrake-release && echo 1 || echo 0)
-%define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0)
-%define is_suse11 %(grep 'VERSION = 11' /etc/SuSE-release >/dev/null && echo 1 || echo 0)
+%define is_suse %(test -e /etc/SuSE-release >/dev/null && echo 1 || echo 0)
+%define is_suse11 %(grep 'VERSION = 11' /etc/SuSE-release >/dev/null 2>&1 && echo 1 || echo 0)
 %define is_fedora %(test -e /etc/fedora-release && echo 1 || echo 0)
-Summary: Z39.50 Programs
-Name: yaz
-Version: 4.1.2
-Release: 1
 Requires: libxslt, gnutls, readline, libyaz4 = %{version}
 License: BSD
 Group: Applications/Internet