From f244ffa34c34fa73f55e0981a59ec298b36935bf Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Mon, 14 Aug 2006 12:18:46 +0000 Subject: [PATCH] Using suffix 2.0 for development tools idzebra-config and idzebra.m4. This means that Zebra 2.0 is completely separate from potential newer releases. --- Makefile.am | 6 +- configure.ac | 6 +- debian/libidzebra-2.0-dev.install | 2 +- debian/libidzebra-2.0-dev.manpages | 2 +- debian/libidzebra-2.0-dev.postinst | 11 +++ debian/libidzebra-2.0-dev.prerm | 10 +++ doc/Makefile.am | 7 +- doc/idzebra-config-man.xml | 27 +++++--- idzebra-config-2.0.in | 132 ++++++++++++++++++++++++++++++++++++ idzebra-config.in | 128 ---------------------------------- util/Makefile.am | 6 +- 11 files changed, 187 insertions(+), 150 deletions(-) create mode 100644 debian/libidzebra-2.0-dev.postinst create mode 100644 debian/libidzebra-2.0-dev.prerm create mode 100755 idzebra-config-2.0.in delete mode 100755 idzebra-config.in diff --git a/Makefile.am b/Makefile.am index 9a2eb04..0e2149b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.27 2006-08-10 18:02:28 adam Exp $ +## $Id: Makefile.am,v 1.28 2006-08-14 12:18:46 adam Exp $ AUTOMAKE_OPTIONS=foreign @@ -8,12 +8,12 @@ SUBDIRS=util bfile dfa dict isams isamb isamc rset data1 \ tab index test examples include doc aclocaldir=$(datadir)/aclocal -aclocal_DATA = m4/idzebra.m4 +aclocal_DATA = m4/idzebra-2.0.m4 SPEC_FILE=idzebra.spec EXTRA_DIST= README NEWS $(SPEC_FILE) $(SPEC_FILE).in \ - idzebra-config.in m4/idzebra.m4 m4/yaz.m4 Doxyfile.in + idzebra-config-2.0.in m4/idzebra-2.0.m4 m4/yaz.m4 Doxyfile.in dist-hook: if test -x /usr/bin/cvs2cl -a -d CVS; then cvs2cl ; fi diff --git a/configure.ac b/configure.ac index 100bdc8..749280a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Zebra, Index Data ApS, 1995-2006 -dnl $Id: configure.ac,v 1.25 2006-07-06 07:56:00 adam Exp $ +dnl $Id: configure.ac,v 1.26 2006-08-14 12:18:46 adam Exp $ dnl AC_PREREQ(2.59) AC_INIT([idzebra],[2.0.0],[adam@indexdata.dk]) @@ -374,9 +374,9 @@ AC_OUTPUT([ examples/marc21/Makefile examples/marcxml/Makefile examples/alvis-oai/Makefile idzebra.spec - idzebra-config + idzebra-config-2.0 Doxyfile -],[sed s%echo_source=yes%echo_source=no%g < idzebra-config > util/idzebra-config && chmod +x idzebra-config util/idzebra-config]) +],[sed s%echo_source=yes%echo_source=no%g < idzebra-config-2.0 > util/idzebra-config-2.0 && chmod +x idzebra-config-2.0 util/idzebra-config-2.0]) echo \ "------------------------------------------------------------------------ diff --git a/debian/libidzebra-2.0-dev.install b/debian/libidzebra-2.0-dev.install index 5c9acf1..2d4b71f 100644 --- a/debian/libidzebra-2.0-dev.install +++ b/debian/libidzebra-2.0-dev.install @@ -1,4 +1,4 @@ -usr/bin/idzebra-config +usr/bin/idzebra-config-2.0 usr/lib/libidzebra-*.so usr/lib/libidzebra-*.la usr/lib/libidzebra-*.a diff --git a/debian/libidzebra-2.0-dev.manpages b/debian/libidzebra-2.0-dev.manpages index c0a9735..14b607f 100644 --- a/debian/libidzebra-2.0-dev.manpages +++ b/debian/libidzebra-2.0-dev.manpages @@ -1 +1 @@ -doc/idzebra-config.1 +doc/idzebra-config-2.0.1 diff --git a/debian/libidzebra-2.0-dev.postinst b/debian/libidzebra-2.0-dev.postinst new file mode 100644 index 0000000..959e939 --- /dev/null +++ b/debian/libidzebra-2.0-dev.postinst @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ "$1" != configure ]; then exit 0; fi + +update-alternatives --quiet --install /usr/bin/idzebra-config idzebra-config \ + /usr/bin/idzebra-config-2.0 50 \ + --slave /usr/share/man/man1/idzebra-config.1.gz idzebra-config.1.gz \ + /usr/share/man/man1/idzebra-config-2.0.1.gz + diff --git a/debian/libidzebra-2.0-dev.prerm b/debian/libidzebra-2.0-dev.prerm new file mode 100644 index 0000000..a7eaf48 --- /dev/null +++ b/debian/libidzebra-2.0-dev.prerm @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +case "$1" in + remove|deconfigure) + update-alternatives --quiet --remove zebraidx /usr/bin/idzebra-config-2.0 + ;; + *) +esac diff --git a/doc/Makefile.am b/doc/Makefile.am index 96a44fd..1059b69 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.54 2006-06-30 14:36:12 marc Exp $ +## $Id: Makefile.am,v 1.55 2006-08-14 12:18:48 adam Exp $ docdir=$(datadir)/doc/$(PACKAGE)$(PACKAGE_SUFFIX) SUBDIRS = common @@ -83,7 +83,7 @@ EPSFILES=zebra.eps MANFILES=zebraidx$(PACKAGE_SUFFIX).1 \ zebrasrv$(PACKAGE_SUFFIX).8 \ - idzebra-config.1 + idzebra-config$(PACKAGE_SUFFIX).1 REFFILES=zebraidx-man.xml zebrasrv-man.xml idzebra-config-man.xml @@ -103,8 +103,9 @@ zebrasrv$(PACKAGE_SUFFIX).8: zebrasrv-man.xml zebrasrv-options.xml \ $(MAN_COMPILE) $(srcdir)/zebrasrv-man.xml mv zebrasrv.8 zebrasrv$(PACKAGE_SUFFIX).8 -idzebra-config.1: idzebra-config-man.xml +idzebra-config$(PACKAGE_SUFFIX).1: idzebra-config-man.xml $(MAN_COMPILE) $(srcdir)/idzebra-config-man.xml + mv idzebra-config.1 idzebra-config$(PACKAGE_SUFFIX).1 $(HTMLFILES): $(XMLFILES) $(HTML_COMPILE) $(srcdir)/zebra.xml diff --git a/doc/idzebra-config-man.xml b/doc/idzebra-config-man.xml index 69aa9fd..6be1056 100644 --- a/doc/idzebra-config-man.xml +++ b/doc/idzebra-config-man.xml @@ -1,7 +1,10 @@ - +[ + + %local; +]> + @@ -22,7 +25,8 @@ - + + libraries @@ -38,7 +42,7 @@ - None (yet) + None @@ -83,24 +87,31 @@ - --tabs + --tab Return directory of idzebra tables. + + --modules + + Return directory for Zebra modules. + + + FILES - prefix/bin/idzebra-config + &prefix;/bin/idzebra-config-2.0 - prefix/lib/libidzebra*.a + &prefix;/lib/libidzebra*2.0.a - prefix/include/idzebra/*.h + &prefix;/include/idzebra-2.0/idzebra/*.h