X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=docs%2FREADME.stable-point-release;h=3b98f2dd8b843b73c2dfec54e259e09c058991a1;hb=28b86b197fffbd068c2f030e987bc145829d9601;hp=a061f7ef0798680657915b6892691fe4fefb342c;hpb=2842053a93086d03faae7117b9134928a9ce2dac;p=dak.git

diff --git a/docs/README.stable-point-release b/docs/README.stable-point-release
index a061f7ef..3b98f2dd 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.3
-newrev=7.4
+oldrev=8.0
+newrev=8.1
 export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 . "${configdir}/common"
@@ -43,16 +43,17 @@ cp /srv/release.debian.org/www/${suitename}/${newrev%%.*}/${newrev}/${suitename}
 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.
-- check output from cruft report:
-dak cruft-report -s ${suite}
 - 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+deb7u1+b2
+diver=20150422+deb8u1
 dak copy-installer -s ${pusuite} -d ${suite} ${diver}
-dioldver=20130613+deb7u1+b1
+dioldver=empty
 cd $ftpdir/dists/${suite}/main
 if [ "${dioldver}" != "empty" ]; then
     for iarch in $(dak admin s-a list-arch ${suite}); do
@@ -96,16 +97,13 @@ EOF
 
 - prepare for gps. bash:
 dak dominate --force -s ${suite}
-dak generate-filelist -s ${suite}
+- check output from cruft report:
+dak cruft-report -s ${suite}
 
 - 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
+dak generate-packages-sources2 --force -s ${suite} && dak contents generate -f -s ${suite} -a ftp-master
 
 - For squeeze: merge Contents
 if [ "${suitename}" = "squeeze" ]; then
@@ -121,15 +119,21 @@ if [ "${suitename}" = "squeeze" ]; then
 fi
 
 - For wheezy: update main/i18n/Index
-if [ "${suitename}" = "wheezy" ]; then
+if [[ ${suitename} == wheezy ]] || [[ ${suitename} == jessie ]]; then
   ${scriptsdir}/generate-i18n-Index "${ftpdir}/dists/${suite}"
 fi
 
 - Generate Releases:
 dak generate-releases -f -s ${suite}
-rm ${ftpdir}/dists/${suite}/InRelease
+if [[ ${suitename} != jessie ]]; then
+    rm ${ftpdir}/dists/${suite}/InRelease
+fi
 
 - have the SRMs sign it and put the signature in.
+cd ${ftpdir}/dists/${suite}
+cat /srv/release.debian.org/www/${suitename}/${newrev%%.*}/${newrev}/Release.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: