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

diff --git a/citadel/buildpackages b/citadel/buildpackages
index 8b181852e140d219bec2ff4fc13795e6ca62d799..2a027858babeb1006e7a41a3023fa75cfd4ca787 100755 (executable)
--- 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 0581546fd0bb90e14415750fb3e06ba3f039f23a..5404795acecd2436841a5a5cd222bd1716dda8bd 100644 (file)
--- 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 4f45bba8385dfa756df289c48980b06a7a88fabc..7b16b6fde2d5e4e93c1fcefafbd219479da8817a 100755 (executable)
--- 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 b160264ac72bbec27254661813bc1c670ce370f0..83d535fa5c6bf39be44660eeea0c0cd4ded03cb1 100755 (executable)
--- 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