X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fbuildpackages;h=2a027858babeb1006e7a41a3023fa75cfd4ca787;hb=d218244e2b4ac89f4433ab262d80c77ca8141b0c;hp=eae5332ce7a4082b45b1cebf2cf7ac7ab650c74c;hpb=92e0ffdd1b44102212d2ecc2e06c12657facd9a1;p=citadel.git

diff --git a/citadel/buildpackages b/citadel/buildpackages
index eae5332ce..2a027858b 100755
--- a/citadel/buildpackages
+++ b/citadel/buildpackages
@@ -29,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"
@@ -51,13 +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
+	    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
@@ -82,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 \
@@ -102,7 +100,7 @@ EMAIL=citadel@outgesourced.org
 
 	;;
     sourcedist)
-	cd ..; tar --exclude .svn --exclude "debian/*" -cvzf citadel-$CITADEL_VERSION.tar.gz citadel-$CITADEL_VERSION/
+	cd ..; tar --exclude .gitignore --exclude "debian/*" -chvzf citadel-$CITADEL_VERSION.tar.gz citadel-$CITADEL_VERSION/
 	;;
 	*)
 		echo "Not yet implemented. we have: debian "