diff options
| -rw-r--r-- | Releasing | 14 | 
1 files changed, 8 insertions, 6 deletions
| @@ -10,22 +10,24 @@ These are Bdale's notes on how to do a release.  	  will be pulled in automatically)  	- update the version in configure.ac -        git log > ChangeLog -	git commit -a -	- make absolutely sure checked-out tree is "clean"  +	- make absolutely sure checked-out tree is "clean" (commit as needed)  	- if this is an x.y release, then:  		git checkout -b branch-<version> -		git tag -a <version>  	- if this is an x.y.z release, then:  		git checkout branch-<version>		# the x.y parts only  		git merge master -		git tag -a <version>			# full x.y.z version -	- edit .git/gbp.conf to use branch-<version> as upstream if needed +        git log > ChangeLog +	git commit -a + +	git tag -a <version>  	git checkout debian  	git merge branch-<version> +	- edit .git/gbp.conf to use branch-<version> as upstream and debian +	  as packaging branch, if needed +  	- verify debian/changelog is "clean" ending in last release version  	- craft a suitable debian/changelog entry, possibly using:  	git-dch --release --new-version=<version>-1 --multimaint-merge | 
