X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdinstall.functions;h=634554057f930e79804a52eda55d370fa7c6bd54;hb=f8be0477d1df2f519204cdf3f674f7b803fce3cf;hp=fd546a902fa8b226a1ee267dc9668e94b60c5d9d;hpb=2de2a91cbde91f3ecef5475829f7620edd94a14b;p=dak.git diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions index fd546a90..63455405 100644 --- a/config/debian/dinstall.functions +++ b/config/debian/dinstall.functions @@ -76,7 +76,7 @@ function i18n1() { # Lets check! if ${scriptsdir}/ddtp-i18n-check.sh . ${scriptdir}/i18n/${TSTAMP}; then # Yay, worked, lets copy around - for dir in wheezy sid; do + for dir in jessie sid; do if [ -d dists/${dir}/ ]; then cd dists/${dir}/main/i18n rsync -aq --delete --delete-after --exclude Translation-en.bz2 --exclude Translation-*.diff/ . ${ftpdir}/dists/${dir}/main/i18n/. @@ -376,12 +376,12 @@ function mkfilesindices() { done (cd $base/ftp/ - for dist in sid wheezy; do + for dist in sid jessie; do find ./dists/$dist/main/i18n/ \! -type d | sort -u | gzip -9 > $base/ftp/indices/files/components/translation-$dist.list.gz done ) - (cat ../arch-i386.files ../arch-amd64.files; zcat suite-proposed-updates.list.gz ; zcat translation-sid.list.gz ; zcat translation-wheezy.list.gz) | + (cat ../arch-i386.files ../arch-amd64.files; zcat suite-proposed-updates.list.gz ; zcat translation-sid.list.gz ; zcat translation-jessie.list.gz) | sort -u | poolfirst > ../typical.files rm -f $ARCHLIST @@ -622,11 +622,12 @@ function changelogs() { rsync -aHW --delete --delete-after --ignore-errors ${exportdir}/changelogs/. . sudo -H -u staticsync /usr/local/bin/static-update-component ftp-master.metadata.debian.org >/dev/null 2>&1 & - #dak make-changelog -e -a backports - #[ -f /srv/backports-master.debian.org/export/changelogs/filelist.yaml ] && xz -f /srv/backports-master.debian.org/export/changelogs/filelist.yaml - #mkdir -p /srv/backports-master.debian.org/rsync/export/changelogs - #cd /srv/backports-master.debian.org/rsync/export/changelogs - #rsync -aHW --delete --delete-after --ignore-errors /srv/backports-master.debian.org/export/changelogs/. . + dak make-changelog -e -a backports + [ -f /srv/backports-master.debian.org/export/changelogs/filelist.yaml ] && xz -f /srv/backports-master.debian.org/export/changelogs/filelist.yaml + mkdir -p /srv/backports-master.debian.org/rsync/export/changelogs + cd /srv/backports-master.debian.org/rsync/export/changelogs + rsync -aHW --delete --delete-after --ignore-errors /srv/backports-master.debian.org/export/changelogs/. . + remove_changelog_lock trap remove_changelog_lock EXIT TERM HUP INT QUIT fi }