X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fbuildpackages;h=2803024573dd9a126722da149080a3270729ad0c;hb=2b80e75820618944e1c75b9c01aeeefc8b6b0c81;hp=40cbf5ad5cbd58bc49b18e48959f5c574dda6bfa;hpb=ef58655ad955785ff25cc27a06edbb1c6c03814c;p=citadel.git

diff --git a/citadel/buildpackages b/citadel/buildpackages
index 40cbf5ad5..280302457 100755
--- a/citadel/buildpackages
+++ b/citadel/buildpackages
@@ -1,7 +1,7 @@
 #!/bin/bash
 # find out the package version from conf
-if test -x Makefile; then
-    make clean
+if test -f Makefile; then
+    make distclean
 fi
 
 ./bootstrap
@@ -12,6 +12,8 @@ PACKAGE_VERSION=`cat packageversion`
 DATE=`date '+%a, %d %b %Y %H:%I:00 %z'`
 ACTUAL_DIR=`pwd`
 
+
+rm -rf debian/citadel-client debian/citadel-common debian/citadel-doc debian/citadel-mta debian/citadel-server debian/citadel-suite debian/tmp
 if echo "$ACTUAL_DIR" |grep -q "$CITADEL_VERSION"; then
 	echo "directory ($ACTUAL_DIR) naming scheme seems right. nothing done."
 else
@@ -27,8 +29,7 @@ else
 	fi
 	if test "$done" = "false"; then 
 		cd ..
-		mv -- $SYMLINK "citadel-$CITADEL_VERSION"
-		ln -sf "citadel-$CITADEL_VERSION" citadel
+		ln -sf citadel "citadel-$CITADEL_VERSION"
 		cd "citadel-$CITADEL_VERSION"
 	else
 		cd "../citadel-$CITADEL_VERSION"
@@ -39,31 +40,76 @@ fi
 
 case $1 in
     debian)
-
-#dpkg-source: warning: source directory `./citadel' is not <sourcepackage>-<upstreamversion> `citadel-6.61'
-	
 	if grep -q "($CITADEL_VERSION" debian/changelog; then
 	    echo rebuilding package.
 	else
-	    echo "citadel (${CITADEL_VERSION}-${PACKAGE_VERSION}) unstable; urgency=low
-
-  * update to actual Citadel SVN. many new features. see Packages changelog.
-
- -- Wilfried Goesgens <citadel@outgesourced.org>  $DATE
-
-" >/tmp/citadel_changelog
-	    cat debian/changelog >>/tmp/citadel_changelog
-	    mv /tmp/citadel_changelog debian/changelog
+	    echo "Upstream Version higher than local."
 	    
 	fi
 	if test "$2" == "src"; then
-	    cd ..; dpkg-source -b "citadel-$CITADEL_VERSION"
+	    cd ..
+	    rm -rf tmp
+	    mkdir tmp
+	    cp -rL citadel-$CITADEL_VERSION tmp
+	    cd tmp/citadel-$CITADEL_VERSION
+	    rm -rf `find -name .svn ` svn*tmp config.log config.status
+	    find -type f -exec chmod a-x {} \;
+	    chmod a+x configure *.sh *.sh.in debian/rules debian/*inst* debian/rules mkinstalldirs
+	    cd ..
+	    tar -chzf citadel_${CITADEL_VERSION}.orig.tar.gz citadel-${CITADEL_VERSION}/ --exclude "debian/*"
+	    pwd
+	    cd  citadel-${CITADEL_VERSION}; debuild -S -sa -kw.goesgens@outgesourced.org
 	else
 	    fakeroot dpkg-buildpackage
 	fi
+	;;
+    csw)
+	if !test -d ~/pkgs/; then
+	    mkdir ~/pkgs
+	fi
+	echo "
+PKG=CSWcitadel
+NAME=citadel - The groupware server for Web 2.0
+VERSION=${PACKAGE_VERSION}
+CATEGORY=application
+VENDOR=http://www.citadel.org/  packaged for CSW by Wilfried Goesgens
+HOTLINE=https://uncensored.citadel.org/ Room citadel support
+EMAIL=citadel@outgesourced.org
+" >~/pkgs/citadel
+	export LDFLAGS='-L/opt/csw/lib -L /usr/local/lib'
+	export CFLAGS='-I/opt/csw/include -I/usr/local/include  -DDISABLE_CURSES'
+	./configure \
+	    --with-db=/opt/csw/bdb44 \
+	    --with-ical=/usr/local/ \
+	    --with-prefix=/opt/csw/ \
+	    --with-datadir=/opt/csw/var/lib/citadel \
+	    --with-sysconfdir=/opt/csw/etc/citadel \
+	    --with-ssldir=/opt/csw/etc/ssl/citadel/ \
+	    --with-spooldir=/opt/csw/var/spool/citadel \
+	    --with-rundir=/opt/csw/var/run/citadel \
+	    --with-docdir=/opt/csw/share/doc/citadel-doc/ \
+	    --with-pam \
+	    --with-zlib \
+	    --with-ldap \
+	    --with-libsieve
+	    
+	gmake citserver aidepost msgform citmail userlist sendcommand base64 whobbs citadel
+	gmake DESTDIR=$ACTUAL_DIR/cswstage install-new
+	
+
+
 	;;
     sourcedist)
-	cd ..; tar --exclude .svn -cvzf citadel-$CITADEL_VERSION.tgz citadel-$CITADEL_VERSION/
+	cd ..; tar \
+	    --exclude ".gitignore" \
+	    --exclude "*.lo" \
+	    --exclude "*.o" \
+	    --exclude "*.d" \
+	    --exclude "autom4te.cache/*" \
+	    --exclude "debian/*" \
+	    --exclude "sysdep.h" \
+	    \
+	    -chvzf citadel-$CITADEL_VERSION.tar.gz citadel-$CITADEL_VERSION/
 	;;
 	*)
 		echo "Not yet implemented. we have: debian "