* add some script to wrap the debian package build that does some magic about

  the versioning in the package and the citadel system
* Many fixups to the debian packages
* added Unixlogin Package

diff --git a/citadel/debian/changelog b/citadel/debian/changelog
index f2d2e2ec3be0e7af2fca24c818dada79b5272e64..04322668e05320975e19e5d6f63b6c04f5c634b6 100644 (file)
--- a/citadel/debian/changelog
+++ b/citadel/debian/changelog
@@ -1,3 +1,16 @@
+citadel (6.62-1) unstable; urgency=low
+       
+  * update to actual Citadel CVS. many new features. see Packages changelog.
+
+ -- Wilfried Goesgens <w.goesgens@chaosindustries.de>  Fri, 18 Nov 2005 16:04:00 +0100
+       
+
+citadel (6.61-2) unstable; urgency=low
+       
+  * update to actual Citadel CVS. many new features. see Packages changelog.
+
+ -- Wilfried Goesgens <w.goesgens@chaosindustries.de>  Tue, 01 Nov 2005 12:23:15 +0200
+       
 citadel (6.53-1) unstable; urgency=low
 
   * Initial release Closes: #nnnn  (nnnn is the bug number of your ITP)

diff --git a/citadel/debian/citadel-client.substvars b/citadel/debian/citadel-client.substvars
index ee9fce249919089d94b3602e222b2ad080e756b9..104e19dc4334457d233a02c61895497daed4a1f1 100644 (file)
--- a/citadel/debian/citadel-client.substvars
+++ b/citadel/debian/citadel-client.substvars
@@ -1 +1 @@
-shlibs:Depends=libc6 (>= 2.3.2.ds1-21), libncurses5 (>= 5.4-5), libssl0.9.7
+shlibs:Depends=libc6 (>= 2.3.5-1), libncurses5 (>= 5.4-5), libssl0.9.8

diff --git a/citadel/debian/citadel-mta.substvars b/citadel/debian/citadel-mta.substvars
index ee9fce249919089d94b3602e222b2ad080e756b9..104e19dc4334457d233a02c61895497daed4a1f1 100644 (file)
--- a/citadel/debian/citadel-mta.substvars
+++ b/citadel/debian/citadel-mta.substvars
@@ -1 +1 @@
-shlibs:Depends=libc6 (>= 2.3.2.ds1-21), libncurses5 (>= 5.4-5), libssl0.9.7
+shlibs:Depends=libc6 (>= 2.3.5-1), libncurses5 (>= 5.4-5), libssl0.9.8

diff --git a/citadel/debian/citadel-server.install b/citadel/debian/citadel-server.install
index ae5ddc3fc2539a3e49f54e63bedbc4f80c38c798..19c2b2c4ce673705b266eaa8c219f87097188ea9 100644 (file)
--- a/citadel/debian/citadel-server.install
+++ b/citadel/debian/citadel-server.install
@@ -1,5 +1,4 @@
 debian/tmp/usr/sbin/citserver
-debian/tmp/usr/sbin/chkpwd
 debian/tmp/usr/sbin/aidepost
 debian/tmp/usr/sbin/msgform
 debian/tmp/usr/sbin/citmail

diff --git a/citadel/debian/citadel-server.postinst b/citadel/debian/citadel-server.postinst
index fe8ce88880c7f8b4068fcee7789b0f5d17f495c9..55386c5795ee86e12379578d689961ce8100ff1c 100644 (file)
--- a/citadel/debian/citadel-server.postinst
+++ b/citadel/debian/citadel-server.postinst
@@ -93,6 +93,7 @@ case "$1" in
 #              /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)
@@ -112,6 +113,7 @@ case "$1" in
 #      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"
 
@@ -156,15 +158,30 @@ case "$1" in
 
        db_get citadel/Administrator && admin="$RET"
        db_get citadel/ServerIPAddress && ip_addr="$RET"
+       export CITADEL=/usr/sbin/
+       export CITADEL_INSTALLER=yes
+       export ACT_AS_MTA=no
+       export SYSADMIN_NAME=$admin
+       export CREATE_XINETD_ENTRY=no
+       export CREATE_INITTAB_ENTRY=yes
        echo "applying your settings."
-       echo "/usr/sbin
-$admin
-citadel
-$ip_addr
-
-" | \
+# citadel home
+# sysadmin
+# uid
+# server ip
+# port
+# postfix?
+# exim?
+#      echo "/usr/sbin
+#$admin
+#citadel
+#$ip_addr
+#
+#no
+#no
+#" | \
        /usr/lib/citadel-server/setup -q
-
+       killall -HUP init
     #### There are three sub-cases:
     ###if test "${2+set}" != set; then
     ###  # We're being installed by an ancient dpkg which doesn't remember

diff --git a/citadel/debian/citadel-server.postrm b/citadel/debian/citadel-server.postrm
index 661c9127ad68b74a08cb2f64a18ee1aab98af0ee..18057f2dea4aa1121352b9dc63be6a3e0d602aca 100644 (file)
--- a/citadel/debian/citadel-server.postrm
+++ b/citadel/debian/citadel-server.postrm
@@ -2,6 +2,7 @@
 # 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
@@ -18,7 +19,10 @@ case "$1" in
   remove)
     # This package is being removed, but its configuration has not yet
     # been purged.
-    
+               export CREATE_INITTAB_ENTRY=no
+               /usr/lib/citadel-server/setup -q
+               killall -HUP init
+
 
     # Remove diversion
     #: dpkg-divert --package foo --remove --rename \
@@ -26,7 +30,7 @@ case "$1" in
 
     # ldconfig is NOT needed during removal of a library, only during
     # installation
-
+       
     ;;
   purge)
     # This package has previously been removed and is now having
@@ -37,11 +41,13 @@ case "$1" in
                ucf --purge "/var/lib/citadel/help/$i"
                rm -f "/var/lib/citadel/help/$i"
        done
+       rmdir "/var/lib/citadel/help"
 
        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"
@@ -55,6 +61,9 @@ case "$1" in
                rm -f /var/lib/citadel/messages/*$ext
                rm -f /var/lib/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)

diff --git a/citadel/debian/citadel-server.substvars b/citadel/debian/citadel-server.substvars
index 037de70f07bcde92b592feb08b491d98a6043a62..babf500f78308fc4041c594a264e1d3d997fbc00 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.2.ds1-21), libdb4.2, libldap2 (>= 2.1.17-1), libncurses5 (>= 5.4-5), libssl0.9.7, zlib1g (>= 1:1.2.1)
+shlibs:Depends=libc6 (>= 2.3.5-1), libdb4.2, libldap2 (>= 2.1.17-1), libncurses5 (>= 5.4-5), libssl0.9.8, zlib1g (>= 1:1.2.1)

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

diff --git a/citadel/debian/citadel-unixlogin.substvars b/citadel/debian/citadel-unixlogin.substvars
new file mode 100644 (file)
index 0000000..9374607
--- /dev/null
+++ b/citadel/debian/citadel-unixlogin.substvars
@@ -0,0 +1 @@
+shlibs:Depends=libc6 (>= 2.3.5-1)

diff --git a/citadel/debian/control b/citadel/debian/control
index 850d6460ec6c77416529c2a85315a5ff5654a2b4..6245d13d4cc39d73185f12dd93f3aefea148fb61 100644 (file)
--- a/citadel/debian/control
+++ b/citadel/debian/control
@@ -36,6 +36,12 @@ Description: This is the commandline-client to the citadel BBS system.
  software that helps them work, play, stay in touch... without calling 
  attention to itself.
 
+Package: citadel-unixlogin
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: This enables your citadel server to sync its passwords with 
+ unix system accounts.
+
 Package: citadel-mta
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, citadel-server 

diff --git a/citadel/debian/files b/citadel/debian/files
deleted file mode 100644 (file)
index 4e57879..0000000
--- a/citadel/debian/files
+++ /dev/null
@@ -1,4 +0,0 @@
-citadel-server_6.53-1_i386.deb mail optional
-citadel-client_6.53-1_i386.deb mail optional
-citadel-mta_6.53-1_i386.deb mail optional
-citadel-doc_6.53-1_all.deb mail optional

diff --git a/citadel/debian/files_preview b/citadel/debian/files_preview
new file mode 100644 (file)
index 0000000..8d70c92
--- /dev/null
+++ b/citadel/debian/files_preview
@@ -0,0 +1,5 @@
+citadel-server_@CITADEL_VERSION@-@PACKAGE_VERSION@_i386.deb mail optional
+citadel-client_@CITADEL_VERSION@-@PACKAGE_VERSION@_i386.deb mail optional
+citadel-mta_@CITADEL_VERSION@-@PACKAGE_VERSION@_i386.deb mail optional
+citadel-doc_@CITADEL_VERSION@-@PACKAGE_VERSION@_all.deb mail optional
+citadel-unixlogin_@CITADEL_VERSION@-@PACKAGE_VERSION@_all.deb mail optional

diff --git a/citadel/debian/rules b/citadel/debian/rules
index a1826e715214445cc2c9c5c68b7c0693379acaec..9af35c279b1ea9d6efda48d0ae96cf56e334616d 100755 (executable)
--- a/citadel/debian/rules
+++ b/citadel/debian/rules
@@ -24,11 +24,11 @@ export VERSION=`grep 'THIS IS' $(CURDIR)/ChangeLog  |head -n 1 |sed "s;.* ;;"`
 
 CFLAGS = -Wall -g
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-else
-       CFLAGS += -O2
-endif
+#ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+       CFLAGS += -O0 -ggdb
+#else
+#      CFLAGS += -O2
+#endif
 
 config.status: configure
        dh_testdir
@@ -41,6 +41,7 @@ config.status: configure
                --with-datadir=/var/lib/citadel \
                --with-rundir=/var/run/citadel \
                --with-docdir=/usr/share/doc/citadel-doc/ \
+               --enable-autologin \
                --with-ical --with-db --with-ldap