Update of /cvsroot/monetdb/sql
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7621/sql
Modified Files:
Tag: Nov2009
MonetDB-SQL.pc.in MonetDB-SQL.spec.in configure.ag
vertoo.config vertoo.data
Log Message:
Get rid or rc and build stuff in vertoo configuration since it was in the way
of the script that did the second part of this checkin.
The minimum required MonetDB packages are now the packages of the current
release.
Index: vertoo.config
===================================================================
RCS file: /cvsroot/monetdb/sql/vertoo.config,v
retrieving revision 1.37
retrieving revision 1.37.6.1
diff -u -d -r1.37 -r1.37.6.1
--- vertoo.config 17 Feb 2009 10:49:25 -0000 1.37
+++ vertoo.config 18 Nov 2009 22:26:59 -0000 1.37.6.1
@@ -12,7 +12,7 @@
# %q - version number surrounded by single quotes
# %Q - version number surrounded by double quotes
-main.setVersionFormat('@normal%[rc?%rc%build:]')
+main.setVersionFormat('@normal')
main.addAnchor("VERSION", "%v")
main.addAnchor("configure.ag", "[MonetDB SQL Server], [%v]")
main.addAnchor("NT/rules.msc", "VERSION = %v")
@@ -38,7 +38,7 @@
format = '@normal'))
main.addAnchor("debian/changelog", "monetdb-sql (%v-1)")
-monetdb.setVersionFormat('@normal%[rc?%rc%build:]')
+monetdb.setVersionFormat('@normal')
monetdb.addAnchor("configure.ag", "req_monetdb_ver=%q")
monetdb.addAnchors("MonetDB-SQL.spec.in",
arguments(pattern = "\nBuildRequires: MonetDB-devel >= %v",
@@ -50,7 +50,7 @@
arguments(pattern = r'"Condition" = "8:COMMONVERSION >=
\"%v\""',
format = "@normal"))
-clients.setVersionFormat('@normal%[rc?%rc%build:]')
+clients.setVersionFormat('@normal')
clients.addAnchor("configure.ag", "req_clients_ver=%q")
clients.addAnchors("MonetDB-SQL.spec.in",
arguments(pattern = "\nBuildRequires: MonetDB-client-devel
>= %v",
@@ -62,7 +62,7 @@
arguments(pattern = r'"Condition" = "8:CLIENTSVERSION >=
\"%v\""',
format = "@normal"))
-monetdb5.setVersionFormat('@normal%[rc?%rc%build:]')
+monetdb5.setVersionFormat('@normal')
monetdb5.addAnchor("configure.ag", "req_monetdb5_ver=%q")
monetdb5.addAnchor("MonetDB-SQL.pc.in", "\nRequires: MonetDB >= %v")
monetdb5.addAnchors("MonetDB-SQL.spec.in",
Index: MonetDB-SQL.spec.in
===================================================================
RCS file: /cvsroot/monetdb/sql/MonetDB-SQL.spec.in,v
retrieving revision 1.80
retrieving revision 1.80.2.1
diff -u -d -r1.80 -r1.80.2.1
--- MonetDB-SQL.spec.in 18 Aug 2009 01:49:37 -0000 1.80
+++ MonetDB-SQL.spec.in 18 Nov 2009 22:26:59 -0000 1.80.2.1
@@ -30,11 +30,11 @@
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%if !%{?buildsystem}
-BuildRequires: MonetDB-devel >= 1.32
+BuildRequires: MonetDB-devel >= 1.34
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
-BuildRequires: MonetDB-client-devel >= 1.32
+BuildRequires: MonetDB-client-devel >= 1.34
# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
@@ -51,12 +51,12 @@
%package server5
Summary: MonetDB5 SQL server modules
Group: Applications/Databases
-Requires: MonetDB5-server >= 5.14
+Requires: MonetDB5-server >= 5.16
# ^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
%if !%{?buildsystem}
-BuildRequires: MonetDB5-server-devel >= 5.14
+BuildRequires: MonetDB5-server-devel >= 5.16
# ^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
Index: vertoo.data
===================================================================
RCS file: /cvsroot/monetdb/sql/vertoo.data,v
retrieving revision 1.50
retrieving revision 1.50.2.1
diff -u -d -r1.50 -r1.50.2.1
--- vertoo.data 28 Sep 2009 14:56:36 -0000 1.50
+++ vertoo.data 18 Nov 2009 22:26:59 -0000 1.50.2.1
@@ -1,4 +1,4 @@
-monetdb = major:1; minor:32; release:0; rc:x; build:1;
-monetdb5 = major:5; minor:14; release:0; rc:x; build:1;
-clients = major:1; minor:32; release:0; rc:x; build:1;
-sql = major:2; minor:34; release:0; rc:x; build:1;
\ No newline at end of file
+monetdb = major:1; minor:34; release:0;
+monetdb5 = major:5; minor:16; release:0;
+clients = major:1; minor:34; release:0;
+sql = major:2; minor:34; release:0;
\ No newline at end of file
Index: MonetDB-SQL.pc.in
===================================================================
RCS file: /cvsroot/monetdb/sql/MonetDB-SQL.pc.in,v
retrieving revision 1.45
retrieving revision 1.45.2.1
diff -u -d -r1.45 -r1.45.2.1
--- MonetDB-SQL.pc.in 18 Aug 2009 01:49:33 -0000 1.45
+++ MonetDB-SQL.pc.in 18 Nov 2009 22:26:59 -0000 1.45.2.1
@@ -28,7 +28,7 @@
Name: ${pkg}
Description: A SQL/ODBC/JDBC interface to MonetDB.
Version: @VERSION@
-Requires: MonetDB >= 5.14.0
+Requires: MonetDB >= 5.16.0
# ^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/sql/configure.ag,v
retrieving revision 1.156
retrieving revision 1.156.2.1
diff -u -d -r1.156 -r1.156.2.1
--- configure.ag 28 Sep 2009 14:56:36 -0000 1.156
+++ configure.ag 18 Nov 2009 22:26:59 -0000 1.156.2.1
@@ -55,7 +55,7 @@
dnl Check for Monet
-req_monetdb_ver='1.32.0'
+req_monetdb_ver='1.34.0'
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
@@ -67,7 +67,7 @@
AC_MSG_ERROR([MonetDB/SQL requires at least version
$req_monetdb_ver of MonetDB, but only version $MONETDB_VERSION was found.])
fi
fi
-req_clients_ver='1.32.0'
+req_clients_ver='1.34.0'
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
@@ -78,7 +78,7 @@
AM_MONETDB_OPTIONS()
AM_MONETDB_LIBS()
AM_MONETDB_UTILS()
-req_monetdb5_ver='5.14.0'
+req_monetdb5_ver='5.16.0'
# ^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
