X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fbuildpackages;h=2803024573dd9a126722da149080a3270729ad0c;hb=7555d277f2ccfa8d3f484e5e1dc76e64284afe11;hp=2fadd62269a80e6c5cc357e84b381fa67577c1b8;hpb=664f1680edbbb48f2bd1db38fc595b0be352eae5;p=citadel.git

diff --git a/citadel/buildpackages b/citadel/buildpackages
index 2fadd6226..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"
@@ -49,11 +50,13 @@ case $1 in
 	    cd ..
 	    rm -rf tmp
 	    mkdir tmp
-	    cp -a citadel-$CITADEL_VERSION 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 -czf citadel_${CITADEL_VERSION}.orig.tar.gz citadel-${CITADEL_VERSION}/ --exclude "debian/*"
+	    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
@@ -78,7 +81,6 @@ EMAIL=citadel@outgesourced.org
 	./configure \
 	    --with-db=/opt/csw/bdb44 \
 	    --with-ical=/usr/local/ \
-	    --without-curses \
 	    --with-prefix=/opt/csw/ \
 	    --with-datadir=/opt/csw/var/lib/citadel \
 	    --with-sysconfdir=/opt/csw/etc/citadel \
@@ -98,7 +100,16 @@ EMAIL=citadel@outgesourced.org
 
 	;;
     sourcedist)
-	cd ..; tar --exclude .svn --exclude "debian/*" -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 "