X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=docs%2FREADME.stable-point-release;h=2b790be46b82a1ebb1e29acac70a09e6af15da94;hb=30782de1cf7c624e8dd6a867c321cd0b8b7ba811;hp=9fcc777d94ebdd7bc76a18039fdf14fa7b2b9eb1;hpb=593d2495c44a0cf48d3fc180d8b2caf8594e6db0;p=dak.git

diff --git a/docs/README.stable-point-release b/docs/README.stable-point-release
index 9fcc777d..2b790be4 100644
--- a/docs/README.stable-point-release
+++ b/docs/README.stable-point-release
@@ -4,10 +4,10 @@ Rough Guide to doing Stable Point Releases in Debian
 - sudo to dak
 - bash:
 suite=stable
-suitename=wheezy
+suitename=jessie
 pusuite=proposed-updates
-oldrev=7.4
-newrev=7.5
+oldrev=8.3
+newrev=8.4
 export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 . "${configdir}/common"
@@ -17,15 +17,25 @@ 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: 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
+fi
 dak make-changelog -s ${pusuite} -b ${suite} | cat - ${ftpdir}/dists/${suite}/ChangeLog | sponge ${ftpdir}/dists/${suite}/ChangeLog
+if [ -n "${skip}" ]; then
+  $EDITOR ${ftpdir}/dists/${suite}/ChangeLog
+fi
+
 dak control-suite --add ${suite} < ${pusuite}.list
 dak control-suite --remove ${pusuite} < ${pusuite}.list
 
@@ -38,21 +48,28 @@ 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
 
 - sync with stable RM if there is any propup needed. do it, if so:
-like, cat /srv/release.debian.org/www/squeeze/6.0/6.0.4/propup.unstable | dak control-suite --add unstable
-Note: unstable first, then testing
+cp /srv/release.debian.org/www/${suitename}/${newrev%%.*}/${newrev}/propups.unstable .
+dak control-suite --force --add unstable <propups.unstable
+cp /srv/release.debian.org/www/${suitename}/${newrev%%.*}/${newrev}/propups.testing .
+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=20130613+deb7u2+b1
+diver=20150422+deb8u3+b1
 dak copy-installer -s ${pusuite} -d ${suite} ${diver}
-dioldver=20130613+deb7u1+b2
-cd $ftpdir/dists/${suite}/main
+dioldver=20150422+deb8u3
 if [ "${dioldver}" != "empty" ]; then
+    cd $ftpdir/dists/${suite}/main
     for iarch in $(dak admin s-a list-arch ${suite}); do
         if [ -d "installer-${iarch}/${dioldver}" ]; then
             echo "Moving installer-${iarch}/${dioldver} to morgue"
@@ -60,6 +77,12 @@ if [ "${dioldver}" != "empty" ]; then
             mv "installer-${iarch}/${dioldver}" "${base}/morgue/d-i/installer-${iarch}/"
         fi
     done
+
+    # Remove old version also from proposed-updates
+    cd $ftpdir/dists/${pusuite}/main
+    for iarch in $(dak admin s-a list-arch ${suite}); do
+        rm -rf -- "installer-${iarch}/${dioldver}"
+    done
 fi
 cd $ftpdir/dists/${suite}
 
@@ -73,8 +96,26 @@ cd ${ftpdir}
 
 - Update version number in README, README.html and dists/README,
   Clean up dists/stable/ChangeLog (add header, basically). bash:
-  $EDITOR ChangeLog ../README ../../README*
-  rm -f *~ ../*~ ../../*~
+
+cd ${ftpdir}/dists/${suite}
+
+date_long=$(date "+%A, %-dth %B %Y" | sed 's/1th/1st/; s/2th/2nd/; s/3th/3rd/')
+date_iso=$(date "+%Y-%m-%d")
+date_short=$(date "+%a, %d %b %Y")
+sed -e "1i======================================\n${date_short} - Debian ${newrev} released\n======================================" -i ChangeLog
+sed -e "/^${suite}/ s/Debian ${oldrev}/Debian ${newrev}/" -i ../README
+sed -e "s/Debian ${oldrev}/Debian ${newrev}/g; /Debian ${newrev}/ s/released .*\\./released ${date_long}./" -i ../../README
+sed -e "s/Debian ${oldrev}/Debian ${newrev}/g; /Debian ${newrev}/ 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 -- ./*~ ../*~ ../../*~
 
 - Update the 'Debian<n>.<n>r<n>' symlink in dists/
 cd $ftpdir/dists/
@@ -96,60 +137,32 @@ EOF
 dak dominate --force -s ${suite}
 - check output from cruft report:
 dak cruft-report -s ${suite}
+- if cruft was removed: go back to run dominate again
 
-dak generate-filelist -s ${suite}
+- if cruft was removed: update changelog from /srv/ftp.debian.org/web/removals.txt:
+# $EDITOR ${ftpdir}/dists/${suite}/ChangeLog
 
 - Let SRM see if all is ok
 
 - then:
-if [ "${suitename}" = "squeeze" ]; then
-  dak generate-packages-sources -s ${suite} && dak contents generate -f -s ${suite} -a ftp-master
-else
-  dak generate-packages-sources2 --force -s ${suite} && dak contents generate -f -s ${suite} -a ftp-master
-fi
-
-- For squeeze: merge Contents
-if [ "${suitename}" = "squeeze" ]; then
-  cd $ftpdir/dists/${suite}
-  for carch in $(dak admin s-a list-arch ${suite}); do
-    echo doing ${carch}
-    cp $base/dak/templates/contents Contents-${carch}.new;
-    zcat {main,contrib,non-free}/Contents-${carch}.gz | ~joerg/mergecontents.pl | sort >> Contents-${carch}.new;
-    gzip -9v Contents-${carch}.new;
-    mv Contents-${carch}.new.gz Contents-${carch}.gz;
-  done
-  rm {main,contrib,non-free}/Contents-*
-fi
+dak generate-packages-sources2 --force -s ${suite},${pusuite} && dak contents generate -f -s ${suite} -a ftp-master
 
 - For wheezy: update main/i18n/Index
-if [ "${suitename}" = "wheezy" ]; then
+if [[ ${suitename} == wheezy ]]; then
   ${scriptsdir}/generate-i18n-Index "${ftpdir}/dists/${suite}"
 fi
 
 - Generate Releases:
-dak generate-releases -f -s ${suite}
+dak generate-releases -f -s ${suite} ${pusuite}
+# Remove InRelease: Release can be signed by both ftpmaster & stable release keys
 rm ${ftpdir}/dists/${suite}/InRelease
 
 - have the SRMs sign it and put the signature in.
+cd ${ftpdir}/dists/${suite}
+cat /srv/release.debian.org/www/${suitename}/${newrev%%.*}/${newrev}/Release-${newrev}.gpg >> Release.gpg
+gpg --no-default-keyring --keyring /usr/share/keyrings/debian-archive-keyring.gpg --trust-model=always --verify Release.gpg Release
+
 - 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