[cairo-commit] 6 commits - Makefile.am RELEASING
Behdad Esfahbod
behdad at kemper.freedesktop.org
Sat Mar 3 12:42:22 PST 2007
Makefile.am | 19 ++++---------------
RELEASING | 24 ++++++++++++++----------
2 files changed, 18 insertions(+), 25 deletions(-)
New commits:
diff-tree 1720d0b9508b70ac0c5f2436c3b80a2ab801f138 (from 79acd268d9ac91f0e9f03467b220241cda3457a5)
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Sat Mar 3 15:42:09 2007 -0500
[Makefile.am] --enable-test-surfaces in distcheck
diff --git a/Makefile.am b/Makefile.am
index 10513af..63b47d8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,7 +48,7 @@ MAINTAINERCLEANFILES = \
$(srcdir)/mkinstalldirs \
`find "$(srcdir)" -type f -name Makefile.in -print`
-DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-test-surfaces
include $(srcdir)/ChangeLog.mk
diff-tree 79acd268d9ac91f0e9f03467b220241cda3457a5 (from f9f71457a5d1e002f7f6b08232892ba61fef8ead)
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Sat Mar 3 15:41:32 2007 -0500
[Makefile.am] Remove releasing instructions that are in RELEASING already
diff --git a/Makefile.am b/Makefile.am
index c01423c..10513af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -148,12 +148,8 @@ release-upload: release-check $(tar_file
git-tag -s -m "cairo $(CAIRO_VERSION_MAJOR).$(CAIRO_VERSION_MINOR).$(CAIRO_VERSION_MICRO) release" $(CAIRO_VERSION_MAJOR).$(CAIRO_VERSION_MINOR).$(CAIRO_VERSION_MICRO)
release-publish-message: releases/$(sha1_file)
- @echo "Pleas push the new tag with a command such as:"
- @echo ""
- @echo " git push master $(VERSION)"
- @echo ""
- @echo "Please send an announcement to $(RELEASE_ANNOUNCE_LIST)"
- @echo "including the following:"
+ @echo "Please follow the instructions in RELEASING to push stuff out and"
+ @echo "send out the announcement mails. Here is the excerpt you need:"
@echo ""
@echo "Subject: $(PACKAGE) $(RELEASE_OR_SNAPSHOT) $(VERSION) now available"
@echo ""
@@ -185,13 +181,6 @@ release-publish-message: releases/$(sha1
@echo " git checkout -b build $(VERSION)"
@echo ""
@echo "============================== CUT HERE =============================="
- @echo "Also, please add the new entries from the NEWS file as well as the detailed"
- @echo "change log sent to the cairo-commit list when the tag is pushed."
- @echo ""
- @echo "The same NEWS entries should be posted on the cairographics.org wiki as well."
- @echo ""
- @echo "Last but not least, do not forget to bump up the micro"
- @echo "version component to the next (odd) number, commit, and push."
release-publish: release-upload release-publish-message
diff-tree f9f71457a5d1e002f7f6b08232892ba61fef8ead (from 454c6a62a93d4d9e933a4e401997a16f1b0a569b)
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Sat Mar 3 15:37:45 2007 -0500
[RELEASING] Update announcement mail instructions
diff --git a/RELEASING b/RELEASING
index a1560fc..a116a81 100644
--- a/RELEASING
+++ b/RELEASING
@@ -107,13 +107,14 @@ Here are the steps to follow to create a
10) Send a message to cairo-announce at cairographics.org and CC
gnome-announce-list at gnome.org to announce the new release using
- the text provided from "make release-publish", adding the standard
- "What is cairo" and "Where to get more information about cairo"
- blurbs from README, and also tacking on the detailed changelog-ish
- thing that gets mailed out when you push the tag.
+ the text provided from "make release-publish", adding the excerpt
+ from NEWS, your signature, followed by the standard "What is cairo"
+ and "Where to get more information about cairo" blurbs from README,
+ and finally tacking on the detailed changelog-ish thing that gets
+ mailed out when you push the tag (but not the diffstat thing).
11) Edit the cairo wiki to add the announcement to the NEWS page and
- the front page.
+ the front page. (just the parts before your signature).
12) For minor releases (no X.Y change), notify desktop-devel-list at gnome.org
or update the ExternalDependencies page for the current cycle if you
diff-tree 454c6a62a93d4d9e933a4e401997a16f1b0a569b (from 57e1b6fa98d688b72dd3617e8313ea35f8ce78e1)
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Sat Mar 3 15:35:25 2007 -0500
[RELEASING] Note that two versions should be added to bugzilla
diff --git a/RELEASING b/RELEASING
index 079bf83..a1560fc 100644
--- a/RELEASING
+++ b/RELEASING
@@ -100,7 +100,10 @@ Here are the steps to follow to create a
git push cairo X.Y.Z
-9) Edit the cairo bugzilla product and add the new version numbers
+9) Edit the cairo bugzilla product and add the new version numbers. Note
+ that you need to add two versions. One for the release/snapshot (with
+ an even micro version), another with the post-release version (with an
+ odd micro version).
10) Send a message to cairo-announce at cairographics.org and CC
gnome-announce-list at gnome.org to announce the new release using
diff-tree 57e1b6fa98d688b72dd3617e8313ea35f8ce78e1 (from 052acc95e9c354981eea0968c5727e4a0568a959)
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Sat Mar 3 15:34:19 2007 -0500
[RELEASING] Reorder pushing tag and commits
We should push the tag only after pushing the actually release commit.
diff --git a/RELEASING b/RELEASING
index e71bc07..079bf83 100644
--- a/RELEASING
+++ b/RELEASING
@@ -92,14 +92,14 @@ Here are the steps to follow to create a
If for some reason you lost this message, "make release-publish-message"
prints it for you.
-7) Push the newly created tag out to the central tree with a command
+7) Increment cairo_version_micro to the next larger (odd) number in
+ configure, commit, and push.
+
+8) Push the newly created tag out to the central tree with a command
something like:
git push cairo X.Y.Z
-8) Increment cairo_version_micro to the next larger (odd) number in
- configure, commit, and push.
-
9) Edit the cairo bugzilla product and add the new version numbers
10) Send a message to cairo-announce at cairographics.org and CC
diff-tree 052acc95e9c354981eea0968c5727e4a0568a959 (from 9f0a1648b7886714e5c742119083414fcc92dc82)
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Sat Mar 3 15:32:42 2007 -0500
[RELEASING] Fix git-tag invocation
diff --git a/Makefile.am b/Makefile.am
index 10f7f56..c01423c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -145,7 +145,7 @@ release-upload: release-check $(tar_file
scp $(tar_file) $(sha1_file) $(gpg_file) $(RELEASE_UPLOAD_HOST):$(RELEASE_UPLOAD_DIR)
mv $(tar_file) $(sha1_file) $(gpg_file) releases
ssh $(RELEASE_UPLOAD_HOST) "rm -f $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(tar_file) $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
- git tag -s $(CAIRO_VERSION_MAJOR).$(CAIRO_VERSION_MINOR).$(CAIRO_VERSION_MICRO) -m "cairo $(CAIRO_VERSION_MAJOR).$(CAIRO_VERSION_MINOR).$(CAIRO_VERSION_MICRO) release"
+ git-tag -s -m "cairo $(CAIRO_VERSION_MAJOR).$(CAIRO_VERSION_MINOR).$(CAIRO_VERSION_MICRO) release" $(CAIRO_VERSION_MAJOR).$(CAIRO_VERSION_MINOR).$(CAIRO_VERSION_MICRO)
release-publish-message: releases/$(sha1_file)
@echo "Pleas push the new tag with a command such as:"
More information about the cairo-commit
mailing list