* update changelog

* rewrite install-arch target using install
* cleanup (beauemacsitification) ;)

diff --git a/citadel/debian/changelog b/citadel/debian/changelog
index bdf93116e36bff6ae4db950f03c56cd1c0a2522b..13e558cdde3bdf98b15ecc27409f0912bc57e844 100644 (file)
--- a/citadel/debian/changelog
+++ b/citadel/debian/changelog
@@ -1,9 +1,10 @@
 citadel (7.03-1) unstable; urgency=low
        
   * update to actual Citadel SVN. many new features. see Packages changelog.
+  * Add welcome mail on fresh citadel install
+  * Fix configure-stamp token
 
  -- Wilfried Goesgens <citadel@outgesourced.org>  Fri, 05 Jan 2007 00:12:00 +0100
-       
 
 citadel (7.02-2) unstable; urgency=low
 

diff --git a/citadel/debian/citadel-server.install b/citadel/debian/citadel-server.install
index 862eb1d3e2aef09cd8189b0f6f0ac201cda2dcb4..165c9d54c9ae832525e04d18ef7995a689f83173 100644 (file)
--- a/citadel/debian/citadel-server.install
+++ b/citadel/debian/citadel-server.install
@@ -12,5 +12,5 @@ usr/sbin/msgform
 usr/sbin/sendcommand
 usr/sbin/userlist
 usr/share/doc/citadel-server/database_cleanup.sh
-usr/share/doc/citadel-server/welcomemail.txt
 usr/share/doc/citadel-server/welcomemail.html
+usr/share/doc/citadel-server/welcomemail.txt

diff --git a/citadel/debian/citadel-server.postinst b/citadel/debian/citadel-server.postinst
index 7498eb6fee6736709ed4bbac8033a12efa055972..8307aaad75b3dd84d710a52f5800e417149706bb 100644 (file)
--- a/citadel/debian/citadel-server.postinst
+++ b/citadel/debian/citadel-server.postinst
@@ -1,5 +1,6 @@
 #!/bin/sh
 # postinst script for citadel-server
+
 set -e
 
 # source debconf stuff
@@ -48,22 +49,21 @@ case "$1" in
         echo "applying your settings."
         /usr/lib/citadel-server/setup -q
 
-# we're in a fresh install, so we send the welcome message.
-       if test -z "$2"; then
-           export SEPERATOR=2600908b3f21ae7f692b973ed26e212d
-           export WELCOMEHTML=/usr/share/doc/citadel-server/welcomemail.html
-           export WELCOMETXT=/usr/share/doc/citadel-server/welcomemail.txt
-           export FROM=room_citadel_stats@uncensored.citadel.org
-           export TO=room_lobby
-           (
-               printf "MIME-Version: 1.0\r\nContent-Type: multipart/alternative; \r\n boundary=$SEPERATOR\r\n\r\nThis is a multi-part message in MIME format.\r\n\r\n--$SEPERATOR\r\nContent-Type: text/plain; charset=utf-8\r\nContent-Transfer-Encoding: quoted-printable\r\n\r\n"; 
-               cat $WELCOMETXT
-               printf "\r\n\r\n--$SEPERATOR\r\nContent-Type: text/html; charset=US-ASCII\r\nContent-Transfer-Encoding: quoted-printable\r\n\r\n"
-               cat $WELCOMEHTML; 
-               printf "\r\n\r\n--$SEPERATOR--\r\n\r\n") | \
-                   /usr/sbin/citmail -bm -r "$FROM" "$TO"
-       fi
-       
+        # we're in a fresh install, so we send the welcome message.
+        if test -z "$2"; then
+            export SEPERATOR=2600908b3f21ae7f692b973ed26e212d
+            export WELCOMEHTML=/usr/share/doc/citadel-server/welcomemail.html
+            export WELCOMETXT=/usr/share/doc/citadel-server/welcomemail.txt
+            export FROM=room_citadel_stats@uncensored.citadel.org
+            export TO=room_lobby
+            (
+                printf "MIME-Version: 1.0\r\nContent-Type: multipart/alternative; \r\n boundary=$SEPERATOR\r\n\r\nThis is a multi-part message in MIME format.\r\n\r\n--$SEPERATOR\r\nContent-Type: text/plain; charset=utf-8\r\nContent-Transfer-Encoding: quoted-printable\r\n\r\n"; 
+                cat $WELCOMETXT
+                printf "\r\n\r\n--$SEPERATOR\r\nContent-Type: text/html; charset=US-ASCII\r\nContent-Transfer-Encoding: quoted-printable\r\n\r\n"
+                cat $WELCOMEHTML; 
+                printf "\r\n\r\n--$SEPERATOR--\r\n\r\n") | \
+                    /usr/sbin/citmail -bm -r "$FROM" "$TO"
+        fi
 
         if test -S /var/run/citadel/citadel.socket; then 
             /usr/sbin/sendcommand "DOWN"

diff --git a/citadel/debian/rules b/citadel/debian/rules
index ef1bb638d199c382837b3bf3675278e0ff0e87d3..a6cacca13cb39a0c40fcb7777a53bbd696e9087b 100755 (executable)
--- a/citadel/debian/rules
+++ b/citadel/debian/rules
@@ -75,21 +75,19 @@ install-arch:
        dh_clean -k -s 
        dh_installdirs -s
 
-       $(MAKE) DESTDIR=$(DEB_DESTDIR) \
-               install-exec-new \
-               install-data-new \
-               install-doc-new
-
-       mkdir -p $(DEB_DESTDIR)/usr/lib/citadel-server
-       mv $(DEB_DESTDIR)/usr/sbin/setup \
-               $(DEB_DESTDIR)/usr/lib/citadel-server/
-
-       mkdir -p $(DEB_DESTDIR)/usr/share/doc/citadel-server/
-       mv $(DEB_DESTDIR)/usr/share/doc/citadel-doc/database_cleanup.sh \
-               $(DEB_DESTDIR)/usr/share/doc/citadel-server/
-       mv $(DEB_DESTDIR)/usr/share/doc/citadel-doc/docs/welcomemail.txt \
-               $(DEB_DESTDIR)/usr/share/doc/citadel-doc/docs/welcomemail.html \
-               $(DEB_DESTDIR)/usr/share/doc/citadel-server/
+       $(MAKE) DESTDIR=$(DEB_DESTDIR) install-exec-new install-data-new
+
+       install -D -p -m0755 $(DEB_DESTDIR)/usr/sbin/setup \
+               $(DEB_DESTDIR)/usr/lib/citadel-server/setup
+
+       install -D -p -m0755 database_cleanup.sh \
+               $(DEB_DESTDIR)/usr/share/doc/citadel-server/database_cleanup.sh
+
+       install -D -p -m0644 docs/welcomemail.html \
+               $(DEB_DESTDIR)/usr/share/doc/citadel-server/welcomemail.html
+
+       install -D -p -m0644 docs/welcomemail.txt \
+               $(DEB_DESTDIR)/usr/share/doc/citadel-server/welcomemail.txt
 
        dh_install -s --sourcedir=debian/tmp