renamed packages to *idzebra-2.0-*
authorMarc Cromme <marc@indexdata.dk>
Thu, 29 Jun 2006 11:20:39 +0000 (11:20 +0000)
committerMarc Cromme <marc@indexdata.dk>
Thu, 29 Jun 2006 11:20:39 +0000 (11:20 +0000)
26 files changed:
debian/control
debian/idzebra-2.0-common.init [new file with mode: 0644]
debian/idzebra-2.0-common.install [new file with mode: 0644]
debian/idzebra-2.0-doc.install [new file with mode: 0644]
debian/idzebra-2.0-utils.install [new file with mode: 0644]
debian/idzebra-2.0-utils.manpages [new file with mode: 0644]
debian/idzebra2.0-common.init.test [deleted file]
debian/idzebra2.0-common.install [deleted file]
debian/idzebra2.0-doc.install [deleted file]
debian/idzebra2.0-utils.install [deleted file]
debian/idzebra2.0-utils.manpages [deleted file]
debian/libidzebra-2.0-dev.install [new file with mode: 0644]
debian/libidzebra-2.0-dev.manpages [new file with mode: 0644]
debian/libidzebra-2.0-mod-alvis.install [new file with mode: 0644]
debian/libidzebra-2.0-mod-grs-marc.install [new file with mode: 0644]
debian/libidzebra-2.0-mod-grs-regx.install [new file with mode: 0644]
debian/libidzebra-2.0-mod-grs-xml.install [new file with mode: 0644]
debian/libidzebra-2.0.install [new file with mode: 0644]
debian/libidzebra2.0-dev.install [deleted file]
debian/libidzebra2.0-dev.manpages [deleted file]
debian/libidzebra2.0-mod-alvis.install [deleted file]
debian/libidzebra2.0-mod-grs-marc.install [deleted file]
debian/libidzebra2.0-mod-grs-regx.install [deleted file]
debian/libidzebra2.0-mod-grs-xml.install [deleted file]
debian/libidzebra2.0.install [deleted file]
debian/rules

index e4b4957..3198633 100644 (file)
@@ -3,12 +3,12 @@ Priority: optional
 Maintainer: Adam Dickmeiss <adam@indexdata.dk>
 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
+Build-Depends: libyaz-dev (>= 2.1.22), libexpat1-dev, tcl8.4-dev, libbz2-dev, libxslt1-dev
 
-Package: idzebra2.0
+Package: idzebra-2.0
 Section: text
 Architecture: any
-Provides: libidzebra2.0-dev, idzebra2.0-utils, libidzebra2.0-modules, idzebra2.0-doc
+Provides: libidzebra-2.0-dev, idzebra-2.0-utils, libidzebra-2.0-modules, idzebra-2.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: libidzebra2.0-modules
+Package: libidzebra-2.0-modules
 Section: libs
 Architecture: any
-Provides: libidzebra2.0-mod-grs-xml, libidzebra2.0-mod-grs-regx, libidzebra2.0-mod-marc
+Provides: libidzebra-2.0-mod-grs-xml, libidzebra-2.0-mod-grs-regx, libidzebra-2.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: idzebra2.0-common
+Package: idzebra-2.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: idzebra2.0-utils
+Package: idzebra-2.0-utils
 Section: text
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: idzebra2.0-mod-grs-xml, idzebra2.0-mod-grs-regx, idzebra2.0-mod-marc
+Recommends: idzebra-2.0-mod-grs-xml, idzebra-2.0-mod-grs-regx, idzebra-2.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: libidzebra2.0-dev
+Package: libidzebra-2.0-dev
 Section: devel
 Architecture: any
-Depends: libidzebra2.0 (= ${Source-Version})
+Depends: libidzebra-2.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: libidzebra2.0
+Package: libidzebra-2.0
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, idzebra2.0-common
+Depends: ${shlibs:Depends}, idzebra-2.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: libidzebra2.0-mod-alvis
+Package: libidzebra-2.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: libidzebra2.0-mod-grs-marc
+Package: libidzebra-2.0-mod-grs-marc
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -110,7 +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: libidzebra2.0-mod-grs-regx
+Package: libidzebra-2.0-mod-grs-regx
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -122,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: libidzebra2.0-mod-grs-xml
+Package: libidzebra-2.0-mod-grs-xml
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -135,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: idzebra2.0-doc
+Package: idzebra-2.0-doc
 Section: doc
 Architecture: all
 Conflicts: idzebra
diff --git a/debian/idzebra-2.0-common.init b/debian/idzebra-2.0-common.init
new file mode 100644 (file)
index 0000000..b6c1d4d
--- /dev/null
@@ -0,0 +1,232 @@
+#! /bin/sh
+# $Id: idzebra-2.0-common.init,v 1.1 2006-06-29 11:20:39 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/idzebra-2.0-common.install b/debian/idzebra-2.0-common.install
new file mode 100644 (file)
index 0000000..0c6a2f1
--- /dev/null
@@ -0,0 +1 @@
+usr/share/idzebra-2.0
diff --git a/debian/idzebra-2.0-doc.install b/debian/idzebra-2.0-doc.install
new file mode 100644 (file)
index 0000000..c5a8b69
--- /dev/null
@@ -0,0 +1 @@
+usr/share/doc/idzebra-2.0 usr/share/doc/idzebra-2.0-doc 
diff --git a/debian/idzebra-2.0-utils.install b/debian/idzebra-2.0-utils.install
new file mode 100644 (file)
index 0000000..d839031
--- /dev/null
@@ -0,0 +1,2 @@
+usr/bin/zebraidx-2.0
+usr/bin/zebrasrv-2.0
diff --git a/debian/idzebra-2.0-utils.manpages b/debian/idzebra-2.0-utils.manpages
new file mode 100644 (file)
index 0000000..3d268eb
--- /dev/null
@@ -0,0 +1,2 @@
+doc/zebrasrv-2.0.8
+doc/zebraidx-2.0.1
diff --git a/debian/idzebra2.0-common.init.test b/debian/idzebra2.0-common.init.test
deleted file mode 100644 (file)
index 021084f..0000000
+++ /dev/null
@@ -1,232 +0,0 @@
-#! /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
deleted file mode 100644 (file)
index 0c6a2f1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/idzebra-2.0
diff --git a/debian/idzebra2.0-doc.install b/debian/idzebra2.0-doc.install
deleted file mode 100644 (file)
index af6830b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/idzebra-2.0 usr/share/doc/idzebra2.0-doc 
diff --git a/debian/idzebra2.0-utils.install b/debian/idzebra2.0-utils.install
deleted file mode 100644 (file)
index d839031..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/zebraidx-2.0
-usr/bin/zebrasrv-2.0
diff --git a/debian/idzebra2.0-utils.manpages b/debian/idzebra2.0-utils.manpages
deleted file mode 100644 (file)
index 3d268eb..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-doc/zebrasrv-2.0.8
-doc/zebraidx-2.0.1
diff --git a/debian/libidzebra-2.0-dev.install b/debian/libidzebra-2.0-dev.install
new file mode 100644 (file)
index 0000000..5c9acf1
--- /dev/null
@@ -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-2.0
diff --git a/debian/libidzebra-2.0-dev.manpages b/debian/libidzebra-2.0-dev.manpages
new file mode 100644 (file)
index 0000000..c0a9735
--- /dev/null
@@ -0,0 +1 @@
+doc/idzebra-config.1
diff --git a/debian/libidzebra-2.0-mod-alvis.install b/debian/libidzebra-2.0-mod-alvis.install
new file mode 100644 (file)
index 0000000..3912e35
--- /dev/null
@@ -0,0 +1 @@
+usr/lib/idzebra-2.0/modules/mod-alvis.so
diff --git a/debian/libidzebra-2.0-mod-grs-marc.install b/debian/libidzebra-2.0-mod-grs-marc.install
new file mode 100644 (file)
index 0000000..3148524
--- /dev/null
@@ -0,0 +1 @@
+usr/lib/idzebra-2.0/modules/mod-grs-marc.so
diff --git a/debian/libidzebra-2.0-mod-grs-regx.install b/debian/libidzebra-2.0-mod-grs-regx.install
new file mode 100644 (file)
index 0000000..1dbec7c
--- /dev/null
@@ -0,0 +1 @@
+usr/lib/idzebra-2.0/modules/mod-grs-regx.so
diff --git a/debian/libidzebra-2.0-mod-grs-xml.install b/debian/libidzebra-2.0-mod-grs-xml.install
new file mode 100644 (file)
index 0000000..9f5293d
--- /dev/null
@@ -0,0 +1 @@
+usr/lib/idzebra-2.0/modules/mod-grs-xml.so
diff --git a/debian/libidzebra-2.0.install b/debian/libidzebra-2.0.install
new file mode 100644 (file)
index 0000000..cfd2838
--- /dev/null
@@ -0,0 +1 @@
+usr/lib/libidzebra-*.so.*
diff --git a/debian/libidzebra2.0-dev.install b/debian/libidzebra2.0-dev.install
deleted file mode 100644 (file)
index 5c9acf1..0000000
+++ /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-2.0
diff --git a/debian/libidzebra2.0-dev.manpages b/debian/libidzebra2.0-dev.manpages
deleted file mode 100644 (file)
index c0a9735..0000000
+++ /dev/null
@@ -1 +0,0 @@
-doc/idzebra-config.1
diff --git a/debian/libidzebra2.0-mod-alvis.install b/debian/libidzebra2.0-mod-alvis.install
deleted file mode 100644 (file)
index c935600..0000000
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/idzebra-2.0/mod-alvis.so
diff --git a/debian/libidzebra2.0-mod-grs-marc.install b/debian/libidzebra2.0-mod-grs-marc.install
deleted file mode 100644 (file)
index 50e8d55..0000000
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/idzebra-2.0/mod-grs-marc.so
diff --git a/debian/libidzebra2.0-mod-grs-regx.install b/debian/libidzebra2.0-mod-grs-regx.install
deleted file mode 100644 (file)
index 9c0d961..0000000
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/idzebra-2.0/mod-grs-regx.so
diff --git a/debian/libidzebra2.0-mod-grs-xml.install b/debian/libidzebra2.0-mod-grs-xml.install
deleted file mode 100644 (file)
index 97d5240..0000000
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/idzebra-2.0/mod-grs-xml.so
diff --git a/debian/libidzebra2.0.install b/debian/libidzebra2.0.install
deleted file mode 100644 (file)
index cfd2838..0000000
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libidzebra-*.so.*
index dc3d0e8..160c4f2 100755 (executable)
@@ -33,7 +33,7 @@ build-stamp:  config.status
        dh_testdir
 
        # Add here commands to compile the package.
-       $(MAKE)
+       $(MAKE) -j8
 
        touch build-stamp
 
@@ -43,7 +43,7 @@ clean:
        rm -f build-stamp 
 
        # Add here commands to clean up after the build process.
-       -$(MAKE) distclean
+       -$(MAKE) -j8 distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
        if [! -f config.sub] ; then cp -f /usr/share/misc/config.sub config.sub ; fi
 endif
@@ -61,7 +61,7 @@ install: build
        dh_installdirs
 
        # Add here commands to install the package into debian/tmp
-       $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+       $(MAKE) -j8 install DESTDIR=$(CURDIR)/debian/tmp
 
 
 # Build architecture-independent files here.
@@ -92,9 +92,9 @@ binary-arch: build install
        dh_fixperms
 #      dh_perl
 #      dh_python
-       dh_makeshlibs -V 'libidzebra2.0 (>= 2.0.0)' -X mod-
+       dh_makeshlibs -V 'libidzebra-2.0 (>= 2.0.0)' -X mod-
        dh_installdeb
-       dh_shlibdeps -l debian/libidzebra2.0/usr/lib
+       dh_shlibdeps -l debian/libidzebra-2.0/usr/lib
        dh_gencontrol
        dh_md5sums
        dh_builddeb