Debian package updates: Depends on libyazpp1. Build-Depends: libyazpp-dev.

Generate package libyazproxy1, libyazproxy-dev, yazproxy. Move usr/share
files from libyazproxy1 to yazproxy. Move compat spec to rules. postinst
for libyazproxy1 only. Move man pages to .manpages-files.

diff --git a/Makefile.am b/Makefile.am
index 38eb6ed..f84b6d5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,5 +13,6 @@ dist-hook:
        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/*.postinst $(distdir)/debian
        cp $(srcdir)/debian/*.install $(distdir)/debian
+       cp $(srcdir)/debian/*.manpages $(distdir)/debian

diff --git a/debian/changelog b/debian/changelog
index 814f725..733d9fb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+yazproxy (1.0.1.4-1) unstable; urgency=low
+
+  * Depends on libyazpp1, Build-Depends: libyazpp-dev.
+  * Generate package libyazproxy1, libyazproxy-dev, yazproxy.
+  * Move usr/share files from libyazproxy1 to yazproxy.
+  * Move compat spec to rules.
+  * postinst for libyazproxy1 only.
+  * Move man pages to .manpages-files.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 25 Apr 2006 22:10:49 +0200
+
 yazproxy (1.0.1-1) unstable; urgency=low
 
   * Upstream.

diff --git a/debian/control b/debian/control
index f569b7f..2d598e6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,19 +2,19 @@ Source: yazproxy
 Priority: optional
 Maintainer: Adam Dickmeiss <adam@indexdata.dk>
 Standards-Version: 3.6.0
-Build-Depends: debhelper (>= 4.0.0), docbook-utils, docbook, docbook-xml, docbook-dsssl, jade, jadetex,libxml2-dev, libxslt1-dev, libyaz-dev (>= 2.0.9), libyazpp1-dev(>= 1.0)
+Build-Depends: debhelper (>= 4.0.0), docbook-utils, docbook, docbook-xml, docbook-dsssl, jade, jadetex,libxml2-dev, libxslt1-dev, libyaz-dev (>= 2.1.18), libyazpp-dev(>= 1.0)
 
 Package: yazproxy
 Section: utils
 Architecture: any
-Depends: libyazproxy (= ${Source-Version})
+Depends: libyazproxy1 (= ${Source-Version})
 Description: YAZ Proxy.
  YAZ proxy is a daemon that accepts Z39.50/SRW/SRU incoming requests and
  converts them to Z39.50 client requests. The proxy has several facilities
  to optimize performance and tries to reduce the commnication with the
  backend server.
 
-Package: libyazproxy
+Package: libyazproxy1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, libyazpp1 (>= 1.0)
@@ -27,7 +27,7 @@ Description: YAZ Proxy libraries.
 Package: libyazproxy-dev
 Section: devel
 Architecture: any
-Depends: libyazproxy (= ${Source-Version}), libxml2-dev, libxslt1-dev, libyazpp1-dev, libyaz-dev
+Depends: libyazproxy1 (= ${Source-Version}), libxml2-dev, libxslt1-dev, libyazpp-dev, libyaz-dev
 Description: YAZ Proxy development libraries.
  YAZ proxy is a daemon that accepts Z39.50/SRW/SRU incoming requests and
  converts them to Z39.50 client requests. The proxy has several facilities

diff --git a/debian/libyazproxy-dev.install b/debian/libyazproxy-dev.install
index 1405b10..c67438c 100644 (file)
--- a/debian/libyazproxy-dev.install
+++ b/debian/libyazproxy-dev.install
@@ -1,4 +1,4 @@
 debian/tmp/usr/include/yazproxy/*.h
 debian/tmp/usr/lib/libyazproxy*.a
-debian/tmp/usr/lib/libyazproyx*.so
+debian/tmp/usr/lib/libyazproxy*.so
 debian/tmp/usr/lib/libyazproxy*.la

diff --git a/debian/libyazproxy.install b/debian/libyazproxy.install
deleted file mode 100644 (file)
index ff54d1d..0000000
--- a/debian/libyazproxy.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/libyazproxy*.so.*
-debian/tmp/usr/share/yazproxy/*

diff --git a/debian/libyazproxy1.install b/debian/libyazproxy1.install
new file mode 100644 (file)
index 0000000..8e814bc
--- /dev/null
+++ b/debian/libyazproxy1.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libyazproxy*.so.*

diff --git a/debian/libyazproxy1.postinst b/debian/libyazproxy1.postinst
new file mode 100755 (executable)
index 0000000..b1c9f23
--- /dev/null
+++ b/debian/libyazproxy1.postinst
@@ -0,0 +1,45 @@
+#! /bin/sh
+# postinst script
+#
+# 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 9a62a33..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-# Postinst script for yazproxy
-ldconfig

diff --git a/debian/rules b/debian/rules
index d81a3c8..53fe731 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -108,9 +108,9 @@ binary-arch: build install
        dh_fixperms
 #      dh_perl
 #      dh_python
-       dh_makeshlibs -V 'libyazproxy (>= 0.9)'
+       dh_makeshlibs -V 'libyazproxy1 (>= 1.0)'
        dh_installdeb
-       dh_shlibdeps -l debian/libyazproxy/usr/lib
+       dh_shlibdeps -l debian/libyazproxy1/usr/lib
        dh_gencontrol
        dh_md5sums
        dh_builddeb

diff --git a/debian/yazproxy.install b/debian/yazproxy.install
index 6133dfe..10f87da 100644 (file)
--- a/debian/yazproxy.install
+++ b/debian/yazproxy.install
@@ -1,2 +1,2 @@
 debian/tmp/usr/bin/yazproxy
-debian/tmp/usr/share/man/man8/yazproxy.8
+debian/tmp/usr/share/yazproxy/*

diff --git a/debian/yazproxy.manpages b/debian/yazproxy.manpages
new file mode 100644 (file)
index 0000000..1bc40b5
--- /dev/null
+++ b/debian/yazproxy.manpages
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man8/yazproxy.8