X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdinstall.functions;h=58f8ddb1ce02c7317acbf03ce9e2b42f10714100;hb=86e42f45e177df65e5a71352b55b911a7bca6153;hp=b9f834b33d07c50165ea94028f1832cf3b771866;hpb=2c070e8e93167b48816a0af8e59e79f82cf293cd;p=dak.git

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index b9f834b3..58f8ddb1 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -74,7 +74,7 @@ function i18n1() {
                 for dir in wheezy sid; do
                     if [ -d dists/${dir}/ ]; then
                         cd dists/${dir}/main/i18n
-                        rsync -aq --delete --delete-after  . ${ftpdir}/dists/${dir}/main/i18n/.
+                        rsync -aq --delete --delete-after --exclude Translation-en.bz2 --exclude Translation-*.diff/ . ${ftpdir}/dists/${dir}/main/i18n/.
                     fi
                     cd ${scriptdir}/i18nsync
                 done
@@ -154,8 +154,6 @@ function packages() {
     log "Generating Packages and Sources files"
     #cd $configdir
     #dak generate-packages-sources
-    # XXX: disable again later
-    dak generate-packages-sources2 --description-md5 -o Dir::Root=$webdir/newdists/
     dak generate-packages-sources2
     dak contents generate
 }
@@ -168,12 +166,14 @@ function pdiff() {
 function release() {
     # XXX: disable once we can remove i18n/Index (#649314)
     log "Generating i18n/Index"
-    (cd "$ftpdir/dists"; for dist in testing unstable; do $scriptsdir/generate-i18n-Index $dist; done)
-    (cd "$webdir/newdists/dists"; for dist in testing unstable; do $scriptsdir/generate-i18n-Index $dist; done)
+    (
+        cd "$ftpdir/dists";
+        for dist in testing unstable experimental proposed-updates testing-proposed-updates; do
+            $scriptsdir/generate-i18n-Index $dist;
+        done
+    )
     log "Generating Release files"
     dak generate-releases
-    # XXX: disable again later
-    dak generate-releases -o Dir::Root=$webdir/newdists/
 }
 
 function dakcleanup() {