From 563746c7954a147cc0b7527892e285cf34ea5901 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Thu, 4 Sep 2003 17:16:53 +0000 Subject: [PATCH] Merge from stable. Thu Sep 4 19:11:23 2003 Kristian Rietveld Merge from stable. * docs/RELEASE-HOWTO: updates. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ docs/RELEASE-HOWTO | 13 ++++++------- 6 files changed, 36 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index a6696ba2df..9992f735bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Sep 4 19:11:23 2003 Kristian Rietveld + + Merge from stable. + + * docs/RELEASE-HOWTO: updates. + 2003-09-04 Matthias Clasen * tests/merge-2.ui: Use "position" instead of "pos". diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a6696ba2df..9992f735bf 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Thu Sep 4 19:11:23 2003 Kristian Rietveld + + Merge from stable. + + * docs/RELEASE-HOWTO: updates. + 2003-09-04 Matthias Clasen * tests/merge-2.ui: Use "position" instead of "pos". diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a6696ba2df..9992f735bf 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Thu Sep 4 19:11:23 2003 Kristian Rietveld + + Merge from stable. + + * docs/RELEASE-HOWTO: updates. + 2003-09-04 Matthias Clasen * tests/merge-2.ui: Use "position" instead of "pos". diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a6696ba2df..9992f735bf 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Thu Sep 4 19:11:23 2003 Kristian Rietveld + + Merge from stable. + + * docs/RELEASE-HOWTO: updates. + 2003-09-04 Matthias Clasen * tests/merge-2.ui: Use "position" instead of "pos". diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a6696ba2df..9992f735bf 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Thu Sep 4 19:11:23 2003 Kristian Rietveld + + Merge from stable. + + * docs/RELEASE-HOWTO: updates. + 2003-09-04 Matthias Clasen * tests/merge-2.ui: Use "position" instead of "pos". diff --git a/docs/RELEASE-HOWTO b/docs/RELEASE-HOWTO index 8520a42c91..5ec2aff0f0 100644 --- a/docs/RELEASE-HOWTO +++ b/docs/RELEASE-HOWTO @@ -4,8 +4,8 @@ How to do a GTK+ release? Make sure you have Owen's special autoconf and libtool RPMs, available at: http://people.redhat.com/otaylor/gtk/autotools/. -Also make sure you have the following packages installed (I used the RPM -package names from RedHat 8.0): +Also make sure you have the following packages installed with all their +dependencies (I used the RPM package names from RedHat 9): * gtk-doc * linuxdoc-tools * docbook-utils @@ -16,10 +16,9 @@ Without those packages make distcheck will *not* pass. 0) Blow away your gtk+ directory, check a new version out 1) autogen and build it, make sure to enable docs. 2) Update NEWS based on ChangeLog -3) Update version in configure.in, increase MICRO, interface and binary -age by 1. (Note that this is critical, a slip-up here will cause the soname -to change). -4) Add === Released 2.0.x === at the top of the ChangeLog +3) Update version in configure.in, increase micro and interface age by 1. +(Note that this is critical, a slip-up here will cause the soname to change). +4) Add === Released 2.x.y === at the top of the ChangeLog 5) make mydistcheck 6) Fix broken stuff found by 4) repeat 7) cvs commit; you'll have a bunch of po file changes, and maybe some @@ -27,7 +26,7 @@ doc changes too (NOTE: be sure to use cvs with compression, else you'll end up waiting for a long time :). 8) If 7) fails because someone else committed inbetween, curse, cvs up fix conflicts and go to 5) -9) type 'cvs tag GTK_2_0_9' in the toplevel directory +9) type 'cvs tag GTK_2_x_y' in the toplevel directory 10) You now have the tarball, and the CVS tag, now upload the tarball to gnome.org and gtk.org 11) Go to the gnome-announce list archives, find the last announce message,