From 5208abd2595e1f188a4a2a7937ce6e1e37e75a23 Mon Sep 17 00:00:00 2001
From: Ansgar Burchardt <ansgar@debian.org>
Date: Sat, 23 Jan 2016 14:38:35 +0100
Subject: [PATCH] README.stable-point-release: updates from 8.3

---
 docs/README.stable-point-release | 50 ++++++++++++++------------------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/docs/README.stable-point-release b/docs/README.stable-point-release
index a280bec6..02ceb3c7 100644
--- a/docs/README.stable-point-release
+++ b/docs/README.stable-point-release
@@ -6,8 +6,8 @@ Rough Guide to doing Stable Point Releases in Debian
 suite=stable
 suitename=jessie
 pusuite=proposed-updates
-oldrev=8.1
-newrev=8.2
+oldrev=8.2
+newrev=8.3
 export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 . "${configdir}/common"
@@ -17,15 +17,16 @@ export LANG=C
 export LC_ALL=C
 pg_timestamp pre_${suite}_${newrev}
 cd ~
-mkdir -p ${suite}_${newrev}
-cd ${suite}_${newrev}
+mkdir -p ${suitename}_${newrev}
+cd ${suitename}_${newrev}
 dak control-suite -l ${pusuite} > ${pusuite}.list
 dak control-suite -l ${suite} > ${suite}.list
 
 - ask SRMs if there is anything to be skipped from this release. If so
   edit ${pusuite}.list (and later the Changelog too)
 - bash:
-skip="squid3 icedove php5"
+# skip: list of *source* packages to skip, whitespace seperated
+skip=""
 if [ -n "${skip}" ]; then
   mv ${pusuite}.list ${pusuite}.list.ori
   grep -vFf <(dak ls -f heidi -S -s ${pusuite} ${skip}) ${pusuite}.list.ori > ${pusuite}.list
@@ -47,7 +48,7 @@ mv -t "${pumorguedir}" -n -- *.changes
 
 - -r0 additions?
   For example new d-i. If so:
-cd ~/${suite}_${newrev}
+cd ~/${suitename}_${newrev}
 cp /srv/release.debian.org/www/${suitename}/${newrev%%.*}/${newrev}/${suitename}-r0-additions.cs .
 dak control-suite --add ${suitename}-r0 < ${suitename}-r0-additions.cs
 
@@ -58,11 +59,15 @@ cp /srv/release.debian.org/www/${suitename}/${newrev%%.*}/${newrev}/propups.test
 dak control-suite --force --add testing <propups.testing
 
 - ask rms if they have RMs to do.
+# dak rm -s ${suite} -R -p -d ### -m '###' ###
+- Copy in entries from /srv/ftp.debian.org/web/removals.txt:
+# $EDITOR ${ftpdir}/dists/${suite}/ChangeLog
+
 - and then check if they have a d-i update. if so, bash:
 # set dioldver to "empty" if there is no old to remove
-diver=20150422+deb8u2
+diver=20150422+deb8u3
 dak copy-installer -s ${pusuite} -d ${suite} ${diver}
-dioldver=20150422+deb8u1
+dioldver=20150422+deb8u2
 if [ "${dioldver}" != "empty" ]; then
     cd $ftpdir/dists/${suite}/main
     for iarch in $(dak admin s-a list-arch ${suite}); do
@@ -103,6 +108,12 @@ sed -e "s/Debian ${oldrev}/Debian ${newrev}/g; /Debian ${newrev}/ s/released .*\
 sed -e "s/Debian ${oldrev}/Debian ${newrev}/g; /Debian ${newrew}/ s/released .*\\./released ${date_long}./; /meta name=\"Modified\"/ s/content=\".*\"/content=\"${date_iso}\"/" -i ../../README.html
 
 # Inspect changes. Regular expressions might be a bit fragile.
+for f in README README.html dists/README dists/${suite}/ChangeLog; do
+  diff -u ${mirrordir}/ftp-master/${f} ${ftpdir}/${f}
+done
+
+# If changes are needed:
+cd ${ftpdir}/dists/${suite}
 $EDITOR ChangeLog ../README ../../README ../../README.html
 rm -f -- ./*~ ../*~ ../../*~
 
@@ -132,6 +143,7 @@ dak cruft-report -s ${suite}
 
 - then:
 dak generate-packages-sources2 --force -s ${suite} && dak contents generate -f -s ${suite} -a ftp-master
+dak generate-packages-sources2 -s ${pusuite}
 
 - For wheezy: update main/i18n/Index
 if [[ ${suitename} == wheezy ]]; then
@@ -150,23 +162,5 @@ gpg --no-default-keyring --keyring /usr/share/keyrings/debian-archive-keyring.gp
 
 - Check if a mirror push is needed or next dinstall is enough. for a push
 o if so, bash:
-
-TRACEFILE="${ftpdir}/project/trace/ftp-master.debian.org"
-DATE_SERIAL=$(date +"%Y%m%d01")
-FILESOAPLUS1=$(awk '/serial/ { print $3+1 }' ${TRACEFILE} )
-if [ "$DATE_SERIAL" -gt "$FILESOAPLUS1" ]; then
-    SERIAL="$DATE_SERIAL"
-else
-    SERIAL="$FILESOAPLUS1"
-fi
-date -u > ${TRACEFILE}
-echo "Using dak v1" >> ${TRACEFILE}
-echo "Running on host: $(hostname -f)" >> ${TRACEFILE}
-echo "Archive serial: ${SERIAL}" >> ${TRACEFILE}
-cd ${mirrordir}
-rsync -aH --link-dest ${ftpdir} --delete --delete-after --ignore-errors ${ftpdir}/. .
-date -u > /srv/ftp.debian.org/web/mirrorstart
-echo "Using dak v1" >> /srv/ftp.debian.org/web/mirrorstart
-echo "Running on host $(hostname -f)" >> /srv/ftp.debian.org/web/mirrorstart
-sudo -H -u archvsync /home/archvsync/runmirrors > ~dak/runmirrors.log 2>&1 &
-
+cd
+${configdir}/cronscript mirror
-- 
2.39.5