Changeset: 613f8b17a20f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=613f8b17a20f
Modified Files:
debian/libmonetdb-client2.install
debian/libmonetdb-stream2.install
debian/libmonetdb2.install
Branch: default
Log Message:
Merge with Dec2011 branch.
diffs (161 lines):
diff --git a/common/utils/msabaoth.h b/common/utils/msabaoth.h
--- a/common/utils/msabaoth.h
+++ b/common/utils/msabaoth.h
@@ -57,7 +57,7 @@ typedef struct Ssabuplog {
} sabuplog;
#ifdef WIN32
-#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) &&
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) &&
!defined(LIBMONETDB5) && !defined(LIBSABAOTH)
+#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) &&
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) &&
!defined(LIBMONETDB5) && !defined(LIBMSABAOTH)
#define msab_export extern __declspec(dllimport)
#else
#define msab_export extern __declspec(dllexport)
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -9,11 +9,11 @@ Build-Depends: debhelper (>= 5), autotoo
# Build-Depends: libraptor1-dev
Standards-Version: 3.8.0
-Package: libmonetdb2
+Package: libmonetdb4
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libmonetdb1, libmonetdb-dev
-Replaces: libmonetdb1, libmonetdb-dev
+Conflicts: libmonetdb1, libmonetdb2, libmonetdb-dev
+Replaces: libmonetdb1, libmonetdb2, libmonetdb-dev
Description: MonetDB core library
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -24,7 +24,9 @@ Description: MonetDB core library
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.
-Package: libmonetdb-stream2
+Package: libmonetdb-stream3
+Conflicts: libmonetdb-stream2
+Replaces: libmonetdb-stream2
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: MonetDB stream library
@@ -38,7 +40,7 @@ Description: MonetDB stream library
Package: libmonetdb-stream-dev
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmonetdb-stream1
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmonetdb-stream3
Description: MonetDB stream library development files
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -46,13 +48,13 @@ Description: MonetDB stream library deve
accelerators. It also has an SQL frontend.
.
This package contains the files to develop with the
- libmonetdb-stream1 library.
+ libmonetdb-stream3 library.
-Package: libmonetdb-client2
+Package: libmonetdb-client5
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libmonetdb-client1
-Replaces: libmonetdb-client1
+Conflicts: libmonetdb-client1, libmonetdb-client2
+Replaces: libmonetdb-client1, libmonetdb-client2
Description: MonetDB client/server interface library
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -64,14 +66,14 @@ Description: MonetDB client/server inter
Package: libmonetdb-client-dev
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmonetdb-client1
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmonetdb-client5
Description: MonetDB client/server interface library development files
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
automatic index management, extensibility of data types and search
accelerators. It also has an SQL frontend.
.
- This package contains the files to develop with the libmonetdb-client1
+ This package contains the files to develop with the libmonetdb-client5
library.
Package: monetdb-client
diff --git a/debian/libmonetdb-client2.install
b/debian/libmonetdb-client5.install
rename from debian/libmonetdb-client2.install
rename to debian/libmonetdb-client5.install
diff --git a/debian/libmonetdb-stream2.install
b/debian/libmonetdb-stream3.install
rename from debian/libmonetdb-stream2.install
rename to debian/libmonetdb-stream3.install
diff --git a/debian/libmonetdb2.install b/debian/libmonetdb4.install
rename from debian/libmonetdb2.install
rename to debian/libmonetdb4.install
diff --git a/libversions b/libversions
--- a/libversions
+++ b/libversions
@@ -27,6 +27,9 @@
# 0;
# BRK if there are also incompatible API changes (interfaces removed or
# changed), increment CURRENT, and set AGE and REVISION to 0.
+# IMPORTANT: also change debian package names for the relevant
+# library. This involves renaming the file in debian/ and
+# updating references to the package in debian/control.
# the numbers are: <CURRENT>:<REVISION>:<AGE>
diff --git a/sql/backends/monet5/LSST/lsst.c b/sql/backends/monet5/LSST/lsst.c
--- a/sql/backends/monet5/LSST/lsst.c
+++ b/sql/backends/monet5/LSST/lsst.c
@@ -64,7 +64,7 @@ static double _qserv_angSep(double ra1,
* @li If dec1 or dec2 lies outside of [-90, 90], this is an error
* and NULL is returned.
*/
-sql5_export str
+str
qserv_angSep(dbl *sep, dbl *ra1, dbl *dec1, dbl *ra2, dbl *dec2)
{
/* If any input is null, the result is null. */
diff --git a/sql/backends/monet5/LSST/lsst.h b/sql/backends/monet5/LSST/lsst.h
--- a/sql/backends/monet5/LSST/lsst.h
+++ b/sql/backends/monet5/LSST/lsst.h
@@ -17,8 +17,8 @@
* All Rights Reserved.
*/
-#ifndef _SQL_UDF_H_
-#define _SQL_UDF_H_
+#ifndef _SQL_LSST_H_
+#define _SQL_LSST_H_
#include "sql.h"
#define _USE_MATH_DEFINES /* needed for WIN32 to define M_PI */
#include <math.h>
@@ -41,4 +41,4 @@ lsst_export str qserv_ptInSphCircle(int
lsst_export str qserv_ptInSphPoly(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
lsst_export str LSSTxmatch(int *ret, int *lid, int *rid, int *delta);
-#endif /* _SQL_UDF_H_ */
+#endif /* _SQL_LSST_H_ */
diff --git a/sql/backends/monet5/sql_readline.h
b/sql/backends/monet5/sql_readline.h
--- a/sql/backends/monet5/sql_readline.h
+++ b/sql/backends/monet5/sql_readline.h
@@ -20,7 +20,17 @@
#ifndef SQL_READLINETOOLS_H_INCLUDED
#define SQL_READLINETOOLS_H_INCLUDED
+#ifdef WIN32
+#ifndef LIBSQL
+#define sql5_export extern __declspec(dllimport)
+#else
+#define sql5_export extern __declspec(dllexport)
+#endif
+#else
+#define sql5_export extern
+#endif
+
#include "mal_client.h"
-mal_export int SQLreadConsole(Client cntxt);
+sql5_export int SQLreadConsole(Client cntxt);
#endif /* SQL_READLINETOOLS_H_INCLUDED */
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
