From: Wilfried Goesgens <dothebart@citadel.org>
Date: Thu, 24 Nov 2011 21:57:19 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
X-Git-Tag: v8.03~22
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=c6ccfb9bc8edb05fdbbccbcc7b0fbc621e287d0b;hp=499731379bfe6aa7e2ae600adce41efbb705ede5;p=citadel.git

Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
---

diff --git a/citadel/buildpackages b/citadel/buildpackages
index 8b181852e..2a027858b 100755
--- a/citadel/buildpackages
+++ b/citadel/buildpackages
@@ -100,7 +100,7 @@ EMAIL=citadel@outgesourced.org
 
 	;;
     sourcedist)
-	cd ..; tar --exclude .svn --exclude "debian/*" -chvzf 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 "
diff --git a/citadel/po/citadel-setup/ar.po b/citadel/po/citadel-setup/ar.po
index 0581546fd..5404795ac 100644
--- a/citadel/po/citadel-setup/ar.po
+++ b/citadel/po/citadel-setup/ar.po
@@ -410,10 +410,11 @@ msgstr ""
 #~ msgstr "تريد تمكين وضع المصادقة الخارجية؟"
 
 #, fuzzy
-#~| msgid ""
-#~| "Enter the name of the Citadel administrator (which is probably you). "
-#~| "When an account is created with this name, it will automatically be "
-#~| "given administrator-level access."
+#~ msgid ""
+#~ "Enter the name of the Citadel administrator (which is probably you). "
+#~ "When an account is created with this name, it will automatically be "
+#~ "given administrator-level access."
+#~ msgstr ""
 #~ msgid ""
 #~ "Please enter the name of the Citadel user account that should be granted "
 #~ "administrative privileges once created."
diff --git a/libcitadel/buildpackages b/libcitadel/buildpackages
index 4f45bba83..7b16b6fde 100755
--- a/libcitadel/buildpackages
+++ b/libcitadel/buildpackages
@@ -101,7 +101,7 @@ EMAIL=citadel@outgesourced.org
 	;;
     sourcedist)
 	cd ..; tar --exclude .svn \
-	    --exclude "*svn*" \
+	    --exclude ".gitignore" \
 	    --exclude .libs \
 	    --exclude "*.lo" \
 	    --exclude "*.o" \
diff --git a/webcit/buildpackages b/webcit/buildpackages
index b160264ac..83d535fa5 100755
--- a/webcit/buildpackages
+++ b/webcit/buildpackages
@@ -62,7 +62,7 @@ case $1 in
 	if test "$2" == "dfsg"; then
 	    NONDFSG=-"-exclude static/webcit_icons/openid-small.gif"
 	fi
-	cd ..; tar --exclude .svn --exclude "debian/*" $NONDFSG -cvhzf webcit-${WEBCIT_VERSION}.tar.gz webcit-${WEBCIT_VERSION}/
+	cd ..; tar --exclude .gitignore --exclude "debian/*" $NONDFSG -cvhzf webcit-${WEBCIT_VERSION}.tar.gz webcit-${WEBCIT_VERSION}/
 	;;
     i18n)
 	./webcit -G `pwd`/i18n_templatelist.c