Minor fixes for Debian build

diff --git a/Makefile.am b/Makefile.am
index 0ab6318..ec09583 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.12 2001-11-20 09:25:45 adam Exp $
+## $Id: Makefile.am,v 1.13 2002-03-23 20:09:52 adam Exp $

 
 AUTOMAKE_OPTIONS = foreign 
 
 
 AUTOMAKE_OPTIONS = foreign 
 

@@ -19,7 +19,10 @@ dist-hook:
        mkdir $(distdir)/win
        -cp $(srcdir)/win/* $(distdir)/win
        mkdir $(distdir)/debian
        mkdir $(distdir)/win
        -cp $(srcdir)/win/* $(distdir)/win
        mkdir $(distdir)/debian

-       -cp $(srcdir)/debian/* $(distdir)/debian
+       cp $(srcdir)/debian/control $(distdir)/debian
+       cp $(srcdir)/debian/changelog $(distdir)/debian
+       cp $(srcdir)/debian/rules $(distdir)/debian
+       cp $(srcdir)/debian/postinst $(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/control b/debian/control
index fc06203..0b803ca 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Description: The YAZ Z39.50 toolkit (runtime files)
  and further information is available at http://www.indexdata.dk/
 
 Package: yaz-devel
  and further information is available at http://www.indexdata.dk/
 
 Package: yaz-devel

-Depends: yaz-runtime, ${shlibs:Depends}
+Depends: yaz-runtime

 Section: devel
 Architecture: any
 Recommends: yaz-doc
 Section: devel
 Architecture: any
 Recommends: yaz-doc

diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644 (file)
index 6235cb1..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 1995-2002, Index Data.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation, in whole or in part, for any purpose, is hereby granted,
- * provided that:
- *
- * 1. This copyright and permission notice appear in all copies of the
- * software and its documentation. Notices of copyright or attribution
- * which appear at the beginning of any file must remain unchanged.
- *
- * 2. The names of Index Data or the individual authors may not be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
- * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- *
- */

diff --git a/debian/rules b/debian/rules
index c98e936..32d80d2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -136,15 +136,15 @@ endif
        # Ugh Ugly hack
        cat debian/postinst >> debian/yaz-runtime/DEBIAN/postinst
 
        # Ugh Ugly hack
        cat debian/postinst >> debian/yaz-runtime/DEBIAN/postinst
 

-       dh_md5sums -p yaz-runtime

        dh_gencontrol -p yaz-runtime
        dh_gencontrol -p yaz-runtime

+       dh_md5sums -p yaz-runtime

 
 

-       dh_md5sums -p yaz-devel

        dh_gencontrol -p yaz-devel
        dh_gencontrol -p yaz-devel

+       dh_md5sums -p yaz-devel

 
 ifeq ($(YAZ_WITH_SSL),1)
 
 ifeq ($(YAZ_WITH_SSL),1)

-       dh_md5sums -p yaz-ssl

        dh_gencontrol -p yaz-ssl
        dh_gencontrol -p yaz-ssl

+       dh_md5sums -p yaz-ssl

 endif
        # Go kill those CVS-dirs before build
        -find debian/tmp -type d -name CVS | xargs rm -rf
 endif
        # Go kill those CVS-dirs before build
        -find debian/tmp -type d -name CVS | xargs rm -rf