* purged existance of the unixlogin package, as we decide that in the postinst progre...

diff --git a/citadel/debian/citadel-server.install b/citadel/debian/citadel-server.install
index a841cbd8519be4e1193ba207bedb855b7aa350b3..87a82b32dac195c78df84b946ec5bfa6e4573e91 100644 (file)
--- a/citadel/debian/citadel-server.install
+++ b/citadel/debian/citadel-server.install
@@ -7,3 +7,5 @@ debian/tmp/usr/sbin/sendcommand
 debian/tmp/usr/sbin/base64
 debian/tmp/usr/lib/citadel-server/setup
 debian/tmp/usr/lib/citadel-server/ctdlsvc
+debian/tmp/usr/sbin/chkpwd
+

diff --git a/citadel/debian/citadel-server.postinst b/citadel/debian/citadel-server.postinst
index d9cb9422b4d9a808a9d24bbe20f1f938b2125d88..51276284fcfafb3fea3ab50329a7aaf4d728a5e4 100644 (file)
--- a/citadel/debian/citadel-server.postinst
+++ b/citadel/debian/citadel-server.postinst
@@ -156,6 +156,8 @@ case "$1" in
 
     ### done! now we'll just clear up our cruft.
     #rm -f $tempfile
+        chown root:root /usr/sbin/chkpwd
+        chmod 4755 /usr/sbin/chkpwd
 
        db_get citadel/Administrator && admin="$RET"
        db_get citadel/ServerIPAddress && ip_addr="$RET"

diff --git a/citadel/debian/citadel-server.substvars b/citadel/debian/citadel-server.substvars
index 3c6c9728301bcce24ff59702d7bd31f226b06824..8e416c9cab240162157b8ff8734859d46758758d 100644 (file)
--- a/citadel/debian/citadel-server.substvars
+++ b/citadel/debian/citadel-server.substvars
@@ -1,2 +1,2 @@
 misc:Depends=debconf (>= 0.5) | debconf-2.0
-shlibs:Depends=libc6 (>= 2.3.6-6), libdb4.4, libldap2 (>= 2.1.17-1), libncurses5 (>= 5.4-5), libsieve2-1, libssl0.9.8 (>= 0.9.8c-1), zlib1g (>= 1:1.2.1)
+shlibs:Depends=libc6 (>= 2.3.6-6), libdb4.4, libldap2 (>= 2.1.17-1), libncurses5 (>= 5.4-5), libpam0g (>= 0.76), libsieve2-1, libssl0.9.8 (>= 0.9.8c-1), zlib1g (>= 1:1.2.1)

diff --git a/citadel/debian/citadel-unixlogin.install b/citadel/debian/citadel-unixlogin.install
deleted file mode 100644 (file)
index d9704f6..0000000
--- a/citadel/debian/citadel-unixlogin.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/sbin/chkpwd
-

diff --git a/citadel/debian/citadel-unixlogin.postinst b/citadel/debian/citadel-unixlogin.postinst
deleted file mode 100644 (file)
index 7d5e2f5..0000000
--- a/citadel/debian/citadel-unixlogin.postinst
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/sh
-# postinst.skeleton
-# Skeleton maintainer script showing all the possible cases.
-# Written by Charles Briscoe-Smith, March-June 1998.  Public Domain.
-
-# Abort if any command returns an error value
-set -e
-
-# Use debconf.
-. /usr/share/debconf/confmodule
-
-# This script is called as the last step of the installation of the
-# package.  All the package's files are in place, dpkg has already done
-# its automatic conffile handling, and all the packages we depend of
-# are already fully installed and configured.
-
-# The following idempotent stuff doesn't generally need protecting
-# against being run in the abort-* cases.
-
-
-case "$1" in
-  configure)
-    # Configure this package.  If the package must prompt the user for
-    # information, do it here.
-       chown root:root /usr/sbin/chkpwd
-       chmod 4755 /usr/sbin/chkpwd
-       ;;
-  abort-upgrade)
-    # Back out of an attempt to upgrade this package FROM THIS VERSION
-    # to version $2.  Undo the effects of "prerm upgrade $2".
-    #:
-
-    ;;
-  abort-remove)
-    ###if test "$2" != in-favour; then
-    ###  echo "$0: undocumented call to \`postinst $*'" 1>&2
-    ###  exit 0
-    ###fi
-    #### Back out of an attempt to remove this package, which was due to
-    #### a conflict with package $3 (version $4).  Undo the effects of
-    #### "prerm remove in-favour $3 $4".
-    ###:
-
-    ;;
-  abort-deconfigure)
-    ###if test "$2" != in-favour -o "$5" != removing; then
-    ###  echo "$0: undocumented call to \`postinst $*'" 1>&2
-    ###  exit 0
-    ###fi
-    #### Back out of an attempt to deconfigure this package, which was
-    #### due to package $6 (version $7) which we depend on being removed
-    #### to make way for package $3 (version $4).  Undo the effects of
-    #### "prerm deconfigure in-favour $3 $4 removing $6 $7".
-    ###:
-
-    ;;
-  *) echo "$0: didn't understand being called with \`$1'" 1>&2
-     exit 0;;
-esac
-
-exit 0

diff --git a/citadel/debian/citadel-unixlogin.substvars b/citadel/debian/citadel-unixlogin.substvars
deleted file mode 100644 (file)
index 96d819b..0000000
--- a/citadel/debian/citadel-unixlogin.substvars
+++ /dev/null
@@ -1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.3.6-6), libpam0g (>= 0.76)