Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz

diff --git a/.gitignore b/.gitignore
index 1955557..51f0c13 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,3 @@ build-stamp
 config.guess
 config.sub
 *~
-debian/*.debhelper.log
-debian/*.substvars
-debian/*.postinst.debhelper
-debian/*.postrm.debhelper

diff --git a/debian/.gitignore b/debian/.gitignore
index 28a6ec3..efd5c63 100644 (file)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -1,13 +1,13 @@
 copyright
 files
-libyaz
-libyaz-dev
-libyaz.postinst.debhelper
-libyaz.postrm.debhelper
-libyaz.substvars
+libyaz3
+libyaz3-dev
+yaz-icu
+yaz-illclient
 tmp
 yaz
 yaz-doc
-yaz-ziffy
-yaz-ziffy.substvars
-yaz.substvars
+*.debhelper.log
+*.substvars
+*.postinst.debhelper
+*.postrm.debhelper

diff --git a/debian/libyaz.postinst b/debian/libyaz.postinst
deleted file mode 100644 (file)
index ee8321c..0000000
--- a/debian/libyaz.postinst
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /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#