X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=docs%2FREADME.stable-point-release;h=a061f7ef0798680657915b6892691fe4fefb342c;hb=3bd0d43c9a4c407af675816a91622150b9da2c0b;hp=9f2288ad8a4c0de9a110a7b47877e757e8fae6cd;hpb=26409ff20dbf299bc471ad75e2b5911ce11f4009;p=dak.git

diff --git a/docs/README.stable-point-release b/docs/README.stable-point-release
index 9f2288ad..a061f7ef 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.3
+newrev=7.4
 export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 . "${configdir}/common"
@@ -26,21 +26,33 @@ 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.
+  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
 - 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=20110106+squeeze4+b2
+diver=20130613+deb7u1+b2
 dak copy-installer -s ${pusuite} -d ${suite} ${diver}
-dioldver=20110106+squeeze4
+dioldver=20130613+deb7u1+b1
 cd $ftpdir/dists/${suite}/main
 if [ "${dioldver}" != "empty" ]; then
     for iarch in $(dak admin s-a list-arch ${suite}); do
@@ -89,18 +101,24 @@ 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
 
 - For squeeze: merge Contents
-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-*
+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
 
 - For wheezy: update main/i18n/Index
 if [ "${suitename}" = "wheezy" ]; then