New Debian sarge packages

diff --git a/Makefile.am b/Makefile.am
index c61a483..0d65ba9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.18 2004-09-28 12:52:03 adam Exp $
+## $Id: Makefile.am,v 1.19 2004-09-30 06:59:44 adam Exp $

 
 AUTOMAKE_OPTIONS=foreign
 
 
 AUTOMAKE_OPTIONS=foreign
 

@@ -22,11 +22,13 @@ dist-hook:
                fi; \
        done
        mkdir $(distdir)/debian
                fi; \
        done
        mkdir $(distdir)/debian

-       cp $(srcdir)/debian/control $(distdir)/debian
+       cp $(srcdir)/debian/*.install $(distdir)/debian
+       cp $(srcdir)/debian/*.manpages $(distdir)/debian

        cp $(srcdir)/debian/changelog $(distdir)/debian
        cp $(srcdir)/debian/changelog $(distdir)/debian

-       cp $(srcdir)/debian/rules $(distdir)/debian
-       cp $(srcdir)/debian/postinst $(distdir)/debian
+       cp $(srcdir)/debian/compat $(distdir)/debian
+       cp $(srcdir)/debian/control $(distdir)/debian

        cp $(srcdir)/debian/copyright $(distdir)/debian
        cp $(srcdir)/debian/copyright $(distdir)/debian

+       cp $(srcdir)/debian/rules $(distdir)/debian

 
 rpm: $(PACKAGE)-$(VERSION).tar.gz
        cp $(PACKAGE)-$(VERSION).tar.gz /usr/src/redhat/SOURCES
 
 rpm: $(PACKAGE)-$(VERSION).tar.gz
        cp $(PACKAGE)-$(VERSION).tar.gz /usr/src/redhat/SOURCES

diff --git a/debian/changelog b/debian/changelog
index 5d2bcb5..be1de4a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,164 +1,6 @@
-idzebra (1.3.16-1) unstable; urgency=low
+idzebra (1.4.0-1) unstable; urgency=low

 
 

-  * Cut-off character. Note: New Index Structure so re-indexing is
-    necessary.
+  * New package structure. Zebra 1.4 series.

 
 

- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 30 Jul 2004 12:00:00 +0200
-
-idzebra (1.3.15-1) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Thu, 15 Jan 2004 15:10:55 +0100
-
-idzebra (1.3.14-1) unstable; urgency=low
-
-  * upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Sat, 29 Nov 2003 17:04:56 +0100
-
-idzebra (1.3.13-1) unstable; urgency=low
-
-  * upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 26 Sep 2003 12:28:45 +0200
-
-idzebra (1.3.12-3) unstable; urgency=low
-
-  * Compress man pages.
-    Fix bug in regx/tcl filter(introduced in 1.3.11).
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 16 Sep 2003 12:01:00 +0200
-
-idzebra (1.3.12-2) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Mon,  8 Sep 2003 12:29:18 +0200
-
-idzebra (1.3.12-1) unstable; urgency=low
-
-  * Write PID file in lockdir.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Thu, 21 Aug 2003 12:30:22 +0200
-
-idzebra (1.3.11-3) unstable; urgency=low
-
-  * png files part of documentation.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Wed,  7 May 2003 16:07:30 +0100
-
-idzebra (1.3.11-2) unstable; urgency=low
-
-  * New YAZ layout. idzebra-doc architecture independent.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Mon, 28 Apr 2003 20:07:21 +0100
-
-idzebra (1.3.11-1) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 25 Apr 2003 11:46:01 +0100
-
-idzebra (1.3.10-1) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Tue,  1 Apr 2003 09:47:25 +0100
-
-idzebra (1.3.8-1) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 26 Mar 2003 21:57:20 +0100
-
-idzebra (1.3.7-1) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Thu, 27 Feb 2003 12:28:03 +0100
-
-idzebra (1.3.5-2) unstable; urgency=low
-
-  * Updated for YAZ 2.0-2
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Mon, 24 Feb 2003 15:31:22 +0100
-
-idzebra (1.3.5-1) unstable; urgency=low
-
-  * Updated for YAZ 1.9.3+.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Sun, 23 Feb 2003 22:30:29 +0100
-
-idzebra (1.3.4-2) unstable; urgency=low
-
-  * Fixed bug in sort for unset entries at end of sort file.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 10 Dec 2002 13:53:10 +0100
-
-idzebra (1.3.4-1) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 26 Nov 2002 14:45:30 +0100
-
-idzebra (1.3.3-6) unstable; urgency=low
-
-  * Another sort bug fix.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Thu, 24 Oct 2002 23:55:30 +0100
-
-idzebra (1.3.3-5) unstable; urgency=low
-
-  * data1 part of zebra. fix sort.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Thu, 24 Oct 2002  9:54:29 +0100
-
-idzebra (1.3.3-4) unstable; urgency=low
-
-  * fix system tags for GRS-1 retrieval.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Wed,  9 Oct 2002 22:56:24 +0100
-
-idzebra (1.3.3-3) unstable; urgency=low
-
-  * official release.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri,  5 Oct 2002 20:25:51 +0100
-
-idzebra (1.3.3-2) unstable; urgency=low
-
-  * fix scan.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Thu,  3 Oct 2002 11:40:21 +0100
-
-idzebra (1.3.3-1) unstable; urgency=low
-
-  * upstream version.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 18 Sep 2002 22:47:54 +0100
-
-idzebra (1.3.2-3) unstable; urgency=low
-
-  * remove redundant dependency in debian/rules.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 13 Sep 2002 22:27:47 +0100
-
-idzebra (1.3.2-2) unstable; urgency=low
-
-  * copyright refers to GPL-2 rather than including it.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 11 Sep 2002 22:10:11 +0100
-
-idzebra (1.3.2-1) unstable; urgency=low
-
-  * Second debian package
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Mon,  9 Sep 2002 11:23:51 +0100
-
-zebra (1.3.1-1) unstable; urgency=low
-
-  * First debian package
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Wed,  5 Sep 2002 16:33:09 +0100
+ -- Adam Dickmeiss <adam@indexdata.dk>  Thu, 30 Sep 2004 08:45:51 +0200

 
 

diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..b8626c4
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+4

diff --git a/debian/control b/debian/control
index b70414e..e590364 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,31 +1,150 @@
 Source: idzebra
 Source: idzebra

-Standards-Version: 3.5.9.0
+Priority: optional

 Maintainer: Adam Dickmeiss <adam@indexdata.dk>
 Maintainer: Adam Dickmeiss <adam@indexdata.dk>

-Priority: extra
+Build-Depends: debhelper (>= 4.0.0)
+Standards-Version: 3.6.0

 Build-Depends: libyaz-dev (>= 2.0.2), libexpat1-dev, tcl8.3-dev, libbz2-dev
 
 Build-Depends: libyaz-dev (>= 2.0.2), libexpat1-dev, tcl8.3-dev, libbz2-dev
 

-Package: idzebra-doc
-Section: doc
-Architecture: all
-Recommends: idzebra
-Description: Documentation for the Zebra engine.
- Zebra is a high-performance, general-purpose structured text indexing
+Package: idzebra1.4
+Section: text
+Architecture: any
+Provides: libidzebra1.4-dev, idzebra1.4-utils, libidzebra1.4-modules, idzebra1.4-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,
+ documentation and modules.
+ .
+ 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-modules
+Section: libs
+Architecture: any
+Provides: libidzebra1.4-mod-grs-xml, libidzebra1.4-mod-grs-regx, libidzebra1.4-mod-marc, libidzebra1.4-mod-danbib
+Description: IDZebra modules 
+ This virtual package contains all base IDZebra filter modules.
+ .
+ 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
  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. 
+ boolean search expressions and relevance-ranked free-text queries.
+
+Package: idzebra1.4-common
+Section: text
+Architecture: all
+Conflicts: idzebra
+Description: IDZebra common files
+ This package includes common essential IDZebra configuration files.

  .
  .

- This package contains documentation for the Zebra engine.
+ 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: idzebra
+Package: idzebra1.4-utils

 Section: text
 Architecture: any
 Depends: ${shlibs:Depends}
 Section: text
 Architecture: any
 Depends: ${shlibs:Depends}

-Description: High-performance, text indexing and retrieval engine.
- Zebra is a high-performance, general-purpose structured text indexing
+Recommends: idzebra1.4-mod-grs-xml, idzebra1.4-mod-grs-regx, idzebra1.4-mod-marc
+Conflicts: idzebra
+Description: IDZebra utility programs
+ This package contains IDZebra utilities such as the zebraidx indexer
+ utility and the zebrasrv server.
+ .
+ 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-dev
+Section: devel
+Architecture: any
+Depends: libidzebra1.4 (= ${Source-Version})
+Description: IDZebra development
+ This package contains IDZebra development files, such as libraries
+ and header files.
+ .
+ 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
  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. 
+ boolean search expressions and relevance-ranked free-text queries.
+
+Package: libidzebra1.4
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, idzebra1.4-common
+Conflicts: idzebra
+Description: IDZebra libraries
+ This package contains all run-time libraries for IDZebra.

  .
  .

- The Zebra software is copyright Index Data and distributed under the
- GPLv2 license.
+ 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-marc
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: IDZebra filter grs.marc (ISO2709 MARC reader)
+ This package includes the grs.marc and grs.marcxml filters that allows
+ IDZebra to read MARC records based on ISO2709.
+ .
+ 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-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
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: IDZebra filters grs.regx, grs.tcl
+ This package includes the grs.regx and grs.tcl filters.
+ .
+ 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-xml
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: IDZebra filter grs.xml (XML filter)
+ This package includes the grs.xml filter which uses Expat to
+ parse records in XML and turn them into IDZebra's internal grs node.
+ .
+ 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: idzebra1.4-doc
+Section: doc
+Architecture: all
+Conflicts: idzebra
+Description: IDZebra documentation
+ This package includes documentation for IDZebra in PDF and HTML.
+ .
+ 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.

 
 

diff --git a/debian/copyright b/debian/copyright
index a7df4b1..ee38fe1 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,16 @@
-This package was created by Adam Dickmeiss on
-Thu, 20 Feb 2003 16:57:51 +0100.
+This package was debianized by Adam Dickmeiss <adam@indexdata.dk> on
+Tue, 28 Sep 2004 15:35:02 +0200.

 
 It was downloaded from http://ftp.indexdata.dk/pub/zebra/
 
 
 It was downloaded from http://ftp.indexdata.dk/pub/zebra/
 

-Copyright:
+idzebra is Copyright (C) 1995-2004 Index Data ApS

 
 

-Copyright (c) 1995-2003 Index Data ApS.
+idzebra is primarily written by Adam Dickmeiss, Heikki Levanto
+and Sebastian Hammer.

 
 You are free to distribute this software under the terms of
 the GNU General Public License.
 On Debian systems, the complete text of the GNU General Public
 License can be found in the file `/usr/share/common-licenses/GPL'.
 
 
 You are free to distribute this software under the terms of
 the GNU General Public License.
 On Debian systems, the complete text of the GNU General Public
 License can be found in the file `/usr/share/common-licenses/GPL'.
 

-$Id: copyright,v 1.2 2003-02-20 21:13:37 adam Exp $
+$Id: copyright,v 1.3 2004-09-30 06:59:44 adam Exp $

diff --git a/debian/idzebra1.4-common.install b/debian/idzebra1.4-common.install
new file mode 100644 (file)
index 0000000..9bd85aa
--- /dev/null
+++ b/debian/idzebra1.4-common.install
@@ -0,0 +1 @@
+usr/share/idzebra

diff --git a/debian/idzebra1.4-doc.install b/debian/idzebra1.4-doc.install
new file mode 100644 (file)
index 0000000..59c9472
--- /dev/null
+++ b/debian/idzebra1.4-doc.install
@@ -0,0 +1 @@
+usr/share/doc/idzebra-doc

diff --git a/debian/idzebra1.4-utils.install b/debian/idzebra1.4-utils.install
new file mode 100644 (file)
index 0000000..5aedf07
--- /dev/null
+++ b/debian/idzebra1.4-utils.install
@@ -0,0 +1,2 @@
+usr/bin/zebraidx
+usr/bin/zebrasrv

diff --git a/debian/idzebra1.4-utils.manpages b/debian/idzebra1.4-utils.manpages
new file mode 100644 (file)
index 0000000..e5c15a7
--- /dev/null
+++ b/debian/idzebra1.4-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
new file mode 100644 (file)
index 0000000..e6c52d6
--- /dev/null
+++ b/debian/libidzebra1.4-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/libidzebra1.4-dev.manpages b/debian/libidzebra1.4-dev.manpages
new file mode 100644 (file)
index 0000000..c0a9735
--- /dev/null
+++ b/debian/libidzebra1.4-dev.manpages
@@ -0,0 +1 @@
+doc/idzebra-config.1

diff --git a/debian/libidzebra1.4-mod-grs-danbib.install b/debian/libidzebra1.4-mod-grs-danbib.install
new file mode 100644 (file)
index 0000000..51104cd
--- /dev/null
+++ b/debian/libidzebra1.4-mod-grs-danbib.install
@@ -0,0 +1 @@
+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
new file mode 100644 (file)
index 0000000..9b57191
--- /dev/null
+++ b/debian/libidzebra1.4-mod-grs-marc.install
@@ -0,0 +1 @@
+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
new file mode 100644 (file)
index 0000000..ae93d73
--- /dev/null
+++ b/debian/libidzebra1.4-mod-grs-regx.install
@@ -0,0 +1 @@
+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
new file mode 100644 (file)
index 0000000..3ca4fb2
--- /dev/null
+++ b/debian/libidzebra1.4-mod-grs-xml.install
@@ -0,0 +1 @@
+usr/lib/idzebra/mod-grs-xml.so

diff --git a/debian/libidzebra1.4.install b/debian/libidzebra1.4.install
new file mode 100644 (file)
index 0000000..78427e0
--- /dev/null
+++ b/debian/libidzebra1.4.install
@@ -0,0 +1 @@
+usr/lib/libidzebra-*.so.0*

diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644 (file)
index bfa9a1d..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-# Postinst script for Zebra

diff --git a/debian/rules b/debian/rules
index 0d2e6f1..0be463e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,126 +1,104 @@
 #!/usr/bin/make -f
 #!/usr/bin/make -f

-# 
-# Script for building Zebra from source to .deb-packages.
-#
-# Created by Adam Dickmeiss, based on script by
-# Morten Hendriksen <mgh@dbc.dk>  and from Joey Hess.
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.

 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 

-# This is the debhelper compatability version to use.
-export DH_COMPAT=2
+# 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)

 
 

-CONFIG_FLAGS=--with-tclconfig=/usr/lib/tcl8.3 --with-yaz=/usr/bin --prefix=/usr

 
 

-# Enable parallel builds if CONCURRENCY_LEVEL is set
-ifdef CONCURRENCY_LEVEL
-MCFLAGS=-j$(CONCURRENCY_LEVEL)
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+       CFLAGS += -O0

 else
 else

-MCFLAGS=
+       CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+       INSTALL_PROGRAM += -s

 endif
 
 endif
 

-ZEBRASRCDIR?=$(shell pwd)
-
-# Local library path for linking with right dependencies
-LOCAL_LINK=-ldebian/idzebra/usr/lib
-
-$(ZEBRASRCDIR)/configure: $(ZEBRASRCDIR)/configure.in
-       cd $(ZEBRASRCDIR); sh buildconf.sh
-
-stamp-configure: $(ZEBRASRCDIR)/configure
+config.status: configure

        dh_testdir
        dh_testdir

+       # Add here commands to configure the package.
+       CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-shared --with-yaz=/usr/bin --with-tclconfig=/usr/lib/tcl8.3

 
 

-       -rm -rf build
-       mkdir build
-       cd build; $(ZEBRASRCDIR)/configure $(CONFIG_FLAGS)
-       touch stamp-configure
-
-build: stamp-build
-stamp-build: stamp-configure
+build: build-stamp
+build-stamp:  config.status

        dh_testdir
 
        # Add here commands to compile the package.
        dh_testdir
 
        # Add here commands to compile the package.

-       $(MAKE) -C build $(MCFLAGS)
+       $(MAKE)

 
 

-       touch stamp-build
+       touch build-stamp

 
 clean:
        dh_testdir
 
 clean:
        dh_testdir

-       #dh_testroot
-       -rm -f stamp-*
-       -rm -rf build
+       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)" ""
+       cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+       cp -f /usr/share/misc/config.guess config.guess
+endif

 
 

-       dh_clean
-       -rm -rf debian/idzebra debian/*.debhelper debian/substvars

 
 

-install: stamp-install
-stamp-install: stamp-build
+       dh_clean 
+
+install: build

        dh_testdir
        dh_testroot
        dh_testdir
        dh_testroot

-       dh_clean -k -a
-       dh_installdirs -a
+       dh_clean -k 
+       dh_installdirs

 
 

-       # Add here commands to install the package into debian/tmp.
-       -mkdirhier debian/tmp/usr
-       $(MAKE) -C build install prefix=`pwd`/debian/tmp/usr
+       # Add here commands to install the package into debian/tmp
+       $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp

 
 

-       touch stamp-install

 
 # Build architecture-independent files here.
 binary-indep: build install
 
 # Build architecture-independent files here.
 binary-indep: build install

-       dh_testdir
-       dh_testroot
-       dh_installdocs -p idzebra-doc doc/*.html doc/*.pdf doc/*.png
-       dh_installchangelogs -p idzebra-doc
-       dh_link -p idzebra-doc
-       dh_strip -p idzebra-doc
-       dh_compress -p idzebra-doc
-       dh_fixperms -p idzebra-doc
-       dh_gencontrol -p idzebra-doc
-       dh_md5sums -p idzebra-doc
-
-       dh_builddeb -p idzebra-doc
+# We have nothing to do by default.

 
 # Build architecture-dependent files here.
 binary-arch: build install
        dh_testdir
        dh_testroot
 
 # Build architecture-dependent files here.
 binary-arch: build install
        dh_testdir
        dh_testroot

-       dh_movefiles -p idzebra usr/share/idzebra usr/bin
-
-       cp NEWS changelog
-       dh_installdocs --all README TODO changelog debian/copyright
-
-       dh_installchangelogs
+       dh_installchangelogs 
+       dh_installdocs
+       dh_installexamples
+       mv debian/tmp/usr/share/doc/idzebra debian/tmp/usr/share/doc/idzebra-doc
+       dh_install --sourcedir=debian/tmp
+#      dh_installmenu
+#      dh_installdebconf       
+#      dh_installlogrotate
+#      dh_installemacsen
+#      dh_installpam
+#      dh_installmime
+#      dh_installinit
+#      dh_installcron
+#      dh_installinfo
+       dh_installman

        dh_link
        dh_link

-
-       dh_installdeb -p idzebra
-       dh_installman -p idzebra doc/zebraidx.1 doc/zebrasrv.8
-

        dh_strip
        dh_strip

-       dh_compress -a
-       dh_fixperms -a
-
-       dh_shlibdeps -p idzebra $(LOCAL_LINK) 
-
-       cat debian/postinst >> debian/idzebra/DEBIAN/postinst
-       chmod +x debian/idzebra/DEBIAN/postinst
-
-       dh_gencontrol -p idzebra
-       dh_md5sums -p idzebra
-
-       # Go kill those CVS-dirs before build
-       -find debian/tmp -type d -name CVS | xargs rm -rf
-       # For some reason it is necessary to remove empty-dirs in doc
-       -rm -rf debian/tmp/usr/include debian/tmp/usr/share/aclocal debian/tmp/usr/lib debian/tmp/usr/bin \
-               debian/tmp/usr/share/idzebra
-
-       dh_builddeb -p idzebra
+       dh_compress
+       dh_fixperms
+#      dh_perl
+#      dh_python
+       dh_makeshlibs -V 'libidzebra1.4 (>= 1.4.0)' -X mod-
+       dh_installdeb
+       dh_shlibdeps -l debian/libidzebra1.4/usr/lib
+       dh_gencontrol
+       dh_md5sums
+       dh_builddeb

 
 binary: binary-indep binary-arch
 
 binary: binary-indep binary-arch

-.PHONY: build clean binary-indep binary-arch binary install install-stamp configure
-
-zebrarelease:
-       # Conveniency target for building zebra
-       dh_testdir
-       dpkg-buildpackage $(EXTRA_OPTS) -rfakeroot
+.PHONY: build clean binary-indep binary-arch binary install