From e92856ea4fecc1a5ea6875ad47797d462fd5fcae Mon Sep 17 00:00:00 2001 From: Marc Cromme Date: Mon, 26 Jun 2006 15:11:19 +0000 Subject: [PATCH] preparing release 2.0.0 new debian/changelog debian/rules moved debian/*.install files corrected so-numbers of shared libs removed danbib filter stuff --- NEWS | 2 + README | 12 +- TODO | 9 ++ bfile/Makefile.am | 3 +- configure.ac | 9 +- data1/Makefile.am | 3 +- debian/changelog | 14 +- debian/control | 46 ++---- debian/idzebra1.4-common.init | 232 --------------------------- debian/idzebra1.4-common.install | 1 - debian/idzebra1.4-doc.install | 1 - debian/idzebra1.4-utils.install | 2 - debian/idzebra1.4-utils.manpages | 2 - debian/idzebra2.0-common.init.test | 232 +++++++++++++++++++++++++++ debian/idzebra2.0-common.install | 1 + debian/idzebra2.0-doc.install | 1 + debian/idzebra2.0-utils.install | 2 + debian/idzebra2.0-utils.manpages | 2 + debian/libidzebra1.4-dev.install | 6 - debian/libidzebra1.4-dev.manpages | 1 - debian/libidzebra1.4-mod-alvis.install | 1 - debian/libidzebra1.4-mod-grs-danbib.install | 1 - debian/libidzebra1.4-mod-grs-marc.install | 1 - debian/libidzebra1.4-mod-grs-regx.install | 1 - debian/libidzebra1.4-mod-grs-xml.install | 1 - debian/libidzebra1.4.install | 1 - debian/libidzebra2.0-dev.install | 6 + debian/libidzebra2.0-dev.manpages | 1 + debian/libidzebra2.0-mod-alvis.install | 1 + debian/libidzebra2.0-mod-grs-marc.install | 1 + debian/libidzebra2.0-mod-grs-regx.install | 1 + debian/libidzebra2.0-mod-grs-xml.install | 1 + debian/libidzebra2.0.install | 1 + debian/rules | 11 +- dfa/Makefile.am | 3 +- dict/Makefile.am | 3 +- doc/Makefile.am | 8 +- include/idzebra/version.h | 6 +- index/Makefile.am | 4 +- isamb/Makefile.am | 3 +- isamc/Makefile.am | 3 +- isams/Makefile.am | 3 +- recctrl/Makefile.am | 4 +- rset/Makefile.am | 3 +- tab/Makefile.am | 4 +- tab/danbib.abs | 14 -- util/Makefile.am | 3 +- win/zebra.nsi | 4 +- 48 files changed, 346 insertions(+), 329 deletions(-) create mode 100644 TODO delete mode 100644 debian/idzebra1.4-common.init delete mode 100644 debian/idzebra1.4-common.install delete mode 100644 debian/idzebra1.4-doc.install delete mode 100644 debian/idzebra1.4-utils.install delete mode 100644 debian/idzebra1.4-utils.manpages create mode 100644 debian/idzebra2.0-common.init.test create mode 100644 debian/idzebra2.0-common.install create mode 100644 debian/idzebra2.0-doc.install create mode 100644 debian/idzebra2.0-utils.install create mode 100644 debian/idzebra2.0-utils.manpages delete mode 100644 debian/libidzebra1.4-dev.install delete mode 100644 debian/libidzebra1.4-dev.manpages delete mode 100644 debian/libidzebra1.4-mod-alvis.install delete mode 100644 debian/libidzebra1.4-mod-grs-danbib.install delete mode 100644 debian/libidzebra1.4-mod-grs-marc.install delete mode 100644 debian/libidzebra1.4-mod-grs-regx.install delete mode 100644 debian/libidzebra1.4-mod-grs-xml.install delete mode 100644 debian/libidzebra1.4.install create mode 100644 debian/libidzebra2.0-dev.install create mode 100644 debian/libidzebra2.0-dev.manpages create mode 100644 debian/libidzebra2.0-mod-alvis.install create mode 100644 debian/libidzebra2.0-mod-grs-marc.install create mode 100644 debian/libidzebra2.0-mod-grs-regx.install create mode 100644 debian/libidzebra2.0-mod-grs-xml.install create mode 100644 debian/libidzebra2.0.install delete mode 100644 tab/danbib.abs diff --git a/NEWS b/NEWS index 1210790..bbb6697 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +Release candidate Zebra version 2.0.0 prepared. + Zebra uses string attributes for indexing internally. Using set+numeric use attribute can still be used. But that is a search-only conversion which inspects .att-set files as indicated using attset-directives in zebra.cfg. diff --git a/README b/README index c82cfc1..8a1070f 100644 --- a/README +++ b/README @@ -11,17 +11,19 @@ boolean search expressions and relevance-ranked free-text queries. Documentation ------------- You'll find documentation in subdirectory 'doc' in various -formats (PDF, HTML, Docbook XML). You can also browse the +formats (HTML, Docbook XML). You can also browse the documentation from the zebra home page. Installation ------------ -Install YAZ. Optional external packages: Tcl, iconv and EXPAT. -Many Unices already have Tcl, iconv and EXPAT installed. +Install YAZ. Optional external packages: Tcl, iconv, EXPAT, libxml2 +and libxslt1. + Quick compile and install: ./configure make make install + For detailed instructions and Windows installation refer to the documentation. @@ -31,10 +33,10 @@ Zebra is covered by the GNU GPL v2. See LICENSE.zebra. Support ------ -To get more information or assistance, send mail to zebra-help@indexdata.dk +To get more information or assistance, send mail to info@indexdata.dk We maintain a mailing-list for the purpose of announcing new versions of the software, bug-reports, discussion etc. You can sign up at the URL http://www.indexdata.dk/mailman/listinfo/zebralist -$Id: README,v 1.20 2006-06-13 14:50:39 adam Exp $ +$Id: README,v 1.21 2006-06-26 15:11:19 marc Exp $ diff --git a/TODO b/TODO new file mode 100644 index 0000000..f291c82 --- /dev/null +++ b/TODO @@ -0,0 +1,9 @@ +YAZ TODO $Id: TODO,v 1.18 2006-06-26 15:11:19 marc Exp $ + +Version numbers are manually maintained in + configure.ac + include/idzebra/version.h + NEWS + win/zebra.nsi + debian/changelog + debian/rules (dh_makeshlibs line if API has been extended) diff --git a/bfile/Makefile.am b/bfile/Makefile.am index 38d05f3..e816a89 100644 --- a/bfile/Makefile.am +++ b/bfile/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.5 2005-03-30 09:25:23 adam Exp $ Copyright (C) 1994-1998, Index Data ApS +## $Id: Makefile.am,v 1.6 2006-06-26 15:11:21 marc Exp $ Copyright (C) 1994-1998, Index Data ApS lib_LTLIBRARIES = libidzebra-bfile.la check_PROGRAMS = tstbfile1 @@ -9,6 +9,7 @@ tstbfile1_SOURCES = tstbfile1.c AM_CPPFLAGS = -I$(top_srcdir)/include $(YAZINC) +libidzebra_bfile_la_LDFLAGS=-version-info $(ZEBRALIBS_VERSION) libidzebra_bfile_la_SOURCES = bfile.c mfile.c cfile.c commit.c cfile.h mfile.h LDADD = libidzebra-bfile.la ../util/libidzebra-util.la $(YAZLALIB) diff --git a/configure.ac b/configure.ac index 390f58f..2cbc0ef 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,16 @@ dnl Zebra, Index Data ApS, 1995-2006 -dnl $Id: configure.ac,v 1.18 2006-06-13 15:10:43 adam Exp $ +dnl $Id: configure.ac,v 1.19 2006-06-26 15:11:19 marc Exp $ dnl AC_PREREQ(2.59) -AC_INIT([idzebra],[1.4.1],[adam@indexdata.dk]) +AC_INIT([idzebra],[2.0.0],[adam@indexdata.dk]) AC_CONFIG_SRCDIR(configure.ac) AC_CONFIG_AUX_DIR(config) AM_INIT_AUTOMAKE([1.8]) +ZEBRAPKG_VERSION=2.0 +AC_SUBST(ZEBRAPKG_VERSION) +ZEBRALIBS_VERSION=2:0:0 +AC_SUBST(ZEBRALIBS_VERSION) + dnl ------ Substitutions AC_SUBST(TCL_INCLUDE) AC_SUBST(TCL_LIB) diff --git a/data1/Makefile.am b/data1/Makefile.am index b72eb94..cade864 100644 --- a/data1/Makefile.am +++ b/data1/Makefile.am @@ -1,7 +1,8 @@ -## $Id: Makefile.am,v 1.2 2004-08-24 10:37:18 adam Exp $ +## $Id: Makefile.am,v 1.3 2006-06-26 15:11:22 marc Exp $ lib_LTLIBRARIES=libidzebra-data1.la +libidzebra_data1_la_LDFLAGS=-version-info $(ZEBRALIBS_VERSION) libidzebra_data1_la_SOURCES = d1_handle.c d1_read.c d1_attset.c d1_tagset.c \ d1_absyn.c d1_grs.c d1_sutrs.c d1_varset.c d1_espec.c d1_doespec.c d1_map.c \ d1_marc.c d1_write.c d1_expout.c d1_sumout.c d1_soif.c d1_prtree.c d1_if.c diff --git a/debian/changelog b/debian/changelog index 670ef3b..0949112 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,22 @@ +idzebra (2.0.0-1) unstable; urgency=low + + * First production release of Zebra 2.0 series. + * String attributes used internally, mapping to numeric attributes + during search + * Documentation of architecture, querymodel and SRU server added + * Example configuration for Alvis filter indexed MARCXML and OAI records + added + * Bug closes: #124 #431 #447 #451 #454 #460 #461 #462 #465 #472 #529 + #549 #576 #588 #594 #597 #602 #616 #617 + + -- marc Mon, 26 Jun 2006 12:00:31 +0200 + idzebra (1.4.0-2) unstable; urgency=low * Added Alvis XSLT filter debian package libidzebra1.4-mod-alvis. -- Marc Cromme Mon, 12 Dec 2005 13:49:07 +0100 - idzebra (1.4.0-1) unstable; urgency=low * New package structure. Zebra 1.4 series. diff --git a/debian/control b/debian/control index 07f365c..e4b4957 100644 --- a/debian/control +++ b/debian/control @@ -5,10 +5,10 @@ Build-Depends: debhelper (>= 4.0.0) Standards-Version: 3.6.0 Build-Depends: libyaz-dev (>= 2.0.2), libexpat1-dev, tcl8.4-dev, libbz2-dev, libxslt1-dev -Package: idzebra1.4 +Package: idzebra2.0 Section: text Architecture: any -Provides: libidzebra1.4-dev, idzebra1.4-utils, libidzebra1.4-modules, idzebra1.4-doc +Provides: libidzebra2.0-dev, idzebra2.0-utils, libidzebra2.0-modules, idzebra2.0-doc Description: IDZebra virtual package (the works) This virtual package installs all the necessary packages to start working with IDZebra - including utility programs, development libraries, @@ -19,10 +19,10 @@ Description: IDZebra virtual package (the works) formats (eg. email, XML, MARC) and allows access to them through exact boolean search expressions and relevance-ranked free-text queries. -Package: libidzebra1.4-modules +Package: libidzebra2.0-modules Section: libs Architecture: any -Provides: libidzebra1.4-mod-grs-xml, libidzebra1.4-mod-grs-regx, libidzebra1.4-mod-marc, libidzebra1.4-mod-danbib +Provides: libidzebra2.0-mod-grs-xml, libidzebra2.0-mod-grs-regx, libidzebra2.0-mod-marc Description: IDZebra modules This virtual package contains all base IDZebra filter modules. . @@ -31,7 +31,7 @@ Description: IDZebra modules formats (eg. email, XML, MARC) and allows access to them through exact boolean search expressions and relevance-ranked free-text queries. -Package: idzebra1.4-common +Package: idzebra2.0-common Section: text Architecture: all Conflicts: idzebra @@ -43,11 +43,11 @@ Description: IDZebra common files formats (eg. email, XML, MARC) and allows access to them through exact boolean search expressions and relevance-ranked free-text queries. -Package: idzebra1.4-utils +Package: idzebra2.0-utils Section: text Architecture: any Depends: ${shlibs:Depends} -Recommends: idzebra1.4-mod-grs-xml, idzebra1.4-mod-grs-regx, idzebra1.4-mod-marc +Recommends: idzebra2.0-mod-grs-xml, idzebra2.0-mod-grs-regx, idzebra2.0-mod-marc Conflicts: idzebra Description: IDZebra utility programs This package contains IDZebra utilities such as the zebraidx indexer @@ -58,10 +58,10 @@ Description: IDZebra utility programs formats (eg. email, XML, MARC) and allows access to them through exact boolean search expressions and relevance-ranked free-text queries. -Package: libidzebra1.4-dev +Package: libidzebra2.0-dev Section: devel Architecture: any -Depends: libidzebra1.4 (= ${Source-Version}) +Depends: libidzebra2.0 (= ${Source-Version}) Description: IDZebra development This package contains IDZebra development files, such as libraries and header files. @@ -71,10 +71,10 @@ Description: IDZebra development formats (eg. email, XML, MARC) and allows access to them through exact boolean search expressions and relevance-ranked free-text queries. -Package: libidzebra1.4 +Package: libidzebra2.0 Section: libs Architecture: any -Depends: ${shlibs:Depends}, idzebra1.4-common +Depends: ${shlibs:Depends}, idzebra2.0-common Conflicts: idzebra Description: IDZebra libraries This package contains all run-time libraries for IDZebra. @@ -84,7 +84,7 @@ Description: IDZebra libraries formats (eg. email, XML, MARC) and allows access to them through exact boolean search expressions and relevance-ranked free-text queries. -Package: libidzebra1.4-mod-alvis +Package: libidzebra2.0-mod-alvis Section: libs Architecture: any Depends: ${shlibs:Depends} @@ -97,7 +97,7 @@ Description: IDZebra filter alvis (XSLT filter for XML) formats (eg. email, XML, MARC) and allows access to them through exact boolean search expressions and relevance-ranked free-text queries. -Package: libidzebra1.4-mod-grs-marc +Package: libidzebra2.0-mod-grs-marc Section: libs Architecture: any Depends: ${shlibs:Depends} @@ -110,21 +110,7 @@ Description: IDZebra filter grs.marc (ISO2709 MARC reader) formats (eg. email, XML, MARC) and allows access to them through exact boolean search expressions and relevance-ranked free-text queries. -Package: libidzebra1.4-mod-grs-danbib -Section: libs -Architecture: any -Depends: ${shlibs:Depends} -Description: IDZebra filter grs.danbib (DBC DanBib records) - This package includes grs.danbib filter which parses DanBib records. - DanBib is the Danish Union Catalogue hosted by DBC - (Danish Bibliographic Centre). - . - IDZebra is a high-performance, general-purpose structured text indexing - and retrieval engine. It reads structured records in a variety of input - formats (eg. email, XML, MARC) and allows access to them through exact - boolean search expressions and relevance-ranked free-text queries. - -Package: libidzebra1.4-mod-grs-regx +Package: libidzebra2.0-mod-grs-regx Section: libs Architecture: any Depends: ${shlibs:Depends} @@ -136,7 +122,7 @@ Description: IDZebra filters grs.regx, grs.tcl formats (eg. email, XML, MARC) and allows access to them through exact boolean search expressions and relevance-ranked free-text queries. -Package: libidzebra1.4-mod-grs-xml +Package: libidzebra2.0-mod-grs-xml Section: libs Architecture: any Depends: ${shlibs:Depends} @@ -149,7 +135,7 @@ Description: IDZebra filter grs.xml (XML filter) formats (eg. email, XML, MARC) and allows access to them through exact boolean search expressions and relevance-ranked free-text queries. -Package: idzebra1.4-doc +Package: idzebra2.0-doc Section: doc Architecture: all Conflicts: idzebra diff --git a/debian/idzebra1.4-common.init b/debian/idzebra1.4-common.init deleted file mode 100644 index ad2e2b7..0000000 --- a/debian/idzebra1.4-common.init +++ /dev/null @@ -1,232 +0,0 @@ -#! /bin/sh -# $Id: idzebra1.4-common.init,v 1.1 2004-10-18 13:29:25 marc Exp $ -# Start and stop toolkit lite administered idzebra script for Debian. -# change runlevels using update-rc.d - -test -x /usr/bin/zebrasrv || exit 0 -test -x /usr/bin/zebraidx || exit 0 -test -f /etc/default/zebra || exit 0 -source /etc/default/zebra - -# Now sourced from /etc/default/zebra -ZEBRA_USER=zebra -ZEBRA_GROUP=zebra - -#ZEBRA_CONF_FILE=/etc/zebra.conf -#ZEBRA_LOG_DIR=/var/log/zebra -#ZEBRA_PID_DIR=/var/run/zebra -#ZEBRA_TMP_DIR=/var/tmp/zebra - -ZEBRA_DIRS="/home/marc/projects/alvis" -ZEBRA_INDEX_DIRS="data" - -# set socket connection method -#ZEBRA_SOCKET="tcp:@:210" -ZEBRA_SOCKET="unix:db/socket" - - -# define display message -display_ZEBRA_message(){ - echo "Usage:" - echo " As root:" - echo -n " /etc/init.d/zebra {start|stop|reload|force-reload|restart}" - echo " [/path/to/root/dir]" - echo " As root or $ZEBRA_USER:" - echo " /etc/init.d/zebra {index|reindex} [/path/to/root/dir [sub/dir] ]" -} - -# make sure we are root or $ZEBRA_USER -ZEBRA_CURR_USER=`whoami`; -if [ $ZEBRA_CURR_USER != $ZEBRA_USER -a $ZEBRA_CURR_USER != "root" ] ; then - display_ZEBRA_message ; - echo " Error: you are not root or $ZEBRA_USER"; - exit 1; -fi - - -# perform usual init.d daemon services -case "$1" in - start) - # make sure we are root - if [ `whoami` != root ]; then - display_ZEBRA_message ; - echo " Error: you are not root"; - exit 1; - fi - - # read zebra dir from command line - if [ $2 ] ; then - ZEBRA_DIRS=$2 - fi - - # loop through all entries defined in /etc/zebra.conf - for d in $ZEBRA_DIRS; do - echo -n "Starting zebra: " - echo -n "$d " ; - - if [ ! -f $d/db/zebra.cfg ] ; then - echo ""; - echo " Error: config file $d/db/zebra.cfg not found"; - continue; - fi - - if [ ! -f $d/db/lock/zebrasrv.pid ] ; then - start-stop-daemon --start --quiet --background --pidfile $d/db/lock/zebrasrv.pid --exec /usr/bin/zebrasrv -- -w $d -u $ZEBRA_USER -c db/zebra.cfg -l db/server.log $ZEBRA_SOCKET ; - - # check for running zebra not performed - #sleep 1 - #if [ -f $d/db/lock/zebrasrv.pid ] ; then - # echo -n "started " - #cat $d/db/lock/zebrasrv.pid - # echo -n " " - #else - # echo -n "error " - #fi - else - echo -n "already running " - fi - echo - done - #ps -C zebrasrv | grep `cat $d/db/lock/zebrasrv.pid` - ;; - - stop) - # make sure we are root - if [ `whoami` != root ]; then - display_ZEBRA_message ; - echo " Error: you are not root"; - exit 1; - fi - - # read zebra dir from command line - if [ $2 ] ; then - ZEBRA_DIRS=$2 - fi - - # loop through all entries defined in /etc/zebra.conf - for d in $ZEBRA_DIRS; do - echo -n "Stopping zebra: " - echo -n "$d " ; - - if [ ! -f $d/db/zebra.cfg ] ; then - echo ""; - echo " Error: config file $d/db/zebra.cfg not found"; - continue; - fi - - if [ -f $d/db/lock/zebrasrv.pid ] ; then - start-stop-daemon --stop --quiet --oknodo --pidfile $d/db/lock/zebrasrv.pid ; - #sleep 1 - #if ps -C zebrasrv | grep `cat $d/db/lock/zebrasrv.pid` ; then - # kill -9 `cat $d/db/lock/zebrasrv.pid` - # echo -n "-9 " - #fi - #if [ -f $d/db/lock/zebrasrv.pid ] && ps -C zebrasrv | grep `cat $d/db/lock/zebrasrv.pid` ; then - # echo -n "error " - #else - # echo -n "stopped " - #fi - #if [ -f $d/db/lock/zebrasrv.pid ] ; then - #rm -f $d/db/lock/zebrasrv.pid - #echo -n "removed PID file" - #fi - else - echo -n "already dead " - fi - echo - done - #ps -C zebrasrv | grep `cat $d/db/lock/zebrasrv.pid` - ;; - - restart|reload|force-reload) - # make sure we are root - if [ `whoami` != root ]; then - display_ZEBRA_message ; - echo " Error: you are not root"; - exit 1; - fi - - $0 stop $2 - #sleep 1 - $0 start $2 - ;; - - reindex|index) - # make sure that indexing is done as user $ZEBRA_USER - if test `whoami` != $ZEBRA_USER; then - su -s /bin/sh -c "$0 $*" $ZEBRA_USER - exit 0 - fi - - # read zebra dir from command line - if [ $2 ] ; then - ZEBRA_DIRS=$2 - fi - - for d in $ZEBRA_DIRS; do - # allow all scripts to be called with one specific entrie - # directory as third argument - - if [ ! -f $d/db/zebra.cfg ] ; then - echo -n "Indexing zebra: " - echo "$d " - echo " Error: config file $d/db/zebra.cfg not found"; - continue; - fi - - if [ $3 ] ; then - # only indexing one additionally directory - ZEBRA_INDEX_DIRS=$3; - if [ ! -d $d/$ZEBRA_INDEX_DIRS ] ; then - #$0 ; # trigger user info - echo " Error: there is no directory $3"; - echo " in zebra dir $d"; - echo " Can not index $d/$ZEBRA_INDEX_DIRS"; - exit 1; - fi - if ( echo $ZEBRA_INDEX_DIRS | grep "^/" ) ; then - #$0 ; # trigger user info - echo " Error: third argument $3"; - echo " must not contain leading slash"; - exit 1; - fi - - echo -n "Indexing zebra: " - echo -n "$d " - - (cd $d ; - # initalization and commiting db to get a fresh slate - for DIR in $ZEBRA_INDEX_DIRS ; do - echo -n "$DIR " - zebraidx -L -l db/index.log -c db/zebra.cfg update $DIR ; - done - zebraidx -l db/index.log -c db/zebra.cfg commit ; - ) - echo - else - # indexing a whole entrie - findZEBRA_INDEX_DIRD makes the work - # findZEBRA_INDEX_DIRS "$d" ; - echo -n "Indexing zebra: " - echo -n "$d " - (cd $d ; - # initalization and commiting db to get a fresh slate - zebraidx -l db/index.log -c db/zebra.cfg init ; - for DIR in $ZEBRA_INDEX_DIRS ; do - echo -n "$DIR " - zebraidx -L -l db/index.log -c db/zebra.cfg update $DIR ; - done - zebraidx -l db/index.log -c db/zebra.cfg commit ; - ) - echo - fi - done - ;; - - *) - display_ZEBRA_message ; - exit 1; -esac - -exit 0 - - diff --git a/debian/idzebra1.4-common.install b/debian/idzebra1.4-common.install deleted file mode 100644 index 9bd85aa..0000000 --- a/debian/idzebra1.4-common.install +++ /dev/null @@ -1 +0,0 @@ -usr/share/idzebra diff --git a/debian/idzebra1.4-doc.install b/debian/idzebra1.4-doc.install deleted file mode 100644 index 59c9472..0000000 --- a/debian/idzebra1.4-doc.install +++ /dev/null @@ -1 +0,0 @@ -usr/share/doc/idzebra-doc diff --git a/debian/idzebra1.4-utils.install b/debian/idzebra1.4-utils.install deleted file mode 100644 index 5aedf07..0000000 --- a/debian/idzebra1.4-utils.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin/zebraidx -usr/bin/zebrasrv diff --git a/debian/idzebra1.4-utils.manpages b/debian/idzebra1.4-utils.manpages deleted file mode 100644 index e5c15a7..0000000 --- a/debian/idzebra1.4-utils.manpages +++ /dev/null @@ -1,2 +0,0 @@ -doc/zebrasrv.8 -doc/zebraidx.1 diff --git a/debian/idzebra2.0-common.init.test b/debian/idzebra2.0-common.init.test new file mode 100644 index 0000000..021084f --- /dev/null +++ b/debian/idzebra2.0-common.init.test @@ -0,0 +1,232 @@ +#! /bin/sh +# $Id: idzebra2.0-common.init.test,v 1.1 2006-06-26 15:11:24 marc Exp $ +# Start and stop toolkit lite administered idzebra script for Debian. +# change runlevels using update-rc.d + +test -x /usr/bin/zebrasrv || exit 0 +test -x /usr/bin/zebraidx || exit 0 +test -f /etc/default/zebra || exit 0 +source /etc/default/zebra + +# Now sourced from /etc/default/zebra +ZEBRA_USER=zebra +ZEBRA_GROUP=zebra + +#ZEBRA_CONF_FILE=/etc/zebra.conf +#ZEBRA_LOG_DIR=/var/log/zebra +#ZEBRA_PID_DIR=/var/run/zebra +#ZEBRA_TMP_DIR=/var/tmp/zebra + +ZEBRA_DIRS="/home/marc/projects/alvis" +ZEBRA_INDEX_DIRS="data" + +# set socket connection method +#ZEBRA_SOCKET="tcp:@:210" +ZEBRA_SOCKET="unix:db/socket" + + +# define display message +display_ZEBRA_message(){ + echo "Usage:" + echo " As root:" + echo -n " /etc/init.d/zebra {start|stop|reload|force-reload|restart}" + echo " [/path/to/root/dir]" + echo " As root or $ZEBRA_USER:" + echo " /etc/init.d/zebra {index|reindex} [/path/to/root/dir [sub/dir] ]" +} + +# make sure we are root or $ZEBRA_USER +ZEBRA_CURR_USER=`whoami`; +if [ $ZEBRA_CURR_USER != $ZEBRA_USER -a $ZEBRA_CURR_USER != "root" ] ; then + display_ZEBRA_message ; + echo " Error: you are not root or $ZEBRA_USER"; + exit 1; +fi + + +# perform usual init.d daemon services +case "$1" in + start) + # make sure we are root + if [ `whoami` != root ]; then + display_ZEBRA_message ; + echo " Error: you are not root"; + exit 1; + fi + + # read zebra dir from command line + if [ $2 ] ; then + ZEBRA_DIRS=$2 + fi + + # loop through all entries defined in /etc/zebra.conf + for d in $ZEBRA_DIRS; do + echo -n "Starting zebra: " + echo -n "$d " ; + + if [ ! -f $d/db/zebra.cfg ] ; then + echo ""; + echo " Error: config file $d/db/zebra.cfg not found"; + continue; + fi + + if [ ! -f $d/db/lock/zebrasrv.pid ] ; then + start-stop-daemon --start --quiet --background --pidfile $d/db/lock/zebrasrv.pid --exec /usr/bin/zebrasrv -- -w $d -u $ZEBRA_USER -c db/zebra.cfg -l db/server.log $ZEBRA_SOCKET ; + + # check for running zebra not performed + #sleep 1 + #if [ -f $d/db/lock/zebrasrv.pid ] ; then + # echo -n "started " + #cat $d/db/lock/zebrasrv.pid + # echo -n " " + #else + # echo -n "error " + #fi + else + echo -n "already running " + fi + echo + done + #ps -C zebrasrv | grep `cat $d/db/lock/zebrasrv.pid` + ;; + + stop) + # make sure we are root + if [ `whoami` != root ]; then + display_ZEBRA_message ; + echo " Error: you are not root"; + exit 1; + fi + + # read zebra dir from command line + if [ $2 ] ; then + ZEBRA_DIRS=$2 + fi + + # loop through all entries defined in /etc/zebra.conf + for d in $ZEBRA_DIRS; do + echo -n "Stopping zebra: " + echo -n "$d " ; + + if [ ! -f $d/db/zebra.cfg ] ; then + echo ""; + echo " Error: config file $d/db/zebra.cfg not found"; + continue; + fi + + if [ -f $d/db/lock/zebrasrv.pid ] ; then + start-stop-daemon --stop --quiet --oknodo --pidfile $d/db/lock/zebrasrv.pid ; + #sleep 1 + #if ps -C zebrasrv | grep `cat $d/db/lock/zebrasrv.pid` ; then + # kill -9 `cat $d/db/lock/zebrasrv.pid` + # echo -n "-9 " + #fi + #if [ -f $d/db/lock/zebrasrv.pid ] && ps -C zebrasrv | grep `cat $d/db/lock/zebrasrv.pid` ; then + # echo -n "error " + #else + # echo -n "stopped " + #fi + #if [ -f $d/db/lock/zebrasrv.pid ] ; then + #rm -f $d/db/lock/zebrasrv.pid + #echo -n "removed PID file" + #fi + else + echo -n "already dead " + fi + echo + done + #ps -C zebrasrv | grep `cat $d/db/lock/zebrasrv.pid` + ;; + + restart|reload|force-reload) + # make sure we are root + if [ `whoami` != root ]; then + display_ZEBRA_message ; + echo " Error: you are not root"; + exit 1; + fi + + $0 stop $2 + #sleep 1 + $0 start $2 + ;; + + reindex|index) + # make sure that indexing is done as user $ZEBRA_USER + if test `whoami` != $ZEBRA_USER; then + su -s /bin/sh -c "$0 $*" $ZEBRA_USER + exit 0 + fi + + # read zebra dir from command line + if [ $2 ] ; then + ZEBRA_DIRS=$2 + fi + + for d in $ZEBRA_DIRS; do + # allow all scripts to be called with one specific entrie + # directory as third argument + + if [ ! -f $d/db/zebra.cfg ] ; then + echo -n "Indexing zebra: " + echo "$d " + echo " Error: config file $d/db/zebra.cfg not found"; + continue; + fi + + if [ $3 ] ; then + # only indexing one additionally directory + ZEBRA_INDEX_DIRS=$3; + if [ ! -d $d/$ZEBRA_INDEX_DIRS ] ; then + #$0 ; # trigger user info + echo " Error: there is no directory $3"; + echo " in zebra dir $d"; + echo " Can not index $d/$ZEBRA_INDEX_DIRS"; + exit 1; + fi + if ( echo $ZEBRA_INDEX_DIRS | grep "^/" ) ; then + #$0 ; # trigger user info + echo " Error: third argument $3"; + echo " must not contain leading slash"; + exit 1; + fi + + echo -n "Indexing zebra: " + echo -n "$d " + + (cd $d ; + # initalization and commiting db to get a fresh slate + for DIR in $ZEBRA_INDEX_DIRS ; do + echo -n "$DIR " + zebraidx -L -l db/index.log -c db/zebra.cfg update $DIR ; + done + zebraidx -l db/index.log -c db/zebra.cfg commit ; + ) + echo + else + # indexing a whole entrie - findZEBRA_INDEX_DIRD makes the work + # findZEBRA_INDEX_DIRS "$d" ; + echo -n "Indexing zebra: " + echo -n "$d " + (cd $d ; + # initalization and commiting db to get a fresh slate + zebraidx -l db/index.log -c db/zebra.cfg init ; + for DIR in $ZEBRA_INDEX_DIRS ; do + echo -n "$DIR " + zebraidx -L -l db/index.log -c db/zebra.cfg update $DIR ; + done + zebraidx -l db/index.log -c db/zebra.cfg commit ; + ) + echo + fi + done + ;; + + *) + display_ZEBRA_message ; + exit 1; +esac + +exit 0 + + diff --git a/debian/idzebra2.0-common.install b/debian/idzebra2.0-common.install new file mode 100644 index 0000000..5e67028 --- /dev/null +++ b/debian/idzebra2.0-common.install @@ -0,0 +1 @@ +usr/share/idzebra2.0 diff --git a/debian/idzebra2.0-doc.install b/debian/idzebra2.0-doc.install new file mode 100644 index 0000000..84721ce --- /dev/null +++ b/debian/idzebra2.0-doc.install @@ -0,0 +1 @@ +usr/share/doc/idzebra2.0-doc diff --git a/debian/idzebra2.0-utils.install b/debian/idzebra2.0-utils.install new file mode 100644 index 0000000..5aedf07 --- /dev/null +++ b/debian/idzebra2.0-utils.install @@ -0,0 +1,2 @@ +usr/bin/zebraidx +usr/bin/zebrasrv diff --git a/debian/idzebra2.0-utils.manpages b/debian/idzebra2.0-utils.manpages new file mode 100644 index 0000000..e5c15a7 --- /dev/null +++ b/debian/idzebra2.0-utils.manpages @@ -0,0 +1,2 @@ +doc/zebrasrv.8 +doc/zebraidx.1 diff --git a/debian/libidzebra1.4-dev.install b/debian/libidzebra1.4-dev.install deleted file mode 100644 index e6c52d6..0000000 --- a/debian/libidzebra1.4-dev.install +++ /dev/null @@ -1,6 +0,0 @@ -usr/bin/idzebra-config -usr/lib/libidzebra-*.so -usr/lib/libidzebra-*.la -usr/lib/libidzebra-*.a -usr/share/aclocal -usr/include/idzebra diff --git a/debian/libidzebra1.4-dev.manpages b/debian/libidzebra1.4-dev.manpages deleted file mode 100644 index c0a9735..0000000 --- a/debian/libidzebra1.4-dev.manpages +++ /dev/null @@ -1 +0,0 @@ -doc/idzebra-config.1 diff --git a/debian/libidzebra1.4-mod-alvis.install b/debian/libidzebra1.4-mod-alvis.install deleted file mode 100644 index df34531..0000000 --- a/debian/libidzebra1.4-mod-alvis.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/idzebra/mod-alvis.so diff --git a/debian/libidzebra1.4-mod-grs-danbib.install b/debian/libidzebra1.4-mod-grs-danbib.install deleted file mode 100644 index 51104cd..0000000 --- a/debian/libidzebra1.4-mod-grs-danbib.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/idzebra/mod-grs-danbib.so diff --git a/debian/libidzebra1.4-mod-grs-marc.install b/debian/libidzebra1.4-mod-grs-marc.install deleted file mode 100644 index 9b57191..0000000 --- a/debian/libidzebra1.4-mod-grs-marc.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/idzebra/mod-grs-marc.so diff --git a/debian/libidzebra1.4-mod-grs-regx.install b/debian/libidzebra1.4-mod-grs-regx.install deleted file mode 100644 index ae93d73..0000000 --- a/debian/libidzebra1.4-mod-grs-regx.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/idzebra/mod-grs-regx.so diff --git a/debian/libidzebra1.4-mod-grs-xml.install b/debian/libidzebra1.4-mod-grs-xml.install deleted file mode 100644 index 3ca4fb2..0000000 --- a/debian/libidzebra1.4-mod-grs-xml.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/idzebra/mod-grs-xml.so diff --git a/debian/libidzebra1.4.install b/debian/libidzebra1.4.install deleted file mode 100644 index 78427e0..0000000 --- a/debian/libidzebra1.4.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libidzebra-*.so.0* diff --git a/debian/libidzebra2.0-dev.install b/debian/libidzebra2.0-dev.install new file mode 100644 index 0000000..e6c52d6 --- /dev/null +++ b/debian/libidzebra2.0-dev.install @@ -0,0 +1,6 @@ +usr/bin/idzebra-config +usr/lib/libidzebra-*.so +usr/lib/libidzebra-*.la +usr/lib/libidzebra-*.a +usr/share/aclocal +usr/include/idzebra diff --git a/debian/libidzebra2.0-dev.manpages b/debian/libidzebra2.0-dev.manpages new file mode 100644 index 0000000..c0a9735 --- /dev/null +++ b/debian/libidzebra2.0-dev.manpages @@ -0,0 +1 @@ +doc/idzebra-config.1 diff --git a/debian/libidzebra2.0-mod-alvis.install b/debian/libidzebra2.0-mod-alvis.install new file mode 100644 index 0000000..1ce251a --- /dev/null +++ b/debian/libidzebra2.0-mod-alvis.install @@ -0,0 +1 @@ +usr/lib/idzebra2.0/mod-alvis.so diff --git a/debian/libidzebra2.0-mod-grs-marc.install b/debian/libidzebra2.0-mod-grs-marc.install new file mode 100644 index 0000000..fe790d6 --- /dev/null +++ b/debian/libidzebra2.0-mod-grs-marc.install @@ -0,0 +1 @@ +usr/lib/idzebra2.0/mod-grs-marc.so diff --git a/debian/libidzebra2.0-mod-grs-regx.install b/debian/libidzebra2.0-mod-grs-regx.install new file mode 100644 index 0000000..e4584aa --- /dev/null +++ b/debian/libidzebra2.0-mod-grs-regx.install @@ -0,0 +1 @@ +usr/lib/idzebra2.0/mod-grs-regx.so diff --git a/debian/libidzebra2.0-mod-grs-xml.install b/debian/libidzebra2.0-mod-grs-xml.install new file mode 100644 index 0000000..366f1e8 --- /dev/null +++ b/debian/libidzebra2.0-mod-grs-xml.install @@ -0,0 +1 @@ +usr/lib/idzebra2.0/mod-grs-xml.so diff --git a/debian/libidzebra2.0.install b/debian/libidzebra2.0.install new file mode 100644 index 0000000..cfd2838 --- /dev/null +++ b/debian/libidzebra2.0.install @@ -0,0 +1 @@ +usr/lib/libidzebra-*.so.* diff --git a/debian/rules b/debian/rules index 956eaf2..4c53251 100755 --- a/debian/rules +++ b/debian/rules @@ -75,7 +75,12 @@ binary-arch: build install dh_installchangelogs dh_installdocs dh_installexamples - mv debian/tmp/usr/share/doc/idzebra debian/tmp/usr/share/doc/idzebra-doc + +# moving files to correct dirs + mv debian/tmp/usr/share/doc/idzebra debian/tmp/usr/share/doc/idzebra2.0-doc + mv debian/tmp/usr/share/idzebra debian/tmp/usr/share/idzebra2.0 + mv debian/tmp/usr/lib/idzebra debian/tmp/usr/lib/idzebra2.0 + dh_install --sourcedir=debian/tmp # dh_installmenu # dh_installdebconf @@ -93,9 +98,9 @@ binary-arch: build install dh_fixperms # dh_perl # dh_python - dh_makeshlibs -V 'libidzebra1.4 (>= 1.4.0)' -X mod- + dh_makeshlibs -V 'libidzebra2.0 (>= 2.0.0)' -X mod- dh_installdeb - dh_shlibdeps -l debian/libidzebra1.4/usr/lib + dh_shlibdeps -l debian/libidzebra2.0/usr/lib dh_gencontrol dh_md5sums dh_builddeb diff --git a/dfa/Makefile.am b/dfa/Makefile.am index 6c22183..d0c6ca5 100644 --- a/dfa/Makefile.am +++ b/dfa/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.6 2004-09-30 08:16:48 adam Exp $ +## $Id: Makefile.am,v 1.7 2006-06-26 15:11:26 marc Exp $ lib_LTLIBRARIES = libidzebra-dfa.la @@ -13,5 +13,6 @@ lexer_SOURCES = lexer.c readfile.c grepper_SOURCES = grepper.c +libidzebra_dfa_la_LDFLAGS=-version-info $(ZEBRALIBS_VERSION) libidzebra_dfa_la_SOURCES = dfa.c imalloc.c states.c set.c bset.c \ dfap.h imalloc.h lexer.h diff --git a/dict/Makefile.am b/dict/Makefile.am index 91595b5..ff38253 100644 --- a/dict/Makefile.am +++ b/dict/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.12 2006-04-27 20:40:41 marc Exp $ +## $Id: Makefile.am,v 1.13 2006-06-26 15:11:28 marc Exp $ lib_LTLIBRARIES = libidzebra-dict.la noinst_PROGRAMS = dicttest dictext @@ -14,6 +14,7 @@ LDADD = libidzebra-dict.la \ ../util/libidzebra-util.la \ $(YAZLALIB) +libidzebra_dict_la_LDFLAGS=-version-info $(ZEBRALIBS_VERSION) libidzebra_dict_la_SOURCES = dopen.c dclose.c drdwr.c open.c close.c \ insert.c lookup.c lookupec.c lookgrep.c delete.c scan.c dcompact.c \ dict-p.h diff --git a/doc/Makefile.am b/doc/Makefile.am index f88b056..d61951f 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.49 2006-06-22 14:01:55 marc Exp $ +## $Id: Makefile.am,v 1.50 2006-06-26 15:11:29 marc Exp $ docdir=$(datadir)/doc/@PACKAGE@ SUBDIRS = common @@ -47,7 +47,6 @@ HTMLFILES = \ gfs-config.html \ grs-exchange-formats.html \ grs-internal-representation.html \ - htmlhelp.hhp \ index.html \ indexdata.html \ installation.debian.html \ @@ -73,8 +72,9 @@ HTMLFILES = \ shadow-registers.html \ simple-indexing.html \ support.html \ - toc.hhc \ - zebraidx.html + zebraidx.html \ + htmlhelp.hhp \ + toc.hhc PNGFILES=zebra.png diff --git a/include/idzebra/version.h b/include/idzebra/version.h index 51feab9..7baa02f 100644 --- a/include/idzebra/version.h +++ b/include/idzebra/version.h @@ -1,4 +1,4 @@ -/* $Id: version.h,v 1.5 2006-06-13 12:03:58 adam Exp $ +/* $Id: version.h,v 1.6 2006-06-26 15:11:31 marc Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -22,9 +22,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #ifndef ZEBRAVER -#define ZEBRAVER "1.4.1" +#define ZEBRAVER "2.0.0" -#define ZEBRADATE "$Date: 2006-06-13 12:03:58 $" +#define ZEBRADATE "$Date: 2006-06-26 15:11:31 $" #endif /* diff --git a/index/Makefile.am b/index/Makefile.am index d502baf..916d4fc 100644 --- a/index/Makefile.am +++ b/index/Makefile.am @@ -1,9 +1,11 @@ -## $Id: Makefile.am,v 1.41 2006-06-12 09:39:18 marc Exp $ +## $Id: Makefile.am,v 1.42 2006-06-26 15:11:33 marc Exp $ + noinst_PROGRAMS = apitest kdump lib_LTLIBRARIES = libidzebra-api.la +libidzebra_api_la_LDFLAGS=-version-info $(ZEBRALIBS_VERSION) libidzebra_api_la_SOURCES = \ api_swig.c attribute.c \ compact.c \ diff --git a/isamb/Makefile.am b/isamb/Makefile.am index 708d539..2348c82 100644 --- a/isamb/Makefile.am +++ b/isamb/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.8 2006-04-27 20:40:41 marc Exp $ +## $Id: Makefile.am,v 1.9 2006-06-26 15:11:34 marc Exp $ lib_LTLIBRARIES = libidzebra-isamb.la @@ -11,6 +11,7 @@ tstisamb_LDADD = libidzebra-isamb.la \ ../bfile/libidzebra-bfile.la \ ../util/libidzebra-util.la $(YAZLALIB) +libidzebra_isamb_la_LDFLAGS=-version-info $(ZEBRALIBS_VERSION) libidzebra_isamb_la_SOURCES = isamb.c AM_CPPFLAGS=-I$(srcdir)/../include $(YAZINC) diff --git a/isamc/Makefile.am b/isamc/Makefile.am index 68b3557..7633e5c 100644 --- a/isamc/Makefile.am +++ b/isamc/Makefile.am @@ -1,7 +1,8 @@ -## $Id: Makefile.am,v 1.7 2004-09-30 08:16:49 adam Exp $ +## $Id: Makefile.am,v 1.8 2006-06-26 15:11:36 marc Exp $ lib_LTLIBRARIES = libidzebra-isamc.la +libidzebra_isamc_la_LDFLAGS=-version-info $(ZEBRALIBS_VERSION) libidzebra_isamc_la_SOURCES = isamc.c merge.c isamc-p.h AM_CPPFLAGS = -I$(srcdir)/../include -I$(srcdir)/../index $(YAZINC) diff --git a/isams/Makefile.am b/isams/Makefile.am index d199ea3..a736897 100644 --- a/isams/Makefile.am +++ b/isams/Makefile.am @@ -1,7 +1,8 @@ -## $Id: Makefile.am,v 1.3 2004-08-24 10:37:18 adam Exp $ +## $Id: Makefile.am,v 1.4 2006-06-26 15:11:37 marc Exp $ lib_LTLIBRARIES = libidzebra-isams.la AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC) +libidzebra_isams_la_LDFLAGS=-version-info $(ZEBRALIBS_VERSION) libidzebra_isams_la_SOURCES = isams.c diff --git a/recctrl/Makefile.am b/recctrl/Makefile.am index fc154a8..6bc4092 100644 --- a/recctrl/Makefile.am +++ b/recctrl/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.21 2006-06-02 13:55:55 marc Exp $ +## $Id: Makefile.am,v 1.22 2006-06-26 15:11:39 marc Exp $ common_libs = libidzebra-recctrl.la \ ../data1/libidzebra-data1.la \ @@ -61,7 +61,7 @@ EXTRA_LTLIBRARIES = \ # The common library lib_LTLIBRARIES = libidzebra-recctrl.la libidzebra_recctrl_la_SOURCES = recctrl.c recgrs.c sgmlread.c rectext.c -libidzebra_recctrl_la_LDFLAGS = -export-dynamic +libidzebra_recctrl_la_LDFLAGS = -export-dynamic -version-info $(ZEBRALIBS_VERSION) libidzebra_recctrl_la_LIBADD = $(STATIC_MODULE_OBJ) \ ../data1/libidzebra-data1.la \ ../dfa/libidzebra-dfa.la \ diff --git a/rset/Makefile.am b/rset/Makefile.am index c31202b..0b681ab 100644 --- a/rset/Makefile.am +++ b/rset/Makefile.am @@ -1,6 +1,7 @@ -## $Id: Makefile.am,v 1.13 2004-09-28 13:06:35 heikki Exp $ +## $Id: Makefile.am,v 1.14 2006-06-26 15:11:41 marc Exp $ lib_LTLIBRARIES = libidzebra-rset.la +libidzebra_rset_la_LDFLAGS=-version-info $(ZEBRALIBS_VERSION) libidzebra_rset_la_SOURCES = rset.c rstemp.c rsnull.c rsbool.c rsbetween.c \ rsisamc.c rsmultiandor.c rsisams.c rsisamb.c rsprox.c diff --git a/tab/Makefile.am b/tab/Makefile.am index a7c6069..8170ba0 100644 --- a/tab/Makefile.am +++ b/tab/Makefile.am @@ -1,7 +1,7 @@ -## $Id: Makefile.am,v 1.7 2006-06-21 13:29:08 marc Exp $ +## $Id: Makefile.am,v 1.8 2006-06-26 15:11:42 marc Exp $ tabdatadir = $(pkgdatadir)/tab -tabdata_DATA = bib1.att dan1.att danbib.abs danmarc.abs danmarc.mar \ +tabdata_DATA = bib1.att dan1.att danmarc.abs danmarc.mar \ default.idx explain.abs explain.att explain.tag generic.tag gils.abs \ gils-a.est gils.att gils-b.est gils-f.est gils-g.est gils-summary.map \ gils.tag gils-usmarc.map gils-variant.est hci.flt idxpath.att mail.flt \ diff --git a/tab/danbib.abs b/tab/danbib.abs deleted file mode 100644 index 148881e..0000000 --- a/tab/danbib.abs +++ /dev/null @@ -1,14 +0,0 @@ -name danbib - -attset bib1.att - -elm 245 title - -elm 245/a title title:w -elm 245/e authortitle author-title:w,author-title:p -elm 260 publisher - -elm 260/? publisher publisher:w -elm 504 notes - -elm 504/a notes abstract:w -elm year1 year1 date:w -elm limit1 language code-language:w -elm limit2 recordtype record-type:w diff --git a/util/Makefile.am b/util/Makefile.am index 4cba0d4..aa2b203 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.18 2006-05-19 13:49:38 adam Exp $ +## $Id: Makefile.am,v 1.19 2006-06-26 15:11:43 marc Exp $ lib_LTLIBRARIES = libidzebra-util.la @@ -17,6 +17,7 @@ DISTCLEANFILES = idzebra-config AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC) -DDEFAULT_PROFILE_PATH=\"$(pkgdatadir)/tab\" LDADD = libidzebra-util.la $(YAZLALIB) +libidzebra_util_la_LDFLAGS=-version-info $(ZEBRALIBS_VERSION) libidzebra_util_la_SOURCES = zint.c res.c charmap.c zebramap.c passwddb.c \ zebra-lock.c dirent.c xpath.c atoi_zn.c snippet.c flock.c attrfind.c diff --git a/win/zebra.nsi b/win/zebra.nsi index a7a8535..6c0253c 100644 --- a/win/zebra.nsi +++ b/win/zebra.nsi @@ -1,6 +1,6 @@ -; $Id: zebra.nsi,v 1.31 2006-06-07 18:26:02 adam Exp $ +; $Id: zebra.nsi,v 1.32 2006-06-26 15:11:44 marc Exp $ -!define VERSION "1.4.0" +!define VERSION "2.0.0" ; VS 2005 !define VS_RUNTIME_DLL "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\msvcr80.dll" -- 1.7.10.4