Merge remote-tracking branch 'waldi-salsa/godard-apache' into HEAD

[mirror/dsa-puppet.git] / modules / schroot / files / schroot-setup.d / 99porterbox-extra-sources

diff --git a/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources b/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources
index 3b57ce4..e6e0f08 100755 (executable)
--- a/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources
+++ b/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources
@@ -37,23 +37,24 @@ if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
   SRCL="${CHROOT_PATH}/etc/apt/sources.list.d/auto.list"
   rm -f "$SRCL"
   mirror=${MIRROR:-http://ftp.debian.org/debian}
+  debugmirror=${DEBUGMIRROR:-http://debug.mirrors.debian.org/debian-debug/}
 
   case "$SUITE_ARCH" in
     ppc64)
       case "${SUITE_BASE:-}" in
         experimental)
           echo "deb     http://ftp.de.debian.org/debian-ports experimental main" >> "$SRCL"
-          echo "deb-src http://$mirror/debian experimental main" >> "$SRCL"
+          echo "deb-src $mirror experimental main" >> "$SRCL"
 
           echo "deb     http://ftp.de.debian.org/debian-ports sid main" >> "$SRCL"
-          echo "deb-src http://$mirror/debian sid main" >> "$SRCL"
+          echo "deb-src $mirror sid main" >> "$SRCL"
 
           echo "deb     http://ftp.de.debian.org/debian-ports unreleased main" >> "$SRCL"
           echo "deb-src http://ftp.de.debian.org/debian-ports unreleased main" >> "$SRCL"
           ;;
         sid)
           echo "deb     http://ftp.de.debian.org/debian-ports sid main" >> "$SRCL"
-          echo "deb-src http://$mirror/debian sid main" >> "$SRCL"
+          echo "deb-src $mirror sid main" >> "$SRCL"
 
           echo "deb     http://ftp.de.debian.org/debian-ports unreleased main" >> "$SRCL"
           echo "deb-src http://ftp.de.debian.org/debian-ports unreleased main" >> "$SRCL"
@@ -68,6 +69,9 @@ if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
         experimental)
           echo "deb     $mirror sid main" >> "$SRCL"
           echo "deb-src $mirror sid main" >> "$SRCL"
+
+          echo "deb     $debugmirror sid-debug main" >> "$SRCL"
+          echo "deb-src $debugmirror sid-debug main" >> "$SRCL"
           ;;
         sid|stretch)
           ;;
@@ -76,21 +80,20 @@ if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
           echo "deb-src http://security.debian.org/ ${suite_alias}/updates main" >> "$SRCL"
           ;;
       esac
+      case "${SUITE_BASE:-}" in
+        experimental|sid|stretch)
+          echo "deb     $debugmirror ${suite_alias}-debug main" >> "$SRCL"
+          echo "deb-src $debugmirror ${suite_alias}-debug main" >> "$SRCL"
+          ;;
+      esac
+
       echo "deb     $mirror ${suite_alias} main" >> "$SRCL"
       echo "deb-src $mirror ${suite_alias} main" >> "$SRCL"
 
       case "${SUITE_VARIANT:-}" in
         backports)
-          case "${SUITE_BASE:-}" in
-            squeeze)
-              echo "deb     http://backports.debian.org/debian-backports/ ${suite_alias}-${SUITE_VARIANT} main" >> "$SRCL"
-              echo "deb-src http://backports.debian.org/debian-backports/ ${suite_alias}-${SUITE_VARIANT} main" >> "$SRCL"
-              ;;
-            *)
-              echo "deb     $mirror ${suite_alias}-${SUITE_VARIANT} main" >> "$SRCL"
-              echo "deb-src $mirror ${suite_alias}-${SUITE_VARIANT} main" >> "$SRCL"
-              ;;
-          esac
+          echo "deb     $mirror ${SUITE_BASE}-${SUITE_VARIANT} main" >> "$SRCL"
+          echo "deb-src $mirror ${SUITE_BASE}-${SUITE_VARIANT} main" >> "$SRCL"
           ;;
       esac
       ;;