Remove all beta references in testsuite patches

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 17 insertions, 14 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index b3bf1f825082..cbfe9bd9728b 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/mercury
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.104 2010/07/19 09:25:31 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.105 2010/07/20 07:58:14 keri Exp $
+
+  20 Jul 2010; <keri@gentoo.org> files/mercury-10.04-tests-sandbox.patch,
+  files/mercury-10.04-tests-workspace.patch:
+  Remove all beta references in testsuite patches
 
 *mercury-10.04 (19 Jul 2010)
 
diff --git a/dev-lang/mercury/files/mercury-10.04-tests-sandbox.patch b/dev-lang/mercury/files/mercury-10.04-tests-sandbox.patch
index fb1c4c05b091..3161df4482c2 100644
--- a/dev-lang/mercury/files/mercury-10.04-tests-sandbox.patch
+++ b/dev-lang/mercury/files/mercury-10.04-tests-sandbox.patch
@@ -2,13 +2,13 @@ diff -ur mercury-tests-10.04.orig/hard_coded/dir_test.exp mercury-tests-10.04/ha
 --- mercury-tests-10.04.orig/hard_coded/dir_test.exp	2007-09-21 15:21:35.000000000 +1200
 +++ mercury-tests-10.04/hard_coded/dir_test.exp	2010-07-19 21:03:29.000000000 +1200
 @@ -130,7 +130,6 @@
- "foo"/"bar/baz" = "foo\bar\baz".
- "foo/"/"bar/baz" = "foo\bar\baz".
- checking whether `unwritable' is readable...ok
--unwritable file found to be unwritable
- current_directory succeeded: hard_coded
- make_directory succeeded
- make_directory succeeded
+ "foo"/"bar/baz" = "foo\bar\baz".

+ "foo/"/"bar/baz" = "foo\bar\baz".

+ checking whether `unwritable' is readable...ok

+-unwritable file found to be unwritable

+ current_directory succeeded: hard_coded

+ make_directory succeeded

+ make_directory succeeded

 diff -ur mercury-tests-10.04.orig/hard_coded/dir_test.exp2 mercury-tests-10.04/hard_coded/dir_test.exp2
 --- mercury-tests-10.04.orig/hard_coded/dir_test.exp2	2007-10-01 18:40:43.000000000 +1300
 +++ mercury-tests-10.04/hard_coded/dir_test.exp2	2010-07-19 21:03:29.000000000 +1200
diff --git a/dev-lang/mercury/files/mercury-10.04-tests-workspace.patch b/dev-lang/mercury/files/mercury-10.04-tests-workspace.patch
index 253dad2bb348..fa4b12e9f077 100644
--- a/dev-lang/mercury/files/mercury-10.04-tests-workspace.patch
+++ b/dev-lang/mercury/files/mercury-10.04-tests-workspace.patch
@@ -1,6 +1,5 @@
-diff -ur mercury-tests-10.04.orig/Mmake.common mercury-tests-10.04/Mmake.common
 --- mercury-tests-10.04.orig/Mmake.common	2010-02-15 19:49:51.000000000 +1300
-+++ mercury-tests-10.04/Mmake.common	2010-07-19 21:03:17.000000000 +1200
++++ mercury-tests-10.04/Mmake.common	2010-07-20 19:40:29.000000000 +1200
 @@ -79,8 +79,8 @@
  -include $(TESTS_DIR)/Mmake.params
  
@@ -13,18 +12,18 @@ diff -ur mercury-tests-10.04.orig/Mmake.common mercury-tests-10.04/Mmake.common
  
  # Avoid trying to make this file with `mmc --make' if it doesn't exist.
 --- mercury-compiler-10.04.orig/configure	2010-07-18 20:40:26.000000000 +1200
-+++ mercury-compiler-10.04/configure	2010-07-19 21:07:50.000000000 +1200
++++ mercury-compiler-10.04/configure	2010-07-20 19:42:09.000000000 +1200
 @@ -14778,10 +14778,10 @@
      test_flags="tests/TESTS_FLAGS"
      test_mdbrc="tests/mdbrc"
  else
 -    if test -e ../tests/TESTS_FLAGS.in
-+    if test -e ../mercury-tests-10.04-beta-2010-07-12/TESTS_FLAGS.in
++    if test -e ../mercury-tests-10.04/TESTS_FLAGS.in
      then
 -        test_flags="../tests/TESTS_FLAGS"
 -        test_mdbrc="../tests/mdbrc"
-+        test_flags="../mercury-tests-10.04-beta-2010-07-12/TESTS_FLAGS"
-+        test_mdbrc="../mercury-tests-10.04-beta-2010-07-12/mdbrc"
++        test_flags="../mercury-tests-10.04/TESTS_FLAGS"
++        test_mdbrc="../mercury-tests-10.04/mdbrc"
      else
          test_flags=""
          test_mdbrc=""