projects
/
fw
/
altos
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b78cf16
)
update Releasing document to reflect process as of 1.2
author
Bdale Garbee
<bdale@gag.com>
Thu, 16 May 2013 07:53:42 +0000
(
01:53
-0600)
committer
Bdale Garbee
<bdale@gag.com>
Thu, 16 May 2013 07:53:42 +0000
(
01:53
-0600)
Releasing
patch
|
blob
|
history
diff --git
a/Releasing
b/Releasing
index ce4df7c279c177522437c4935271b295492af436..4e76d791887235ddb2ca095ab7e65b7c95936ed1 100644
(file)
--- a/
Releasing
+++ b/
Releasing
@@
-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
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>
- 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
- 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>
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
- 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