Debian package upgrade to follow policy 3.6.2 and renamed libjaz to libyaz2.

Virtual package libyaz created for transition period. Lib API number
bumped to 2.1.0

diff --git a/Makefile.am b/Makefile.am
index 6e4c6d1..cbcc146 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## This file is part of the YAZ toolkit.
 ## Copyright (C) 1994-2005, Index Data, All rights reserved.
 ## This file is part of the YAZ toolkit.
 ## Copyright (C) 1994-2005, Index Data, All rights reserved.

-## $Id: Makefile.am,v 1.32 2006-03-30 16:30:25 adam Exp $
+## $Id: Makefile.am,v 1.33 2006-04-21 12:54:36 marc Exp $

 
 AUTOMAKE_OPTIONS = foreign 
 
 
 AUTOMAKE_OPTIONS = foreign 
 

@@ -23,7 +23,6 @@ dist-hook:
        cp $(srcdir)/debian/control $(distdir)/debian
        cp $(srcdir)/debian/changelog $(distdir)/debian
        cp $(srcdir)/debian/rules $(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
-       cp $(srcdir)/debian/compat $(distdir)/debian
+       cp $(srcdir)/debian/*.postinst $(distdir)/debian

        cp $(srcdir)/debian/*.install $(distdir)/debian
 
        cp $(srcdir)/debian/*.install $(distdir)/debian
 

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

diff --git a/debian/control b/debian/control
index 8d4e3d6..492dc5b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,17 @@
 Source: yaz
 Source: yaz

-Standards-Version: 3.6.1
+Section: devel
+Standards-Version: 3.6.2

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

-Build-Depends: debhelper, libxml2-dev, libssl-dev, libreadline5-dev, libwrap0-dev
+Build-Depends: debhelper (>= 4), libxml2-dev, libssl-dev, libreadline5-dev, libwrap0-dev

 
 

-Package: libyaz
+Package: libyaz2

 Section: libs
 Architecture: any
 Section: libs
 Architecture: any

-Depends: ${shlibs:Depends}
-Replaces: yaz-runtime, yaz-ssl
-Conflicts: yaz-runtime, yaz-ssl, idzebra (<= 1.3.4-2), php4-yaz (<= 4.1.2-5)
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Provides: libyaz
+Replaces: libyaz
+Conflicts: idzebra (<= 1.3.4-2), php4-yaz (<= 4.1.2-5)

 Description: The YAZ Z39.50 toolkit (runtime files)
  YAZ is a toolkit that allows you to develop software using the
  ANSI Z39.50/ISO23950 standard for information retrieval.
 Description: The YAZ Z39.50 toolkit (runtime files)
  YAZ is a toolkit that allows you to develop software using the
  ANSI Z39.50/ISO23950 standard for information retrieval.

@@ -19,7 +21,7 @@ Description: The YAZ Z39.50 toolkit (runtime files)
 Package: yaz
 Section: utils
 Architecture: any
 Package: yaz
 Section: utils
 Architecture: any

-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}

 Conflicts: yaz-runtime, yaz-ssl
 Description: The YAZ Z39.50 toolkit (utilities)
  YAZ is a toolkit that allows you to develop software using the
 Conflicts: yaz-runtime, yaz-ssl
 Description: The YAZ Z39.50 toolkit (utilities)
  YAZ is a toolkit that allows you to develop software using the

@@ -37,7 +39,7 @@ Description: The YAZ Z39.50 toolkit (documentation)
  This packages includes documentation for YAZ in HTML and PDF.
 
 Package: libyaz-dev
  This packages includes documentation for YAZ in HTML and PDF.
 
 Package: libyaz-dev

-Depends: libyaz (= ${Source-Version}), libxml2-dev, libwrap0-dev, libssl-dev
+Depends: libyaz2 (= ${Source-Version}), libxml2-dev, libwrap0-dev, libssl-dev

 Replaces: yaz-devel
 Conflicts: yaz-devel
 Section: devel
 Replaces: yaz-devel
 Conflicts: yaz-devel
 Section: devel

diff --git a/debian/libyaz.install b/debian/libyaz.install
deleted file mode 100644 (file)
index 4da001b..0000000
--- a/debian/libyaz.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/lib*.so.*
-debian/tmp/usr/share/man/man7/yaz.7

diff --git a/debian/libyaz2.install b/debian/libyaz2.install
new file mode 100644 (file)
index 0000000..4da001b
--- /dev/null
+++ b/debian/libyaz2.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/lib*.so.*
+debian/tmp/usr/share/man/man7/yaz.7

diff --git a/debian/libyaz2.postinst b/debian/libyaz2.postinst
new file mode 100755 (executable)
index 0000000..ee8321c
--- /dev/null
+++ b/debian/libyaz2.postinst
@@ -0,0 +1,45 @@
+#! /bin/sh
+# postinst script for tklite
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+    configure)
+        ldconfig
+        exit 0
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+        exit 0
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#

diff --git a/debian/postinst b/debian/postinst
deleted file mode 100755 (executable)
index 66fff7e..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-# Postinst script for YAZ
-ldconfig

diff --git a/debian/rules b/debian/rules
index 279153e..3b8c2c6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 

+# Force compat level four
+export DH_COMPAT=4

 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)

@@ -24,14 +26,6 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
        INSTALL_PROGRAM += -s
 endif
 
        INSTALL_PROGRAM += -s
 endif
 

-# shared library versions, option 1
-version=2.0.5
-major=2
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#version=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`

 
 config.status: configure
        dh_testdir
 
 config.status: configure
        dh_testdir

@@ -104,7 +98,7 @@ binary-arch: build install
        dh_fixperms
 #      dh_perl
 #      dh_python
        dh_fixperms
 #      dh_perl
 #      dh_python

-       dh_makeshlibs -V 'libyaz (>= 2.1.17)'
+       dh_makeshlibs -V 'libyaz2 (>= 2.1.18)'

        dh_installdeb
        dh_shlibdeps  -l debian/libyaz/usr/lib
        dh_gencontrol
        dh_installdeb
        dh_shlibdeps  -l debian/libyaz/usr/lib
        dh_gencontrol

diff --git a/src/Makefile.am b/src/Makefile.am
index b94e6d4..27112a1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,8 @@
 ## This file is part of the YAZ toolkit.
 ## Copyright (C) 1994-2006, Index Data, All rights reserved.
 ## This file is part of the YAZ toolkit.
 ## Copyright (C) 1994-2006, Index Data, All rights reserved.

-## $Id: Makefile.am,v 1.31 2006-04-20 08:24:31 adam Exp $
+## $Id: Makefile.am,v 1.32 2006-04-21 12:54:36 marc Exp $

 
 

-YAZ_VERSION_INFO=2:0:0
+YAZ_VERSION_INFO=2:1:0

 
 lib_LTLIBRARIES = libyaz.la libyazthread.la
 # noinst_PROGRAMS = cqlparse
 
 lib_LTLIBRARIES = libyaz.la libyazthread.la
 # noinst_PROGRAMS = cqlparse