[m-rev.] diff: final changes for 10.04 release

[Julien Fischer]

Branches: main, 10.04

Final preparations for the 10.04 release.

NEWS:
 	10.04 is no longer beta.

tools/test_mercury:
 	Switch over to using the release tag.

util/.cvsignore:
 	Ignore mfiltercc.

Index: NEWS
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/NEWS,v
retrieving revision 1.525
diff -u -r1.525 NEWS
--- NEWS	13 Jul 2010 09:14:07 -0000	1.525
+++ NEWS	18 Jul 2010 08:09:20 -0000
@@ -1,5 +1,5 @@
-NEWS since Mercury 10.04 beta 
------------------------------
+NEWS since Mercury 10.04
+------------------------

  Changes to the Mercury standard library:

@@ -7,8 +7,8 @@
    map_keys_only/3 map_values_only/3 and map_values/3.  They complement the
    functions of the same name.

-NEWS for Mercury 10.04 beta
----------------------------
+NEWS for Mercury 10.04
+----------------------

  Changes to the release numbering:

Index: tools/test_mercury
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.373
diff -u -r1.373 test_mercury
--- tools/test_mercury	29 Jun 2010 08:38:26 -0000	1.373
+++ tools/test_mercury	18 Jul 2010 08:09:59 -0000
@@ -187,21 +187,21 @@

      10.04)
          # This is for the 10.04 betas.
-        CHECKOUT_OPTS=-rversion-10_04-branch
-        BASE_TAG_NAME=version-10_04-branch
-        FTP_DIR_NAME=10.04-beta
-        RELEASE_VERSION=10.04-beta-$DATE
-        RELEASE_VERSION_PATTERN=10.04-beta-*
+        #CHECKOUT_OPTS=-rversion-10_04-branch
+        #BASE_TAG_NAME=version-10_04-branch
+        #FTP_DIR_NAME=10.04-beta
+        #RELEASE_VERSION=10.04-beta-$DATE
+        3RELEASE_VERSION_PATTERN=10.04-beta-*
          ;;

          # This is for the 10.04 release itself.
          #
-        #CHECKOUT_OPTS=-rversion-10_04
-        #BASE_TAG_NAME=version-10_04
-        #FTP_DIR_NAME=10.04
-        #RELEASE_VERSION=10.04
-        #RELEASE_VERSION_PATTERN=10.04*
-        #;;
+        CHECKOUT_OPTS=-rversion-10_04
+        BASE_TAG_NAME=version-10_04
+        FTP_DIR_NAME=10.04
+        RELEASE_VERSION=10.04
+        RELEASE_VERSION_PATTERN=10.04*
+        ;;

  esac

Index: util/.cvsignore
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/util/.cvsignore,v
retrieving revision 1.4
diff -u -r1.4 .cvsignore
--- util/.cvsignore	8 Jun 2007 00:47:15 -0000	1.4
+++ util/.cvsignore	15 Jul 2010 05:27:13 -0000
@@ -1,5 +1,6 @@
  mkinit
  mkinit_erl
  mdemangle
+mfiltercc
  info_to_mdb
  pad_backslash

--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------