summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2004-06-16 23:30:42 +0000
committerHavoc Pennington <hp@src.gnome.org>2004-06-16 23:30:42 +0000
commit6a3eb44bb697b7fd67a785337cd21497f2335de8 (patch)
tree47472f5cc912f5769ca4c665de93a5ec2a310a85
parent9170f58f3b8597b343f9188c0c28b2bfbebc767f (diff)
downloadmetacity-6a3eb44bb697b7fd67a785337cd21497f2335de8.tar.gz
switch to versioning 2.8.1.x on gnome-2-6 branch
2004-06-16 Havoc Pennington <hp@redhat.com> * configure.in: switch to versioning 2.8.1.x on gnome-2-6 branch
-rw-r--r--ChangeLog4
-rw-r--r--configure.in7
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f3f727f..e1a9c823 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-16 Havoc Pennington <hp@redhat.com>
+
+ * configure.in: switch to versioning 2.8.1.x on gnome-2-6 branch
+
2004-06-04 Jeff Waugh <jdub@perkypants.org>
* src/metacity.schemas.in: Set titlebar_uses_system_font = false. The
diff --git a/configure.in b/configure.in
index 6c83ccb8..a4402a48 100644
--- a/configure.in
+++ b/configure.in
@@ -4,8 +4,9 @@ AC_INIT(src/display.c)
AM_CONFIG_HEADER(config.h)
# 0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987
-# releases on a branch add a 4th version like 2.4.21.1
-AM_INIT_AUTOMAKE(metacity, 2.8.1)
+## On GNOME 2.6 branch, use 2.8.1.x since we're keeping 2.8.2 and higher
+## for GNOME 2.8 - the confusion will end in GNOME 2.10, bear with us
+AM_INIT_AUTOMAKE(metacity, 2.8.1.0)
# Honor aclocal flags
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
@@ -439,4 +440,4 @@ metacity-$VERSION:
Xsync: ${found_xsync}
Deprecated config dialog: ${enable_config_dialog}
"
-#echo "This is the UNSTABLE branch of metacity, use 2.8.x for stable (gnome-2-6 branch in CVS)"
+echo "This is the GNOME 2.6 stable branch of metacity"