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

diff --git a/IDMETA b/IDMETA
index d60d11e..168de17 100644 (file)
--- a/IDMETA
+++ b/IDMETA
@@ -1,4 +1,4 @@
-DEBIAN_DIST="jessie wheezy squeeze"
+DEBIAN_DIST="jessie wheezy"
 UBUNTU_DIST="vivid utopic trusty precise"
-CENTOS_DIST="centos5 centos6"
-VERSION=2.0.60
+CENTOS_DIST="centos5 centos6 centos7"
+VERSION=2.0.61

diff --git a/NEWS b/NEWS
index f156ec8..6c39489 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,18 @@
+--- 2.0.61 2015/09/15
+
+Upgrade to debhelper version 7
+Not upgrading to version 9 now. It would move libraries and modules
+to /usr/lib/{arch}.
+
+Many documentation fixes. Thanks to David Crossley.
+
+Build: Remove Debian squeeze. Add CentOS 7. Remove Ubuntu Saucy.
+Add Ubuntu Vivid.
+
+Fix modulePath for examples ZEB-665
+
+Fix typo in path to oai-pmh example
+
 --- 2.0.60 2015/02/06
 
 Fix ICU phrase searches for terms split by ICU ZEB-664

diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7

diff --git a/debian/control b/debian/control
index 730adea..a8c167e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: idzebra
 Priority: optional
 Maintainer: Adam Dickmeiss <adam@indexdata.dk>
 Standards-Version: 3.6.0
-Build-Depends: debhelper (>= 4.0.0),
+Build-Depends: debhelper (>= 7.0.0),
  libyaz5-dev (>= 5.0.0),
  libexpat1-dev,
  tcl8.5-dev,

diff --git a/debian/copyright b/debian/copyright
index 656e6c7..6d26d7d 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
 This package was debianized by Adam Dickmeiss <adam@indexdata.dk>.
 
-It was downloaded from http://ftp.indexdata.dk/pub/zebra/
+It was downloaded from http://ftp.indexdata.com/pub/zebra
 
-idzebra is Copyright (C) 1995-2008 Index Data ApS
+idzebra is Copyright (C) 1995-2015 Index Data ApS
 
 idzebra is primarily written by Adam Dickmeiss, Heikki Levanto
 and Sebastian Hammer.

diff --git a/debian/rules b/debian/rules
index 390a83f..855c989 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,104 +1,28 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+export DH_VERBOSE=1
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+       dh $@ --without python-support
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
-CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
-CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
-LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
-
-config.status: configure
-       dh_testdir
-       # Add here commands to configure the package.
-       CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
-               LDFLAGS="$(LDFLAGS)" \
-               ./configure --host=$(DEB_HOST_GNU_TYPE) \
-               --build=$(DEB_BUILD_GNU_TYPE) \
-               --mandir=\$${prefix}/share/man \
-               --infodir=\$${prefix}/share/info \
-               --enable-shared --enable-static \
+override_dh_auto_configure:
+       dh_auto_configure -- \
                --with-yaz=/usr/bin \
-               --with-tclconfig=/usr/lib/tcl8.4 \
-               --prefix=/usr
-
-build: build-stamp
-build-stamp:  config.status
-       dh_testdir
-
-       # Add here commands to compile the package.
-       $(MAKE) 
-
-       touch build-stamp
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp 
-
-       # Add here commands to clean up after the build process.
-       -$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-       if test ! -f config.sub; then cp -f /usr/share/misc/config.sub config.sub ; fi
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-       if test ! -f config.guess ; then cp -f /usr/share/misc/config.guess config.guess ; fi
-endif
+               --with-tclconfig=/usr/lib/tcl8.5
 
-       dh_clean 
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k 
-       dh_installdirs
-
-       # Add here commands to install the package into debian/tmp
-       $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+override_dh_auto_test:
+       true
 
+override_dh_strip:
+       dh_strip --dbg-package=idzebra-2.0-dbg
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
+override_dh_makeshlibs:
+       dh_makeshlibs -V 'libidzebra-2.0 (>= 2.0.20)' -X mod-
 
-# Build architecture-dependent files here.
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs 
-       dh_installdocs
-       dh_installexamples
-       dh_install --sourcedir=debian/tmp
-#      dh_installmenu
-#      dh_installdebconf       
+override_dh_installlogrotate:
        dh_installlogrotate --name=zebrasrv
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
+
+override_dh_installinit:
        dh_installinit --name=zebrasrv
-#      dh_installcron
-#      dh_installinfo
-       dh_installman
-       dh_link
-       dh_strip --dbg-package=idzebra-2.0-dbg
-       dh_compress
-       dh_fixperms
-#      dh_perl
-#      dh_python
-       dh_makeshlibs -V 'libidzebra-2.0 (>= 2.0.20)' -X mod-
-       dh_installdeb
-       dh_shlibdeps -L libidzebra-2.0 -l debian/libidzebra-2.0/usr/lib
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+override_dh_installchangelogs:
+       dh_installchangelogs NEWS

diff --git a/doc/tutorial.xml b/doc/tutorial.xml
index 730b884..0cd0bd7 100644 (file)
--- a/doc/tutorial.xml
+++ b/doc/tutorial.xml
@@ -213,7 +213,7 @@
      any:w
      title:w
      author:w
-     subject:w
+     subject-heading:w
      description:w
      contributor:w
      publisher:w

diff --git a/examples/oai-pmh/README b/examples/oai-pmh/README
index e0d3913..5184d45 100644 (file)
--- a/examples/oai-pmh/README
+++ b/examples/oai-pmh/README
@@ -15,6 +15,7 @@ Checking manually the indexing stylesheet:
    xsltproc conf/oai2index.xsl data/debug-record.xml
 
 Indexing:
+   mkdir tmp
    zebraidx -c conf/zebra.cfg init
    zebraidx -c conf/zebra.cfg update data
    zebraidx -c conf/zebra.cfg commit
@@ -27,7 +28,7 @@ Starting the SRU/SRW/Z39.50 server in PQF mode only:
 
 Or, alternatively, starting the SRU/SRW/Z39.50 server including 
 PQF and CQL query configuration:
-   zebrasrv -f yazserver.xml
+   zebrasrv -f conf/yazserver.xml
 
 Z39.50 search:
    yaz-client localhost:9999

diff --git a/idzebra.spec b/idzebra.spec
index e8e5888..32d1969 100644 (file)
--- a/idzebra.spec
+++ b/idzebra.spec
@@ -2,7 +2,7 @@
 Name: idzebra
 %define namev idzebra-2.0
 Version: %{idmetaversion}
-Release: 2indexdata
+Release: 1.indexdata
 License: GPL
 Vendor: Index Data ApS <info@indexdata.dk>
 Source: idzebra-%{version}.tar.gz