From 389f31c0d1f81063cb19769ec56d05af03fd4228 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Tue, 2 Jan 2007 16:35:48 +0000 Subject: [PATCH] * added patches from Fathi boudra * remove ucf alltogether * debian changelog: * Initial Debian release * Removed useless files: * citadel-client.examples * citadel-doc.docs * citadel-mta.postrm * citadel-server.1.manpage * citadel-server.examples * citadel-server.postrm.debhelper * files_preview * README.Debian * citadel-client.install: merged with citadel-client.examples * citadel-client.postinst: * clean up * removed ucf mechanisms * add debhelper token * citadel-doc.install : merged with citadel-doc.docs * citadel-mta.postinst: * clean up * add debhelper token * citadel-server.dirs: * clean up * add var/lib/citadel/data and var/run/citadel dir * moved messages and help to /etc/citadel * citadel-server.install: merged with citadel-server.examples * citadel-server.postinst: * clean up * remove mkdir call as we create them with citadel-server.dirs * remove loops as we don't use ucf here anymore. * add debhelper token * citadel-server.postrm: * clean up; remove ucf * add debhelper token * citadel-server.prerm: * clean up * use invoke-rc.d * add debhelper token * citadel-server.templates: add po support * compat: bumped to 5 * control: * priority set to extra instead optional * add myself in uploaders * add po-debconf to Build-Depends * bump Standards-Version to 3.7.2 * remove useless pre-depends on debconf * rewrite descriptions * add Replaces: mail-transport-agent to citadel-mta package * copyright: complete rewrite * docs: clean up * rules: * add explicit zlib extra configure option * exclude citadel.rc, intro, nice, summary from compression -- Fathi Boudra Fri, 29 Dec 2006 16:24:48 +0100 --- citadel/debian/README.Debian | 6 - citadel/debian/changelog | 56 ++++++++ citadel/debian/citadel-client.examples | 1 - citadel/debian/citadel-client.install | 3 +- citadel/debian/citadel-client.postinst | 94 +------------ citadel/debian/citadel-mta.postrm | 97 ------------- citadel/debian/citadel-server.dirs | 7 +- citadel/debian/citadel-server.examples | 5 - citadel/debian/citadel-server.install | 5 +- citadel/debian/citadel-server.postinst | 180 ++----------------------- citadel/debian/citadel-server.postrm | 107 ++------------- citadel/debian/citadel-server.prerm | 26 +++- citadel/debian/citadel.init | 2 + citadel/debian/control | 143 ++++++++++++++------ citadel/debian/rules | 41 +----- 15 files changed, 217 insertions(+), 556 deletions(-) delete mode 100644 citadel/debian/README.Debian delete mode 100644 citadel/debian/citadel-client.examples delete mode 100644 citadel/debian/citadel-mta.postrm diff --git a/citadel/debian/README.Debian b/citadel/debian/README.Debian deleted file mode 100644 index 7a83e015b..000000000 --- a/citadel/debian/README.Debian +++ /dev/null @@ -1,6 +0,0 @@ -citadel for Debian ------------------- - - - - -- Wilfried Goesgens , Sat, 23 Jul 2005 12:23:15 +0200 diff --git a/citadel/debian/changelog b/citadel/debian/changelog index bfac45824..58abc2154 100644 --- a/citadel/debian/changelog +++ b/citadel/debian/changelog @@ -1,3 +1,59 @@ +citadel (7.02-2) unstable; urgency=low + + * Initial Debian release + * Removed useless files: + * citadel-client.examples + * citadel-doc.docs + * citadel-mta.postrm + * citadel-server.1.manpage + * citadel-server.examples + * citadel-server.postrm.debhelper + * files_preview + * README.Debian + * citadel-client.install: merged with citadel-client.examples + * citadel-client.postinst: + * clean up + * removed ucf mechanisms + * add debhelper token + * citadel-doc.install : merged with citadel-doc.docs + * citadel-mta.postinst: + * clean up + * add debhelper token + * citadel-server.dirs: + * clean up + * add var/lib/citadel/data and var/run/citadel dir + * moved messages and help to /etc/citadel + * citadel-server.install: merged with citadel-server.examples + * citadel-server.postinst: + * clean up + * remove mkdir call as we create them with citadel-server.dirs + * remove loops as we don't use ucf here anymore. + * add debhelper token + * citadel-server.postrm: + * clean up; remove ucf + * add debhelper token + * citadel-server.prerm: + * clean up + * use invoke-rc.d + * add debhelper token + * citadel-server.templates: add po support + * compat: bumped to 5 + * control: + * priority set to extra instead optional + * add myself in uploaders + * add po-debconf to Build-Depends + * bump Standards-Version to 3.7.2 + * remove useless pre-depends on debconf + * rewrite descriptions + * add Replaces: mail-transport-agent to citadel-mta package + * copyright: complete rewrite + * docs: clean up + * rules: + * add explicit zlib extra configure option + * exclude citadel.rc, intro, nice, summary from compression + + -- Fathi Boudra Fri, 29 Dec 2006 16:24:48 +0100 + citadel (7.02-1) unstable; urgency=low * update to actual Citadel SVN. many new features. see Packages changelog. diff --git a/citadel/debian/citadel-client.examples b/citadel/debian/citadel-client.examples deleted file mode 100644 index 4a989af2a..000000000 --- a/citadel/debian/citadel-client.examples +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/etc/citadel/citadel.rc \ No newline at end of file diff --git a/citadel/debian/citadel-client.install b/citadel/debian/citadel-client.install index 3f8042ed9..e9cdefc50 100644 --- a/citadel/debian/citadel-client.install +++ b/citadel/debian/citadel-client.install @@ -1,3 +1,4 @@ debian/tmp/usr/bin/citadel debian/tmp/usr/bin/whobbs -debian/tmp/usr/bin/stress \ No newline at end of file +debian/tmp/usr/bin/stress +debian/tmp/etc/citadel/citadel.rc diff --git a/citadel/debian/citadel-client.postinst b/citadel/debian/citadel-client.postinst index 97c63f491..4e26edc6c 100644 --- a/citadel/debian/citadel-client.postinst +++ b/citadel/debian/citadel-client.postinst @@ -6,11 +6,6 @@ # Abort if any command returns an error value set -e -# 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. - case "$1" in configure) # Configure this package. If the package must prompt the user for @@ -24,94 +19,9 @@ case "$1" in --disabled-password citadel fi mkdir -p /etc/citadel - chown citadel:citadel /etc/citadel - gunzip -c /usr/share/doc/citadel-client/examples/citadel.rc.gz> /tmp/citadel.rc - ucf /tmp/citadel.rc /etc/citadel/citadel.rc - rm -f /tmp/citadel.rc - - ### We could also do this on the fly. The following is from Tore - ### Anderson: - - #. /usr/share/debconf/confmodule - - ### find out what the user answered. - # db_get foo/run_on_boot - # run_on_boot=$RET - # db_stop - - ### safely create a temporary file to generate our suggested - ### configuration file. - # tempfile=`tempfile` - # cat << _eof > $tempfile - ### Configuration file for Foo. - - ### this was answered by you, the user in a debconf dialogue - # RUNONBOOT=$run_on_boot - - ### this was not, as it has a sane default value. - # COLOUROFSKY=blue - - #_eof - - ### Note that some versions of debconf do not release stdin, so - ### the following invocation of ucf may not work, since the stdin - ### is never coneected to ucfr. - - ### now, invoke ucf, which will take care of the rest, and ask - ### the user if he wants to update his file, if it is modified. - #ucf $tempfile /etc/foo.conf - - ### done! now we'll just clear up our cruft. - #rm -f $tempfile - - - #### There are three sub-cases: - ###if test "${2+set}" != set; then - ### # We're being installed by an ancient dpkg which doesn't remember - ### # which version was most recently configured, or even whether - ### # there is a most recently configured version. - ### : - ### - ###elif test -z "$2" -o "$2" = ""; then - ### # The package has not ever been configured on this system, or was - ### # purged since it was last configured. - ### : - ### - ###else - ### # Version $2 is the most recently configured version of this - ### # package. - ### : - ### - ###fi + chown citadel:citadel /etc/citadel/citadel.rc ;; - 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". - ###: - + abort-upgrade|abort-remove|abort-deconfigure) ;; *) echo "$0: didn't understand being called with \`$1'" 1>&2 exit 0;; diff --git a/citadel/debian/citadel-mta.postrm b/citadel/debian/citadel-mta.postrm deleted file mode 100644 index 502e6cbde..000000000 --- a/citadel/debian/citadel-mta.postrm +++ /dev/null @@ -1,97 +0,0 @@ -#! /bin/sh -# postrm.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 - -# This script is called twice during the removal of the package; once -# after the removal of the package's files from the system, and as -# the final step in the removal of this package, after the package's -# conffiles have been removed. - -# Ensure the menu system is updated -: [ ! -x /usr/bin/update-menus ] || /usr/bin/update-menus - -case "$1" in - remove) - # This package is being removed, but its configuration has not yet - # been purged. - rm -f /usr/sbin/sendmail - - # Remove diversion - #: dpkg-divert --package foo --remove --rename \ - #: --divert /usr/bin/other.real /usr/bin/other - - # ldconfig is NOT needed during removal of a library, only during - # installation - - ;; - purge) - # This package has previously been removed and is now having - # its configuration purged from the system. - # remove the gunzipped setup executable. - # we mimic dpkg as closely as possible, so we remove configuration - # files with dpkg backup extensions too: - ### Some of the following is from Tore Anderson: - ### TODO: remove citadel from inittab! - ;; - disappear) - if test "$2" != overwriter; then - echo "$0: undocumented call to \`postrm $*'" 1>&2 - exit 0 - fi - # This package has been completely overwritten by package $3 - # (version $4). All our files are already gone from the system. - # This is a special case: neither "prerm remove" nor "postrm remove" - # have been called, because dpkg didn't know that this package would - # disappear until this stage. - : - - ;; - upgrade) - # About to upgrade FROM THIS VERSION to version $2 of this package. - # "prerm upgrade" has been called for this version, and "preinst - # upgrade" has been called for the new version. Last chance to - # clean up. - : - - ;; - failed-upgrade) - # About to upgrade from version $2 of this package TO THIS VERSION. - # "prerm upgrade" has been called for the old version, and "preinst - # upgrade" has been called for this version. This is only used if - # the previous version's "postrm upgrade" couldn't handle it and - # returned non-zero. (Fix old postrm bugs here.) - : - - ;; - abort-install) - # Back out of an attempt to install this package. Undo the effects of - # "preinst install...". There are two sub-cases. - : - - if test "${2+set}" = set; then - # When the install was attempted, version $2's configuration - # files were still on the system. Undo the effects of "preinst - # install $2". - : - - else - # We were being installed from scratch. Undo the effects of - # "preinst install". - : - - fi ;; - abort-upgrade) - # Back out of an attempt to upgrade this package from version $2 - # TO THIS VERSION. Undo the effects of "preinst upgrade $2". - : - - ;; - *) echo "$0: didn't understand being called with \`$1'" 1>&2 - exit 0;; -esac - -exit 0 diff --git a/citadel/debian/citadel-server.dirs b/citadel/debian/citadel-server.dirs index a62637444..d87069e82 100644 --- a/citadel/debian/citadel-server.dirs +++ b/citadel/debian/citadel-server.dirs @@ -1,15 +1,16 @@ usr/sbin usr/share/doc usr/share/doc/citadel-server -var/lib/citadel/help -var/lib/citadel/messages +var/lib/citadel/data var/lib/citadel/bio var/lib/citadel/bitbucket var/lib/citadel/files var/lib/citadel/images var/lib/citadel/info var/lib/citadel/userpics +var/run/citadel/ var/spool/citadel/network/spoolin var/spool/citadel/network/spoolout -var/spool/citadel/network/systems etc/citadel +etc/citadel/help +etc/citadel/messages diff --git a/citadel/debian/citadel-server.examples b/citadel/debian/citadel-server.examples index 162d7ac6b..a4f338f4d 100644 --- a/citadel/debian/citadel-server.examples +++ b/citadel/debian/citadel-server.examples @@ -1,7 +1,2 @@ -debian/tmp/var/lib/citadel/help/ -debian/tmp/var/lib/citadel/messages/ -debian/tmp/etc/citadel/public_clients -debian/tmp/etc/citadel/mail.aliases -debian/tmp/usr/share/doc/citadel-doc/database_cleanup.sh debian/tmp/usr/share/doc/citadel-doc/database_cleanup.sh diff --git a/citadel/debian/citadel-server.install b/citadel/debian/citadel-server.install index 8b4769dbd..be96b6622 100644 --- a/citadel/debian/citadel-server.install +++ b/citadel/debian/citadel-server.install @@ -7,4 +7,7 @@ debian/tmp/usr/sbin/sendcommand debian/tmp/usr/sbin/base64 debian/tmp/usr/lib/citadel-server/setup debian/tmp/usr/sbin/chkpwd - +debian/tmp/etc/citadel/mail.aliases +debian/tmp/etc/citadel/public_clients +debian/tmp/etc/citadel/messages/ +debian/tmp/etc/citadel/help/ \ No newline at end of file diff --git a/citadel/debian/citadel-server.postinst b/citadel/debian/citadel-server.postinst index 51276284f..5b10ff3f0 100644 --- a/citadel/debian/citadel-server.postinst +++ b/citadel/debian/citadel-server.postinst @@ -1,53 +1,15 @@ #! /bin/sh -# postinst.skeleton -# Skeleton maintainer script showing all the possible cases. -# Written by Charles Briscoe-Smith, March-June 1998. Public Domain. +# citadel-server.postinst +# by Wilfried Goesgens & Fathi Boudra -# 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. - -#### Install info files into the dir file -###: install-info --quiet --section "section pattern" "Section Title" \ -###: --description="Name of the document" /usr/info/foo.info -### -#### Create stub directories under /usr/local -###: if test ! -d /usr/local/lib/foo; then -###: if test ! -d /usr/local/lib; then -###: if mkdir /usr/local/lib; then -###: chown root.staff /usr/local/lib || true -###: chmod 2775 /usr/local/lib || true -###: fi -###: fi -###: if mkdir /usr/local/lib/foo; then -###: chown root.staff /usr/local/lib/foo || true -###: chmod 2775 /usr/local/lib/foo || true -###: fi -###: fi -### -#### Ensure the menu system is updated -###: [ ! -x /usr/bin/update-menus ] || /usr/bin/update-menus -### -#### Arrange for a daemon to be started at system boot time -###: update-rc.d foo default >/dev/null -### - - case "$1" in configure) - # Configure this package. If the package must prompt the user for - # information, do it here. if ! getent group citadel >/dev/null; then groupadd citadel fi @@ -58,30 +20,9 @@ case "$1" in fi mkdir -p /etc/citadel chown citadel:citadel /etc/citadel - # Activate menu-methods script - #: chmod a+x /etc/menu-methods/foo - - # Update ld.so cache - #: ldconfig - - # Make our version of a program available - #: update-alternatives \ - #: --install /usr/bin/program program /usr/bin/alternative 50 \ - #: --slave /usr/share/man/man1/program.1.gz program.1.gz \ - #: /usr/share/man/man1/alternative.1.gz - - # Tell ucf that the file in /usr/share/foo is the latest - # maintainer version, and let it handle how to manage the real - # confuguration file in /etc. This is how a static configuration - # file can be handled: - ucf /usr/share/doc/citadel-server/examples/mail.aliases /etc/citadel/mail.aliases - ucf /usr/share/doc/citadel-server/examples/public_clients /etc/citadel/public_clients #: !TODO: should network/systems go to /etc/citadel? - mkdir -p \ - /var/lib/citadel/help \ - /var/lib/citadel/messages \ /var/lib/citadel/data/ \ /var/lib/citadel/bio/ \ /var/lib/citadel/bitbucket/ \ @@ -91,71 +32,10 @@ case "$1" in /var/lib/citadel/userpics/ \ /var/spool/citadel/network/spoolin \ /var/spool/citadel/network/spoolout \ - /var/spool/citadel/network/spoolsystems \ - /var/run/citadel - - - mkdir -p /var/lib/citadel/help - for i in aide floors hours intro.gz mail network nice.gz policy software summary.gz; do - case $i in - *.gz) - j=`echo $i|sed "s;.gz;;"` - gunzip -c "/usr/share/doc/citadel-server/examples/help/$i" >"/tmp/$j" - i=$j - ;; - *) - cp "/usr/share/doc/citadel-server/examples/help/$i" "/tmp" - ;; - esac - ucf "/tmp/$i" "/var/lib/citadel/help/$i" - rm -f "/tmp/$i" - done - -# # TODO: there is a file named '?'. this gives trouble with ucf, so do it by hand for now. -# if test ! -e '/var/lib/citadel/help/?'; then -# cp '/usr/share/doc/citadel/examples/data/help/?' '/var/lib/citadel/help' -# fi - mkdir -p /var/lib/citadel/messages - for i in aideopt changepw dotopt entermsg entopt goodbye hello help mainmenu newuser readopt register roomaccess unlisted; do - ucf "/usr/share/doc/citadel-server/examples/messages/$i" "/var/lib/citadel/messages/$i" - - done - - chown -R citadel:citadel /var/lib/citadel /var/run/citadel /var/spool/citadel + /var/spool/citadel/network/spoolsystems - ### We could also do this on the fly. The following is from Tore - ### Anderson: - - #. /usr/share/debconf/confmodule + chown -R citadel:citadel /var/lib/citadel /var/spool/citadel - ### find out what the user answered. - # db_get foo/run_on_boot - # run_on_boot=$RET - - ### safely create a temporary file to generate our suggested - ### configuration file. - # tempfile=`tempfile` - # cat << _eof > $tempfile - ### Configuration file for Foo. - - ### this was answered by you, the user in a debconf dialogue - # RUNONBOOT=$run_on_boot - - ### this was not, as it has a sane default value. - # COLOUROFSKY=blue - - #_eof - - ### Note that some versions of debconf do not release stdin, so - ### the following invocation of ucf may not work, since the stdin - ### is never coneected to ucfr. - - ### now, invoke ucf, which will take care of the rest, and ask - ### the user if he wants to update his file, if it is modified. - #ucf $tempfile /etc/foo.conf - - ### done! now we'll just clear up our cruft. - #rm -f $tempfile chown root:root /usr/sbin/chkpwd chmod 4755 /usr/sbin/chkpwd @@ -175,8 +55,10 @@ case "$1" in export CREATE_XINETD_ENTRY=no export CREATE_INITTAB_ENTRY=no export NO_INIT_SCRIPTS=yes + echo "applying your settings." /usr/lib/citadel-server/setup -q + if test -S /var/run/citadel/citadel.socket; then /usr/sbin/sendcommand "DOWN" fi @@ -187,58 +69,14 @@ case "$1" in db_stop - #DEBHELPER# - #### There are three sub-cases: - ###if test "${2+set}" != set; then - ### # We're being installed by an ancient dpkg which doesn't remember - ### # which version was most recently configured, or even whether - ### # there is a most recently configured version. - ### : - ### - ###elif test -z "$2" -o "$2" = ""; then - ### # The package has not ever been configured on this system, or was - ### # purged since it was last configured. - ### : - ### - ###else - ### # Version $2 is the most recently configured version of this - ### # package. - ### : - ### - ###fi ;; - 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-upgrade|abort-remove|abort-deconfigure) ;; - 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;; + exit 1;; esac + #DEBHELPER# exit 0 diff --git a/citadel/debian/citadel-server.postrm b/citadel/debian/citadel-server.postrm index f5e5bf082..39d2c3d5f 100644 --- a/citadel/debian/citadel-server.postrm +++ b/citadel/debian/citadel-server.postrm @@ -1,123 +1,32 @@ #! /bin/sh -# postrm.skeleton -# Skeleton maintainer script showing all the possible cases. -# Written by Charles Briscoe-Smith, March-June 1998. Public Domain. . /usr/share/debconf/confmodule - -# Abort if any command returns an error value set -e -# This script is called twice during the removal of the package; once -# after the removal of the package's files from the system, and as -# the final step in the removal of this package, after the package's -# conffiles have been removed. - -# Ensure the menu system is updated -: [ ! -x /usr/bin/update-menus ] || /usr/bin/update-menus +db_version 2.0 case "$1" in remove) - # This package is being removed, but its configuration has not yet - # been purged. - - - # Remove diversion - #: dpkg-divert --package foo --remove --rename \ - #: --divert /usr/bin/other.real /usr/bin/other - - # ldconfig is NOT needed during removal of a library, only during - # installation - ;; purge) - # This package has previously been removed and is now having - # its configuration purged from the system. - # remove the gunzipped setup executable. - rm -f /usr/share/doc/citadel-server/contrib/setup - for i in '?' aide floors hours intro mail network nice policy software summary; do - ucf --purge "/var/lib/citadel/help/$i" - rm -f "/var/lib/citadel/help/$i" - done - rmdir "/var/lib/citadel/help" + rmdir "/etc/citadel/help" + rmdir "/etc/citadel/messages" - for i in aideopt changepw dotopt entermsg entopt goodbye hello help mainmenu newuser readopt register roomaccess unlisted; do - ucf --purge "/var/lib/citadel/messages/$i" - rm -f "/var/lib/citadel/messages/$i" - done - rmdir "/var/lib/citadel/messages" - - for i in mail.aliases public_clients citadel.conf; do - ucf --purge "/etc/citadel/$i" - rm -f "/etc/citadel/$i" - done # we mimic dpkg as closely as possible, so we remove configuration # files with dpkg backup extensions too: ### Some of the following is from Tore Anderson: for ext in '~' '%' .bak .dpkg-tmp .dpkg-new .dpkg-old .dpkg-dist; do rm -f /etc/citadel/*$ext - rm -f /var/lib/citadel/messages/*$ext - rm -f /var/lib/citadel/help/*$ext + rm -f /etc/citadel/messages/*$ext + rm -f /etc/citadel/help/*$ext done echo "/var/lib/citadel/data not removed, as it may contain your personal data." db_purge db_go - ### TODO: remove citadel from inittab! - ;; - disappear) - if test "$2" != overwriter; then - echo "$0: undocumented call to \`postrm $*'" 1>&2 - exit 0 - fi - # This package has been completely overwritten by package $3 - # (version $4). All our files are already gone from the system. - # This is a special case: neither "prerm remove" nor "postrm remove" - # have been called, because dpkg didn't know that this package would - # disappear until this stage. - : - - ;; - upgrade) - # About to upgrade FROM THIS VERSION to version $2 of this package. - # "prerm upgrade" has been called for this version, and "preinst - # upgrade" has been called for the new version. Last chance to - # clean up. - : - - ;; - failed-upgrade) - # About to upgrade from version $2 of this package TO THIS VERSION. - # "prerm upgrade" has been called for the old version, and "preinst - # upgrade" has been called for this version. This is only used if - # the previous version's "postrm upgrade" couldn't handle it and - # returned non-zero. (Fix old postrm bugs here.) - : - - ;; - abort-install) - # Back out of an attempt to install this package. Undo the effects of - # "preinst install...". There are two sub-cases. - : - - if test "${2+set}" = set; then - # When the install was attempted, version $2's configuration - # files were still on the system. Undo the effects of "preinst - # install $2". - : - - else - # We were being installed from scratch. Undo the effects of - # "preinst install". - : - - fi ;; - abort-upgrade) - # Back out of an attempt to upgrade this package from version $2 - # TO THIS VERSION. Undo the effects of "preinst upgrade $2". - : - + ;; + disappear|upgrade|failed-upgrade|abort-install|abort-upgrade) ;; *) echo "$0: didn't understand being called with \`$1'" 1>&2 - exit 0;; + exit 1;; esac exit 0 diff --git a/citadel/debian/citadel-server.prerm b/citadel/debian/citadel-server.prerm index 8940f4305..5feb88b68 100644 --- a/citadel/debian/citadel-server.prerm +++ b/citadel/debian/citadel-server.prerm @@ -1,4 +1,26 @@ #!/bin/sh +# prerm script for citadel-server -# stop the citadel service... -/etc/init.d/citadel stop \ No newline at end of file +set -e + +case "$1" in + remove|upgrade|deconfigure) + if which invoke-rc.d >/dev/null 2>&1; then + invoke-rc.d citadel stop + else + /etc/init.d/citadel stop + fi + ;; + + failed-upgrade) + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/citadel/debian/citadel.init b/citadel/debian/citadel.init index 3343b0f06..b65750132 100644 --- a/citadel/debian/citadel.init +++ b/citadel/debian/citadel.init @@ -198,6 +198,8 @@ case "$1" in log_end_msg 1 ;; esac + else + do_start fi ;; *) diff --git a/citadel/debian/control b/citadel/debian/control index 2aa041ed0..866faf226 100644 --- a/citadel/debian/control +++ b/citadel/debian/control @@ -1,54 +1,115 @@ Source: citadel Section: mail -Priority: optional -Maintainer: Wilfried Goesgens -Build-Depends: debhelper (>= 4.0.0), libical-dev, autotools-dev, zlib1g-dev , libssl-dev, libncurses5-dev, libdb4.4-dev|libdb4.3-dev, libldap2-dev, bison, libpam0g-dev, libsieve2-dev -Standards-Version: 3.6.1 +Priority: extra +Maintainer: Wilfried Goesgens +Uploaders: Fathi Boudra +Build-Depends: debhelper (>= 4.0.0), bison, autotools-dev, + libdb4.4-dev|libdb4.3-dev, libical-dev, zlib1g-dev, + libssl-dev, libncurses5-dev, libldap2-dev, libpam0g-dev, + libsieve2-dev +Standards-Version: 3.7.2.2 Package: citadel-server Architecture: any -Pre-Depends: debconf Provides: pop3-server, imap-server Conflicts: pop3-server, imap-server -Depends: ${shlibs:Depends}, ${misc:Depends}, debconf, libical0, libgnutls | libgnutls11, ucf, db4.4-util|db4.3-util +Depends: ${shlibs:Depends}, ${misc:Depends}, debconf +Recommends: db4.4-util|db4.3-util Suggests: citadel-mta -Description: Citadel is the good old BBS system grown up to a Groupware. - Citadel is a different kind of messaging and collaboration platform. While - others focus on automating business processes, Citadel focuses on - connecting communities of people together. Users love Citadel because it's - software that helps them work, play, stay in touch... without calling - attention to itself. - -Package: citadel-doc -Architecture: all -Description: Documentation for citadel, the BBS and Groupware - Citadel is a different kind of messaging and collaboration platform. While - others focus on automating business processes, Citadel focuses on - connecting communities of people together. Users love Citadel because it's - software that helps them work, play, stay in touch... without calling - attention to itself. - -Package: citadel-client -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ucf -Description: This is the commandline-client to the citadel BBS system. - Citadel is a different kind of messaging and collaboration platform. While - others focus on automating business processes, Citadel focuses on - connecting communities of people together. Users love Citadel because it's - software that helps them work, play, stay in touch... without calling - attention to itself. +Description: complete and feature-rich groupware server + Citadel is a complete and feature-rich open source groupware platform. + * Email, calendaring/scheduling, address books + * Bulletin boards, mailing list server, instant messaging + * Multiple domain support + * An intuitive, attractive AJAX-style web interface + . + The key to Citadel's versatility is its unique architecture. A Citadel system + is made up of containers called "rooms." A room may be used as an email + folder, a discussion forum, a real-time chat, a mailing list, a calendar, + an address book, an RSS sink ... sometimes a combination of any of the above, + and certainly any other uses which could be added in the future. Furthermore, + you can replicate rooms between multiple Citadel nodes, allowing you to set up + a federated, distributed messaging environment. + . + With that in mind, Citadel excels at applications such as: + * E-mail and groupware (shared calendaring, etc.) + * Bulletin Board System (BBS) + * Online discussion forums / chat rooms + . + The Citadel system is extremely versatile. It provides numerous front ends to + present to users, such as a text-based interface, an AJAX-style web interface, + and many popular PIM clients using SMTP/POP/IMAP. All of these can be used + simultaneously. + . + It's also extremely scalable. Not only can a well-equipped Citadel server + support a large number of concurrent users, but you can also build + a distributed network of Citadel nodes that share rooms and their content. + . + Features: + * Email, calendaring, address books, bulletin boards, instant messaging, and + more ... all in one tightly integrated server package. Unlike other + open source groupware systems, all of Citadel's data stores are built-in. + "Integrate-it-yourself" is a thing of the past. + * High-performance, multiprotocol, multithreaded server engine + * Web browser, telnet/SSH, local client software accessible + * Standards-compliant e-mail built in: IMAP, POP3, ESMTP + * Group calendaring and scheduling (GroupDAV, Aethera, and Kolab-1 + compatible) + * Built-in listserv (mailing list server) + * Database-driven, single-instance message store + * Authenticated SMTP (no more tedious mucking about with POP-before-SMTP + hacks) + * Multiple domain support + * Built-in integration with perimiter email filtering technologies such as + Realtime Blackhole Lists (RBL's) and SpamAssassin + * Very strong replication features. Users in any number of domains can be + spread out across any number of Citadel servers, allowing you to put data + where you need it, and enabling infinite horizontal scalability. + * Web-based access to email, calendars, and everything else through + a powerful AJAX-style front end + * Very strong support for "public folders" and message forums. + * Built-in instant messenger service + * SSL/TLS encryption for all protocols + * LDAP integration capabilities. Citadel can populate your existing directory + server, or it can configure a standalone directory server if you don't + already have one. + . + Homepage: http://www.citadel.org Package: citadel-mta Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, citadel-server -Conflicts: mail-transport-agent, smail, postfix-dev, postfix-doc, postfix-gld, postfix-ldap, postfix-mysql, postfix-pcre, postfix-pgsql, postfix-policyd, postgrey +Conflicts: mail-transport-agent Provides: mail-transport-agent -Description: MTA component of the citadel BBS system. - Citadel is a different kind of messaging and collaboration platform. While - others focus on automating business processes, Citadel focuses on - connecting communities of people together. Users love Citadel because it's - software that helps them work, play, stay in touch... without calling - attention to itself. - This Package provides /usr/bin/sendmail, and the MTA Component. if you - want to use citadel in konjunction with another MTA system, don't install - this package. +Description: complete and feature-rich groupware server (mail transport agent) + This package contains the mail transport agent component for Citadel, + a complete and feature-rich open source groupware platform. + If you want to use citadel in conjunction with another MTA system, don't + install this package. + . + See the 'citadel-server' package for more informations. + . + Homepage: http://www.citadel.org + +Package: citadel-client +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, adduser +Description: complete and feature-rich groupware server (command line client) + This is package contains the command line client for Citadel, a complete and + feature-rich open source groupware platform. + . + See the 'citadel-server' package for more informations. + . + Homepage: http://www.citadel.org + + +Package: citadel-doc +Section: doc +Architecture: all +Description: complete and feature-rich groupware server (documentation) + This package contains documentation for Citadel, a complete and feature-rich + open source groupware platform. + . + See the 'citadel-server' package for more informations. + . + Homepage: http://www.citadel.org diff --git a/citadel/debian/rules b/citadel/debian/rules index ccb834f77..3ff0fb390 100755 --- a/citadel/debian/rules +++ b/citadel/debian/rules @@ -1,15 +1,5 @@ #!/usr/bin/make -f # -*- makefile -*- -# Sample debian/rules that uses debhelper. -# -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# -# Modified to make a template file for a multi-binary package with separated -# build-arch and build-indep targets by Bill Allombert 2001 - # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -44,6 +34,7 @@ config.status: configure --with-libical \ --with-libsieve \ --with-db \ + --with-zlib \ --with-ldap @@ -52,16 +43,10 @@ build: build-arch build-indep build-arch: build-arch-stamp build-arch-stamp: config.status - -# # Add here commands to compile the arch part of the package. -# $(MAKE) touch build-arch-stamp build-indep: build-indep-stamp build-indep-stamp: config.status - -# # Add here commands to compile the indep part of the package. -# #$(MAKE) doc touch build-indep-stamp clean: @@ -75,8 +60,6 @@ endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - - dh_clean install: install-indep install-arch @@ -100,46 +83,30 @@ install-arch: mv \ $(CURDIR)/debian/tmp/usr/sbin/setup \ $(CURDIR)/debian/tmp/usr/lib/citadel-server/ -# cd $(CURDIR)/debian/tmp/usr/share/doc/citadel-server/examples/help; md5sum * >../help.md5sums -# cd $(CURDIR)/debian/tmp/usr/share/doc/citadel-server/examples/messages; md5sum * >../messages.md5sums cp \ $(CURDIR)/debian/tmp/usr/sbin/citmail \ $(CURDIR)/debian/tmp/usr/sbin/sendmail - dh_installexamples + dh_install -# Must not depend on anything. This is to be called by -# binary-arch/binary-indep -# in another 'make' thread. + binary-common: dh_testdir dh_testroot -# dh_installchangelogs ChangeLog dh_installdocs dh_installexamples -# dh_installmenu dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime dh_installinit --name=citadel -# dh_installcron -# dh_installinfo dh_installman -#doesn't work like that. will be done by postinst. -# mkdir -p $(CURDIR)/debian/citadel-mta/usr/sbin -# dh_link --package=citadel-mta /usr/sbin/citmail /usr/sbin/sendmail dh_strip dh_compress dh_fixperms -# dh_perl -# dh_python dh_makeshlibs dh_installdeb dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb + # Build architecture independant packages using the common target. binary-indep: build-indep install-indep $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common -- 2.30.2