X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=docs%2FREADME.stable-point-release;h=e395adf9ccb028373936743b890e0fabfde599fd;hb=21c41b7ab4f49c5bb0e5474b0885f7c7a74aec05;hp=c0215fecb13be18f3f917e9dc62aa360246f6c8d;hpb=5eb3bbd6f6504930e9271f1b526673949b52e1c2;p=dak.git

diff --git a/docs/README.stable-point-release b/docs/README.stable-point-release
index c0215fec..e395adf9 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=squeeze
+suitename=wheezy
 pusuite=proposed-updates
-oldrev=6.0.5
-newrev=6.0.6
+oldrev=7.6
+newrev=7.7
 export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 . "${configdir}/common"
@@ -26,18 +26,34 @@ dak control-suite -l ${suite} > ${suite}.list
   edit ${pusuite}.list (and later the Changelog too)
 - bash:
 dak make-changelog -s ${pusuite} -b ${suite} | cat - ${ftpdir}/dists/${suite}/ChangeLog | sponge ${ftpdir}/dists/${suite}/ChangeLog
-cat ${pusuite}.list | dak control-suite --add ${suite}
+dak control-suite --add ${suite} < ${pusuite}.list
 dak control-suite --remove ${pusuite} < ${pusuite}.list
 
+- clean up *.changes from proposed-updates:
+# Be careful if uploads were not included in the point release.
+pumorguedir="${base}/morgue/queues/$(date +%Y/%m)"
+mkdir -p "${pumorguedir}"
+cd ${ftpdir}/dists/${pusuite}
+mv -t "${pumorguedir}" -n -- *.changes
+
+- -r0 additions?
+  For example new d-i. If so:
+cd ~/${suite}_${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.
 - 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=20110106+squeeze4+b2
+diver=20130613+deb7u2+b3
 dak copy-installer -s ${pusuite} -d ${suite} ${diver}
-dioldver=20110106+squeeze4
+dioldver=20130613+deb7u2+b1
 cd $ftpdir/dists/${suite}/main
 if [ "${dioldver}" != "empty" ]; then
     for iarch in $(dak admin s-a list-arch ${suite}); do
@@ -50,6 +66,14 @@ if [ "${dioldver}" != "empty" ]; then
 fi
 cd $ftpdir/dists/${suite}
 
+- Updates for win32-loader?
+cd ${ftpdir}/tools/win32-loader
+if [ -d ${suite}-proposed-updates ]; then
+    rm -r ${suite}
+    mv ${suite}-proposed-updates ${suite}
+fi
+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*
@@ -73,27 +97,47 @@ EOF
 
 - prepare for gps. bash:
 dak dominate --force -s ${suite}
+- check output from cruft report:
+dak cruft-report -s ${suite}
+
 dak generate-filelist -s ${suite}
 
 - Let SRM see if all is ok
 
 - then:
-dak generate-packages-sources -s ${suite} ; dak contents generate -f -s ${suite} -a ftp-master
+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
 
-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
+- 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
 
-rm {main,contrib,non-free}/Contents-*
+- For wheezy: update main/i18n/Index
+if [ "${suitename}" = "wheezy" ]; then
+  ${scriptsdir}/generate-i18n-Index "${ftpdir}/dists/${suite}"
+fi
 
+- Generate Releases:
 dak generate-releases -f -s ${suite}
+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.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: