Debian package update

diff --git a/debian/changelog b/debian/changelog
index 74c4923..68ac2d8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+yaz (1.8.6-1) unstable; urgency=low
+
+  * Package yaz-ssl instead of yaz-runtime-ssl.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Sat, 23 Mar 2002 02:39:07 +0100
+
 yaz (1.8.6-1MGH) unstable; urgency=low
 
   * New upstrean release

diff --git a/debian/control b/debian/control
index 9c22d07..fc06203 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,6 @@ Package: yaz-runtime
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: yaz-runtime-ssl
 Description: The YAZ Z39.50 toolkit (runtime files)
  The YAZ-toolkit is a C-toolkit for building
  origins and/or targets using the Z39.50 protocol for
@@ -49,3 +48,17 @@ Description: The YAZ Z39.50 toolkit (development files)
  YAZ is made by the danish software company Index Data
  and further information is available at http://www.indexdata.dk/
 
+Package: yaz-ssl
+Depends: ${shlibs:Depends}
+Section: libs
+Architecture: any
+Description: The YAZ Z39.50 toolkit (SSL support)
+ The YAZ-toolkit is a C-toolkit for building
+ origins and/or targets using the Z39.50 protocol for
+ information retrieval.
+ .
+ YAZ supports a substantial subset of the Z39.50 standard
+ and features a SSL protocol layer as an option.
+ .
+ YAZ is made by the danish software company Index Data
+ and further information is available at http://www.indexdata.dk/

diff --git a/debian/copyright b/debian/copyright
index b58f690..6235cb1 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1 +1,26 @@
-Please see the file LICENSE for distribution info
+/*
+ * 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 198a0b6..c98e936 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@
 # This is the debhelper compatability version to use.
 export DH_COMPAT=2
 
-YAZ_WITH_SSL?=0
+YAZ_WITH_SSL?=1
 CONFIG_FLAGS=--enable-static --enable-shared --enable-tcpd --prefix=/usr
 
 # Enable parallel builds if CONCURRENCY_LEVEL is set
@@ -35,7 +35,7 @@ YAZSRCDIR?=$(shell pwd)
 export YAZ_VERSION
 
 # Local library path for linking with right dependencies
-LOCAL_LINK=-ldebian/yaz-runtime/usr/lib/
+LOCAL_LINK=-ldebian/yaz-runtime/usr/lib:debian/yaz-ssl/usr/lib
 
 $(YAZSRCDIR)/configure: $(YAZSRCDIR)/configure.in
        cd $(YAZSRCDIR); sh buildconf.sh
@@ -65,7 +65,7 @@ clean:
        -rm -rf build
 
        dh_clean
-       -rm -rf debian/yaz-runtime debian/yaz-runtime-ssl debian/yaz-devel \
+       -rm -rf debian/yaz-runtime debian/yaz-ssl debian/yaz-devel \
                debian/with-ssl debian/*.debhelper debian/substvars debian/shlibs.yaz-*
 
 install: stamp-install
@@ -100,13 +100,16 @@ binary-indep: build install
 binary-arch: build install
        dh_testdir
        dh_testroot
-       dh_movefiles -p yaz-devel  usr/share/aclocal usr/lib/*.a usr/include usr/bin
-       dh_movefiles -p yaz-runtime usr/lib usr/share/yaz
+ifeq ($(YAZ_WITH_SSL),1)
+       dh_movefiles -p yaz-ssl usr/bin/*ssl usr/lib/libyazssl* 
+endif
+       dh_movefiles -p yaz-devel  usr/share/aclocal usr/lib/*.a usr/lib/*.la usr/lib/*.so usr/include 
+       dh_movefiles -p yaz-runtime usr/lib usr/share/yaz usr/bin
        dh_installexamples -p yaz-devel
 
-       dh_installdocs --all README TODO LICENSE CHANGELOG debian/copyright
-       mv debian/yaz-runtime/usr/share/doc/yaz-runtime/CHANGELOG debian/yaz-runtime/usr/share/doc/yaz-runtime/changelog
-       mv debian/yaz-devel/usr/share/doc/yaz-devel/CHANGELOG debian/yaz-devel/usr/share/doc/yaz-devel/changelog
+       cp LICENSE debian/copyright
+       cp CHANGELOG changelog
+       dh_installdocs --all README TODO changelog debian/copyright
 
        dh_installchangelogs
        dh_link
@@ -116,40 +119,33 @@ binary-arch: build install
 
        dh_installdeb -p yaz-runtime
        dh_installdeb -p yaz-devel
-
-       dh_shlibdeps -p yaz-runtime $(LOCAL_LINK) -- debian/yaz-runtime/usr/lib/*.so
-       dh_shlibdeps -p yaz-devel $(LOCAL_LINK) -- debian/yaz-devel/usr/bin/*
-
-       dh_undocumented -p yaz-devel yaz-client.1 yaz-comp.1 yaz-config.1 yaz-ztest.1 zoomsh.1
-ifeq ($(YAZ_WITH_SSL),1)
-       dh_undocumented -p yaz-devel yaz-client-ssl.1 yaz-ztest-ssl.1
-       echo "libyaz 1 yaz-runtime-ssl" > debian/yaz-runtime/DEBIAN/shlibs
-       echo "libyazthread 1 yaz-runtime-ssl" >> debian/yaz-runtime/DEBIAN/shlibs
-       echo "libyazmalloc 1 yaz-runtime-ssl" >> debian/yaz-runtime/DEBIAN/shlibs
-       echo "libyazssl 1 yaz-runtime-ssl" >> debian/yaz-runtime/DEBIAN/shlibs
-       # Move doc dir
-       mv debian/yaz-runtime/usr/share/doc/yaz-runtime debian/yaz-runtime/usr/share/doc/yaz-runtime-ssl
-       mv debian/yaz-devel/usr/share/doc/yaz-devel debian/yaz-devel/usr/share/doc/yaz-devel-ssl
-else
+       dh_undocumented -p yaz-runtime yaz-client.1 yaz-comp.1 yaz-config.1 yaz-ztest.1 zoomsh.1
        echo "libyaz 1 yaz-runtime" > debian/yaz-runtime/DEBIAN/shlibs
        echo "libyazthread 1 yaz-runtime" >> debian/yaz-runtime/DEBIAN/shlibs
        echo "libyazmalloc 1 yaz-runtime" >> debian/yaz-runtime/DEBIAN/shlibs
-endif
        chmod 644 debian/yaz-runtime/DEBIAN/shlibs
-
+       dh_shlibdeps -p yaz-runtime $(LOCAL_LINK) 
+ifeq ($(YAZ_WITH_SSL),1)
+       dh_installdeb -p yaz-ssl
+       dh_undocumented -p yaz-ssl yaz-client-ssl.1 yaz-ztest-ssl.1
+       echo "libyazssl 1 yaz-ssl" >> debian/yaz-ssl/DEBIAN/shlibs
+       chmod 644 debian/yaz-ssl/DEBIAN/shlibs
+       dh_shlibdeps -p yaz-ssl $(LOCAL_LINK)
+       cat debian/postinst >> debian/yaz-ssl/DEBIAN/postinst
+endif
        # Ugh Ugly hack
        cat debian/postinst >> debian/yaz-runtime/DEBIAN/postinst
 
        dh_md5sums -p yaz-runtime
-       dh_md5sums -p yaz-devel
-ifeq ($(YAZ_WITH_SSL),1)
-       dh_gencontrol -p yaz-runtime -- -DPackage=yaz-runtime-ssl -DConflicts=yaz-runtime -DReplaces=yaz-runtime -DProvides=yaz-runtime
-       dh_gencontrol -p yaz-devel -- -DPackage=yaz-devel-ssl -DConflicts=yaz-devel -DReplaces=yaz-devel
-else
        dh_gencontrol -p yaz-runtime
+
+       dh_md5sums -p yaz-devel
        dh_gencontrol -p yaz-devel
-endif
 
+ifeq ($(YAZ_WITH_SSL),1)
+       dh_md5sums -p yaz-ssl
+       dh_gencontrol -p yaz-ssl
+endif
        # 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 yaz-doc
@@ -158,6 +154,9 @@ endif
 
        dh_builddeb -p yaz-runtime
        dh_builddeb -p yaz-devel
+ifeq ($(YAZ_WITH_SSL),1)
+       dh_builddeb -p yaz-ssl
+endif
 
 
 binary: binary-indep binary-arch