Changeset: 669946729914 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=669946729914
Modified Files:
MonetDB.spec
debian/control
debian/libmonetdb-client-odbc.postinst
debian/monetdb5-server.install
debian/monetdb5-sql.install
debian/python-monetdb.install
debian/python3-monetdb.install
Branch: Jan2014
Log Message:
Updated Fedora and Debuntu installers.
diffs (268 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -16,7 +16,7 @@
%define oidsuf .oid32
%endif
-%define release %{buildno}%{?dist}%{?oidsuf:.oidsuf}
+%define release %{buildno}%{?dist}%{?oidsuf}
Name: %{name}
Version: %{version}
@@ -73,7 +73,9 @@ accelerators. It also has an SQL fronte
This package contains the core components of MonetDB in the form of a
single shared library. If you want to use MonetDB, you will certainly
-need this package, but you will also need one of the server packages.
+need this package, but you will also need at least the MonetDB5-server
+package, and most likely also %{name}-SQL-server5, as well as one or
+more client packages.
%files
%defattr(-,root,root)
@@ -154,8 +156,8 @@ automatic index management, extensibilit
accelerators. It also has an SQL frontend.
This package contains mclient, the main client program to communicate
-with the database server, and msqldump, a program to dump the SQL
-database so that it can be loaded back later. If you want to use
+with the MonetDB database server, and msqldump, a program to dump the
+SQL database so that it can be loaded back later. If you want to use
MonetDB, you will very likely need this package.
%files client
@@ -177,7 +179,8 @@ main-memory perspective with use of a fu
automatic index management, extensibility of data types and search
accelerators. It also has an SQL frontend.
-This package contains stethoscope and tomograph.
+This package contains stethoscope and tomograph. These tools can be
+used to monitor the MonetDB database server.
%files client-tools
%defattr(-,root,root)
@@ -223,7 +226,7 @@ This package contains the MonetDB ODBC d
%post client-odbc
# install driver if first install of package or if driver not installed yet
-if [ "$1" -eq 1 ] || ! grep -q MonetDB /etc/odbcinst.ini; then
+if [ "$1" -eq 1 ] || ! odbcinst -d -q -n MonetDB >& /dev/null; then
odbcinst -i -d -r <<EOF
[MonetDB]
Description = ODBC for MonetDB
@@ -388,7 +391,7 @@ automatic index management, extensibilit
accelerators. It also has an SQL frontend.
This package contains the GIS (Geographic Information System)
-extensions for MonetDB-SQL-server5.
+extensions for %{name}-SQL-server5.
%files geom-MonetDB5
%defattr(-,root,root)
@@ -409,7 +412,7 @@ main-memory perspective with use of a fu
automatic index management, extensibility of data types and search
accelerators. It also has an SQL frontend.
-This package contains the JAQL extension for MonetDB5. JAQL is a
+This package contains the JAQL extension for MonetDB. JAQL is a
querly language for JavaScript Object Notation (JSON).
%files jaql
@@ -433,10 +436,9 @@ main-memory perspective with use of a fu
automatic index management, extensibility of data types and search
accelerators. It also has an SQL frontend.
-This package contains the MonetDB5 server component. You need this
-package if you want to work using the MAL language, or if you want to
-use the SQL frontend (in which case you need MonetDB-SQL-server5 as
-well).
+This package contains the MonetDB server component. You need this
+package if you want to use the MonetDB database system. If you want
+to use the SQL frontend, you also need %{name}-SQL-server5.
%pre -n MonetDB5-server
getent group monetdb >/dev/null || groupadd -r monetdb
@@ -547,7 +549,7 @@ main-memory perspective with use of a fu
automatic index management, extensibility of data types and search
accelerators. It also has an SQL frontend.
-This package contains the SQL frontend for MonetDB5. If you want to
+This package contains the SQL frontend for MonetDB. If you want to
use SQL with MonetDB, you will need to install this package.
%if %{?rhel:0}%{!?rhel:1}
@@ -603,7 +605,8 @@ automatic index management, extensibilit
accelerators. It also has an SQL frontend.
This package contains the files needed to use MonetDB from a Python
-program.
+program. This package is for Python version 2. If you want to use
+Python version 3, you need %{name}-python3-monetdb.
%files -n python-monetdb
%defattr(-,root,root)
@@ -626,7 +629,8 @@ automatic index management, extensibilit
accelerators. It also has an SQL frontend.
This package contains the files needed to use MonetDB from a Python3
-program.
+program. This package is for Python version 3. If you want to use
+Python version 2, you need %{name}-python-monetdb.
%files -n python3-monetdb
%defattr(-,root,root)
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,9 @@ Description: MonetDB core library
.
This package contains the core components of MonetDB in the form of a
single shared library. If you want to use MonetDB, you will certainly
- need this package, but you will also need one of the server packages.
+ need this package, but you will also need at least the monetdb5-server
+ package, and most likely also monetdb5-sql, as well as one or
+ more client packages.
Package: libmonetdb-dev
Architecture: any
@@ -105,8 +107,8 @@ Description: MonetDB database client
accelerators. It also has an SQL frontend.
.
This package contains mclient, the main client program to communicate
- with the database server, and msqldump, a program to dump the SQL
- database so that it can be loaded back later. If you want to use
+ with the MonetDB database server, and msqldump, a program to dump the
+ SQL database so that it can be loaded back later. If you want to use
MonetDB, you will very likely need this package.
Package: monetdb-client-tools
@@ -118,7 +120,8 @@ Description: MonetDB database client
automatic index management, extensibility of data types and search
accelerators. It also has an SQL frontend.
.
- This package contains stethoscope and tomograph.
+ This package contains stethoscope and tomograph. These tools can be
+ used to monitor the MonetDB database server.
Package: libmonetdb-client-odbc
Architecture: any
@@ -211,9 +214,9 @@ Description: MonetDB database server ver
automatic index management, extensibility of data types and search
accelerators. It also has an SQL frontend.
.
- This package contains the MonetDB5 server component. You need this
- package if you want to work using the MAL language, or if you want to
- use the SQL frontend (in which case you need monetdb5-sql as well).
+ This package contains the MonetDB server component. You need this
+ package if you want to use the MonetDB database system. If you want
+ to use the SQL frontend, you also need monetdb5-sql.
Package: monetdb5-server-dev
Architecture: any
@@ -237,7 +240,7 @@ Description: MonetDB5 JAQL
automatic index management, extensibility of data types and search
accelerators. It also has an SQL frontend.
.
- This package contains the JAQL extension for MonetDB5. JAQL is a
+ This package contains the JAQL extension for MonetDB. JAQL is a
querly language for JavaScript Object Notation (JSON).
Package: monetdb5-sql
@@ -251,7 +254,7 @@ Description: MonetDB SQL support for mon
automatic index management, extensibility of data types and search
accelerators. It also has an SQL frontend.
.
- This package contains the SQL frontend for MonetDB5.
+ This package contains the SQL frontend for MonetDB.
Package: monetdb-testing
Architecture: any
@@ -289,7 +292,9 @@ Description: Native MonetDB client Pytho
automatic index management, extensibility of data types and search
accelerators. It also has an SQL frontend.
.
- This package contains the files needed to use MonetDB with python.
+ This package contains the files needed to use MonetDB from a Python
+ program. This package is for Python version 2. If you want to use
+ Python version 3, you need python3-monetdb.
Package: python3-monetdb
Architecture: all
@@ -300,5 +305,7 @@ Description: Native MonetDB client Pytho
automatic index management, extensibility of data types and search
accelerators. It also has an SQL frontend.
.
- This package contains the files needed to use MonetDB with Python3.
+ This package contains the files needed to use MonetDB from a Python3
+ program. This package is for Python version 3. If you want to use
+ Python version 2, you need python-monetdb.
diff --git a/debian/libmonetdb-client-odbc.postinst
b/debian/libmonetdb-client-odbc.postinst
--- a/debian/libmonetdb-client-odbc.postinst
+++ b/debian/libmonetdb-client-odbc.postinst
@@ -4,7 +4,7 @@ set -e
if [ "$1" = configure ]; then
# install driver if first install of package or if driver not installed yet
- if [ ! "$2" ] || ! [ ! "`odbcinst -d -q | grep MonetDB`" ]; then
+ if [ ! "$2" ] || ! odbcinst -d -q -n MonetDB >& /dev/null >& /dev/null;
then
odbcinst -i -d -r <<EOF
[MonetDB]
Description = ODBC for MonetDB
diff --git a/debian/monetdb5-server.install b/debian/monetdb5-server.install
--- a/debian/monetdb5-server.install
+++ b/debian/monetdb5-server.install
@@ -7,7 +7,7 @@ debian/tmp/usr/lib/monetdb5/lib_opt_sql_
debian/tmp/usr/lib/monetdb5/lib_udf.so usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/lib_vault.so usr/lib/monetdb5
-# usr/lib/monetdb5/*.mal EXCEPT: geom.mal, jaql*.mal, json*.mal, sql.mal
+# usr/lib/monetdb5/*.mal EXCEPT: geom.mal, jaql*.mal, json*.mal, sql*.mal
debian/tmp/usr/lib/monetdb5/a*.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/b*.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/c*.mal usr/lib/monetdb5
@@ -23,6 +23,7 @@ debian/tmp/usr/lib/monetdb5/sa*.mal usr/
debian/tmp/usr/lib/monetdb5/se*.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/sr*.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/st*.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/sy*.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/t*.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/u*.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/v*.mal usr/lib/monetdb5
diff --git a/debian/monetdb5-sql.install b/debian/monetdb5-sql.install
--- a/debian/monetdb5-sql.install
+++ b/debian/monetdb5-sql.install
@@ -2,7 +2,7 @@ debian/tmp/usr/bin/monetdbd usr/bin
debian/tmp/usr/bin/monetdb usr/bin
debian/tmp/usr/lib/monetdb5/*.sql usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/autoload/*_sql.mal usr/lib/monetdb5/autoload
-debian/tmp/usr/lib/monetdb5/sql.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/sql*.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/lib_sql.so usr/lib/monetdb5
debian/tmp/var/monetdb5/dbfarm/.merovingian_properties var/monetdb5/dbfarm
@@ -27,6 +27,9 @@ debian/tmp/usr/lib/monetdb5/createdb/25_
debian/tmp/usr/lib/monetdb5/createdb/26_sysmon.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/39_analytics.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/40_json.sql usr/lib/monetdb5/createdb
+debian/tmp/usr/lib/monetdb5/createdb/41_jsonstore.sql usr/lib/monetdb5/createdb
+debian/tmp/usr/lib/monetdb5/createdb/45_uuid.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/75_storagemodel.sql
usr/lib/monetdb5/createdb
+debian/tmp/usr/lib/monetdb5/createdb/80_statistics.sql
usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/80_udf.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/99_system.sql usr/lib/monetdb5/createdb
diff --git a/debian/python-monetdb.install b/debian/python-monetdb.install
--- a/debian/python-monetdb.install
+++ b/debian/python-monetdb.install
@@ -1,2 +1,3 @@
+# usr/lib/python2.*/*-packages/* EXCEPT: MonetDBtesting
debian/tmp/usr/lib/python2.*/*-packages/monetdb/*
debian/tmp/usr/lib/python2.*/*-packages/python_monetdb-*.egg-info
diff --git a/debian/python3-monetdb.install b/debian/python3-monetdb.install
--- a/debian/python3-monetdb.install
+++ b/debian/python3-monetdb.install
@@ -1,2 +1,3 @@
+# usr/lib/python3.*/*-packages/* EXCEPT: MonetDBtesting
debian/tmp/usr/lib/python3/*-packages/monetdb/*
debian/tmp/usr/lib/python3/*-packages/python_monetdb-*.egg-info
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
