Update of /cvsroot/monetdb/MonetDB5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11951
Modified Files:
Tag: GDK-2
MonetDB-server.spec.in VERSION configure.ag vertoo.data
Log Message:
propagated changes of Tuesday Sep 18 2007 - Monday Sep 24 2007
from the development trunk to the GDK-2 branch
There were conflicts in src/modules/kernel/batifthen.mx which I have
tried to resolve, but please check.
Index: MonetDB-server.spec.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/MonetDB-server.spec.in,v
retrieving revision 1.15.2.8
retrieving revision 1.15.2.9
diff -u -d -r1.15.2.8 -r1.15.2.9
--- MonetDB-server.spec.in 18 Sep 2007 12:42:38 -0000 1.15.2.8
+++ MonetDB-server.spec.in 24 Sep 2007 09:41:20 -0000 1.15.2.9
@@ -43,16 +43,16 @@
%define builddoc 0
-Requires: MonetDB-client >= 1.19
+Requires: MonetDB-client >= 1.20
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
%if !%{?buildsystem}
-BuildRequires: MonetDB-devel >= 1.19
+BuildRequires: MonetDB-devel >= 1.20
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
-BuildRequires: MonetDB-client-devel >= 1.19
+BuildRequires: MonetDB-client-devel >= 1.20
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
Index: VERSION
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/VERSION,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- VERSION 3 Jun 2007 20:16:44 -0000 1.5
+++ VERSION 24 Sep 2007 09:41:23 -0000 1.5.2.1
@@ -1 +1 @@
-5.1.0
+5.3.0
Index: vertoo.data
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/vertoo.data,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -d -r1.13.2.1 -r1.13.2.2
--- vertoo.data 23 Aug 2007 13:32:38 -0000 1.13.2.1
+++ vertoo.data 24 Sep 2007 09:41:26 -0000 1.13.2.2
@@ -1,3 +1,3 @@
-monetdb = major:1; minor:19; release:0; rc:x; build:1;
-monetdb5 = major:5; minor:1; release:0; rc:x; build:1;
-clients = major:1; minor:19; release:0; rc:x; build:1;
\ No newline at end of file
+monetdb = major:1; minor:20; release:0; rc:x; build:1;
+monetdb5 = major:5; minor:3; release:0; rc:x; build:1;
+clients = major:1; minor:20; release:0; rc:x; build:1;
\ No newline at end of file
Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/configure.ag,v
retrieving revision 1.74.2.2
retrieving revision 1.74.2.3
diff -u -d -r1.74.2.2 -r1.74.2.3
--- configure.ag 18 Sep 2007 12:42:39 -0000 1.74.2.2
+++ configure.ag 24 Sep 2007 09:41:25 -0000 1.74.2.3
@@ -18,7 +18,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([MonetDB Server], [5.1.0], [EMAIL PROTECTED], [MonetDB5])
+AC_INIT([MonetDB Server], [5.3.0], [EMAIL PROTECTED], [MonetDB5])
# ^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
@@ -65,7 +65,7 @@
dnl Check for Monet
# Check for Monet
-req_monetdb_ver='1.19.0'
+req_monetdb_ver='1.20.0'
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
@@ -77,7 +77,7 @@
AC_MSG_ERROR([MonetDB5 requires at least version
$req_monetdb_ver of MonetDB, but only version $MONETDBVERS was found.])
fi
fi
-req_clients_ver='1.19.0'
+req_clients_ver='1.20.0'
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
