[dak/master] pointrelease: generate indices and Release for ${suite}-debug too

[Ansgar Burchardt <ansgar@debian.org>]

---
 config/debian/pointrelease | 39 +++++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/config/debian/pointrelease b/config/debian/pointrelease
index 5c746f4..9c7353e 100755
--- a/config/debian/pointrelease
+++ b/config/debian/pointrelease
@@ -340,6 +340,9 @@ log "Contents"
 dak contents generate -f -s ${suite} -a ftp-master
 wait
 ${scriptsdir}/sync-release ${suite}
+if [[ ${suitename} != jessie ]]; then
+    ${scriptsdir}/sync-release ${suite}-debug
+fi
 
 if [[ ${suitename} == wheezy ]]; then
   ${scriptsdir}/generate-i18n-Index "${ftpdir}/dists/${suite}"
@@ -347,21 +350,37 @@ fi
 
 echo "Generate release files?"
 confirm
-dak generate-releases -f -s ${suite} ${pusuite}
+release_suites="${suite} ${pusuite}"
+if [[ ${suitename} != jessie ]]; then
+    release_suites="${release_suites} ${suite}-debug ${pusuite}-debug"
+fi
+dak generate-releases -f -s ${release_suites}
 ${scriptsdir}/sync-release ${suite}
+if [[ ${suitename} != jessie ]]; then
+    ${scriptsdir}/sync-release ${suite}-debug
+fi
 
 log "Release file generated, waiting for RMs checking and (hopefully) signing"
 
 # Remove InRelease: Release can be signed by both ftpmaster & stable release keys
-rm ${ftpdir}/dists/${suite}/InRelease ${ftpdir}/zzz-dists/${suite}/InRelease
-releasefile=Release-${newrev}.gpg
-cd ~/${suitename}_${newrev}
-while ! ${wget} -O "${releasefile}" "${release_base}/${releasefile}"; do
-    sleep 10
-done
-cd ${ftpdir}/dists/${suite}
-cat ~/${suitename}_${newrev}/${releasefile} >> Release.gpg
-gpg --no-default-keyring --keyring /usr/share/keyrings/debian-archive-keyring.gpg --trust-model=always --verify Release.gpg Release
+merge-release-signatures() {
+    local s="${1}"
+    local releasefile="${2}"
+    rm ${ftpdir}/dists/${s}/InRelease ${ftpdir}/zzz-dists/${s}/InRelease
+    cd ~/${suitename}_${newrev}
+    while ! ${wget} -O "${releasefile}" "${release_base}/${releasefile}"; do
+        sleep 10
+    done
+    cd ${ftpdir}/dists/${s}
+    cat ~/${suitename}_${newrev}/${releasefile} >> Release.gpg
+    gpg --no-default-keyring --keyring /usr/share/keyrings/debian-archive-keyring.gpg --trust-model=always --verify Release.gpg Release
+}
+
+merge-release-signatures ${suite} Release-${newrev}.gpg
+if [[ ${suitename} != jessie ]]; then
+    merge-release-signatures ${suite}-debug Release-${newrev}-debug.gpg
+fi
+
 echo "Done. Is a mirrorpush needed? Or just one to the cd-builder?"
 read -e -p "Mirrorpush? no/cd/yes " -i "cd" mirrorpush
 
-- 
2.1.4