Merge commit 'mhy/master' into merge

[dak.git] / config / debian / cron.dinstall

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 6ade212b32d9ec07e0c7e20b77dced82d2af4c27..0629a102ae59545c78df18f258be489c6784e8d0 100755 (executable)
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -91,9 +91,6 @@ ts "o-p-u-new"
 
 ################################################################################
 
 
 ################################################################################
 

-# Temporary until lenny is there
-dak control-suite -s lenny-r0 /srv/ftp.debian.org/misc/lenny-r0.txt
-

 echo "Synchronizing i18n package descriptions"
 # First sync their newest data
 cd ${scriptdir}/i18nsync
 echo "Synchronizing i18n package descriptions"
 # First sync their newest data
 cd ${scriptdir}/i18nsync


@@ -110,7 +107,7 @@ if $(gpgv --keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg timestamp.g
         # Lets check!
         if ${scriptsdir}/ddtp-i18n-check.sh . ${scriptdir}/i18n/${TSTAMP}; then
                        # Yay, worked, lets copy around
         # Lets check!
         if ${scriptsdir}/ddtp-i18n-check.sh . ${scriptdir}/i18n/${TSTAMP}; then
                        # Yay, worked, lets copy around

-                       for dir in lenny sid; do
+                       for dir in squeeze sid; do

                                if [ -d dists/${dir}/ ]; then
                                        cd dists/${dir}/main/i18n
                                        rsync -aq --delete --delete-after  . ${ftpdir}/dists/${dir}/main/i18n/.
                                if [ -d dists/${dir}/ ]; then
                                        cd dists/${dir}/main/i18n
                                        rsync -aq --delete --delete-after  . ${ftpdir}/dists/${dir}/main/i18n/.


@@ -119,15 +116,15 @@ if $(gpgv --keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg timestamp.g
                        done
                else
                        echo "ARRRR, bad guys, wrong files, ARRR"
                        done
                else
                        echo "ARRRR, bad guys, wrong files, ARRR"

-                       echo "Arf, Arf, Arf, bad guys, wrong files, arf, arf, arf" | mail debian-l10n-devel@lists.alioth.debian.org
+                       echo "Arf, Arf, Arf, bad guys, wrong files, arf, arf, arf" | mail -s "Don't you kids take anything. I'm watching you. I've got eye implants in the back of my head." debian-l10n-devel@lists.alioth.debian.org

                fi
     else
                echo "ARRRR, missing the timestamp ${TSTAMP} directory, not updating i18n, ARRR"
                fi
     else
                echo "ARRRR, missing the timestamp ${TSTAMP} directory, not updating i18n, ARRR"

-               echo "Arf, Arf, Arf, missing the timestamp ${TSTAMP} directory, not updating i18n, arf, arf, arf" | mail debian-l10n-devel@lists.alioth.debian.org
+               echo "Arf, Arf, Arf, missing the timestamp ${TSTAMP} directory, not updating i18n, arf, arf, arf" | mail -s "Lisa, if you don't like your job you don't strike. You just go in every day and do it really half-assed. That's the American way." debian-l10n-devel@lists.alioth.debian.org

        fi
 else
     echo "ARRRRRRR, could not verify our timestamp signature, ARRR. Don't mess with our files, i18n guys, ARRRRR."
        fi
 else
     echo "ARRRRRRR, could not verify our timestamp signature, ARRR. Don't mess with our files, i18n guys, ARRRRR."

-       echo "Arf, Arf, Arf, could not verify our timestamp signature, arf. Don't mess with our files, i18n guys, arf, arf, arf" | mail debian-l10n-devel@lists.alioth.debian.org
+       echo "Arf, Arf, Arf, could not verify our timestamp signature, arf. Don't mess with our files, i18n guys, arf, arf, arf" | mail -s "You can't keep blaming yourself. Just blame yourself once, and move on." debian-l10n-devel@lists.alioth.debian.org

 fi
 ts "i18n 1"
 
 fi
 ts "i18n 1"
 


@@ -174,7 +171,7 @@ ts "overrides"
 
 # Generate package / file mapping
 echo "Generating package / file mapping"
 
 # Generate package / file mapping
 echo "Generating package / file mapping"

-dak make-pkg-file-mapping
+dak make-pkg-file-mapping | bzip2 -9 > $base/ftp/indices/package-file.map.bz2

 ts "pkg-file-mapping"
 
 # Generate Packages and Sources files
 ts "pkg-file-mapping"
 
 # Generate Packages and Sources files


@@ -285,8 +282,8 @@ echo "Exporting package data foo for i18n project"
 STAMP=$(date "+%Y%m%d%H%M")
 mkdir -p ${scriptdir}/i18n/${STAMP}
 cd ${scriptdir}/i18n/${STAMP}
 STAMP=$(date "+%Y%m%d%H%M")
 mkdir -p ${scriptdir}/i18n/${STAMP}
 cd ${scriptdir}/i18n/${STAMP}

-dak control-suite -l stable > etch
-dak control-suite -l testing > lenny
+dak control-suite -l stable > lenny
+dak control-suite -l testing > squeeze

 dak control-suite -l unstable > sid
 echo "${STAMP}" > timestamp
 gpg --secret-keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 6070D3A1 --detach-sign -o timestamp.gpg timestamp
 dak control-suite -l unstable > sid
 echo "${STAMP}" > timestamp
 gpg --secret-keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 6070D3A1 --detach-sign -o timestamp.gpg timestamp