Merge branch 'release/experimental/1.0.27-1_experimental1'experimental/1.0.27-1_experimental1

1 files changed, 27 insertions, 19 deletions

diff --git a/doc/releases.txt b/doc/releases.txt
index a1b5478..1579b15 100644
--- a/doc/releases.txt
+++ b/doc/releases.txt
@@ -14,22 +14,26 @@ Day 35: Release
 
 Before the release:
 
-* set :new :yes on any new backend .desc files
+* set :new :yes on any new backend .desc files, by looking for added files:
+
+  cd backend
+  ls | while read aa; do git log --follow --diff-filter=A --find-renames=40% --format="%ai  $aa" "$aa"; done > foo.log
+
+  Then inspect foo.log for any files added since the last release.
 * Make sure that config.guess and config.sub are up-to-date (get them from
-  savannah.gnu.org/projects/config)
-* configure.in: increase version number
-* configure.in: remove 'git' from textual version number
-* configure.in: set is_release=yes
-* OPTIONAL: aclocal.m4: recreate by running aclocal
-* OPTIONAL: include/sane/config.h.in: recreate (autoheader in root of checkout)
-* DONT run autoreconf, it will overwrite our custom ltmain.sh
-* configure: recreate by running autoconf
-* NEWS: update and enter date of release
+  savannah.gnu.org/projects/config) (git clone is easiest)
+* configure.ac: remove 'git' from textual version number, and increment it
+* run autoreconf --force but do *NOT* use the --install option as it will
+  overwrite our custom ltmain.sh
+* ChangeLog: generate from git log, something like:
+  git log RELEASE_1_0_25..HEAD > ChangeLog
+* NEWS: update and enter date of release, etc
+  Get list of heavily change backends via: git diff --stat RELEASE_1_0_25
+  Get other things by reading ChangeLog
 * sane-backends.lsm: update
-* ChangeLog: set release marker
 * git commit -a
 * tag git with release tag; e.g.: 'git tag -a RELEASE_1_0_15'
-* probably DONT want to git push here, cause alioth will rebuild it's local
+* probably DONT want to git push here, because alioth will rebuild it's local
   checkout needlessly
 
 Making the release:
@@ -74,13 +78,17 @@ Announcing the release:
 
 After the release:
 
-* move ChangeLog to ChangeLog-"version"
-* start a new ChangeLog
-* add ChangeLog-"version" to EXTRA_DIST in Makefile.in and Makefile.am
-* configure.in: bump textual version & add 'git' suffix
-* configure.in: bump V_REV
-* configure.in: set is_release=no
+#### consider not adding old changelogs to release package
+* move ChangeLog to ChangeLogs/ChangeLog-"version"
+* start a new ChangeLog, with the following message:
+
+This file is automatically generated at release time using git commit messages.
+
+For the latest changes please refer to the output of `git log` or see:
+https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi?p=sane/sane-backends.git;a=log
+
+* configure.ac: bump textual version & add 'git' suffix
 * configure: regenerate with autoconf
 * remove the ':new' tag from any new backends .desc files
 * git add new files and commit
-* git push --tags
+* git push && git push --tags (one of these might give an error 'remote: fatal: bad object 0000000000000000000000000000000000000000', try the other one)