X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdinstall.functions;h=8d7b6d1c432692208d0d041777f5b8bfec33c6ed;hb=bdd37a6d201bf0fbef44ce684b38934d5d149ac1;hp=5de4458563dc5d349f9d8f10bb9116880f0d3e1b;hpb=a1fe600224a020cc0c5c63886843a9a0a102b6f2;p=dak.git

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index 5de44585..8d7b6d1c 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -112,7 +112,7 @@ function dep11() {
             if [ -d ${dir}/ ]; then
                 for comp in main contrib non-free; do
                     mkdir -p ${ftpdir}/dists/${dir}/${comp}/dep11
-                    cd dists/${dir}/${comp}/dep11
+                    cd ${dir}/${comp}
                     rsync -aq --delete --delete-after --exclude *.tmp . ${ftpdir}/dists/${dir}/${comp}/dep11/.
                     cd ${scriptdir}/dep11
                 done
@@ -132,6 +132,7 @@ function cruft() {
 function dominate() {
     log "Removing obsolete source and binary associations"
     dak dominate
+    dak manage-debug-suites unstable-debug experimental-debug
 }
 
 function autocruft() {
@@ -438,7 +439,7 @@ function mirror() {
     # Ugly "hack", but hey, it does what we want.
     cp ${TRACEFILE} ${TRACEFILE_BDO}
 
-    for archive in "${public_archives[@]}"; do
+    for archive in ftp-master backports; do
         archiveroot="$(get_archiveroot "${archive}")"
         mirrordir="${archiveroot}/../mirror"
         cd ${mirrordir}
@@ -485,7 +486,8 @@ function mirrorpush() {
         while read SHASUM SIZE NAME; do
             if ! [ -f "${subdir}/${NAME}" ]; then
                bname=$(basename ${NAME})
-                if [[ "${bname}" =~ ^(Packages|Sources|Contents-[a-zA-Z0-9-]+|Translation-[a-zA-Z_]+)$ ]]; then
+               if [[ "${bname}" =~ ^(Packages|Sources|Contents-[a-zA-Z0-9-]+|Translation-[a-zA-Z_]+|Components-(amd64|i386)\.yml|icons-(128x128|64x64)\.tar)$ ]]; then
+
                     # We don't keep unpacked files, don't check for their existance.
                     # We might want to go and check their unpacked shasum, but right now
                     # I don't care. I believe it should be enough if all the packed shasums