Re: metacity branched

[Elijah P Newren <newren math utah edu>]

On Wed, 2004-06-16 at 17:32, Jeff Waugh wrote:
> <quote who="Havoc Pennington">
> 
> > subject pretty much covers it...
> 
> You just had to go and ruin the versioning convergence we almost had didn't
> you? :-)

Versioning convergence is still happening anyway, apparently:

1059 newren amr:gnome/metacity$ cvs -q diff -u -r 1.155 -r 1.156
configure.in Index: configure.in
===================================================================
RCS file: /cvs/gnome/metacity/configure.in,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- configure.in        5 May 2004 01:41:26 -0000       1.155
+++ configure.in        16 Jun 2004 23:29:05 -0000      1.156
@@ -4,8 +4,10 @@
 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)
+# we'll hold the 2.8.x versioning for GNOME 2.8, it was also used
+# for GNOME 2.6, then after GNOME 2.8 we'll have the numbers synced
+# with GNOME
+AM_INIT_AUTOMAKE(metacity, 2.8.2)
  
 # Honor aclocal flags
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
@@ -439,4 +441,4 @@
        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 UNSTABLE branch of metacity, use 2.8.1.x for stable
(gnome-2-6 branch in CVS)"
1060 newren amr:gnome/metacity$

> - Jeff

Elijah