Changeset: 86306a4af840 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=86306a4af840
Modified Files:
Makefile.ag
MonetDB.spec
buildtools/autogen/autogen/am.py
clients/mapilib/Makefile.ag
common/stream/Makefile.ag
configure.ag
debian/control
debian/libmonetdb-client-odbc1.postinst
debian/libmonetdb-client-odbc1.postrm
debian/libmonetdb-client-odbc11.install
debian/libmonetdb-client11.install
debian/libmonetdb-stream11.install
debian/libmonetdb11.install
debian/libmonetdb5-server-geom.install
debian/libmonetdb5-server-geom0.substvars
debian/libmonetdb5-server-geom11.install
debian/libpf-ferry11.install
debian/monetdb5-server.install
debian/monetdb5-sql.install
gdk/Makefile.ag
monetdb5/tools/Makefile.ag
Branch: default
Log Message:
Merge with Mar2011 branch.
diffs (truncated from 585 to 300 lines):
diff --git a/Makefile.ag b/Makefile.ag
--- a/Makefile.ag
+++ b/Makefile.ag
@@ -23,7 +23,7 @@
HAVE_JAVA?java \
HAVE_TESTING?testing \
-EXTRA_DIST = bootstrap configure configure.ac configure.ag \
+EXTRA_DIST = bootstrap configure configure.ac configure.ag libversions \
MonetDB.spec rpm.mk.in COPYING README license.txt
HowToStart.rst
EXTRA_DIST_DIR = NT debian template
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -191,8 +191,8 @@
%files client-odbc
%defattr(-,root,root)
-%{_libdir}/libMonetODBC.*
-%{_libdir}/libMonetODBCs.*
+%{_libdir}/libMonetODBC.so
+%{_libdir}/libMonetODBCs.so
%package client-php
Summary: MonetDB php interface
@@ -322,7 +322,7 @@
%{_libdir}/monetdb5/autoload/*_geom.mal
%{_libdir}/monetdb5/createdb/*_geom.sql
%{_libdir}/monetdb5/geom.mal
-%{_libdir}/monetdb5/lib_geom.so*
+%{_libdir}/monetdb5/lib_geom.so
%package -n MonetDB5-server
Summary: MonetDB - Monet Database Management System
@@ -380,10 +380,10 @@
%{_libdir}/monetdb5/autoload/*_fits.mal
%{_libdir}/monetdb5/autoload/*_vault.mal
%{_libdir}/monetdb5/autoload/*_xml.mal
-%exclude %{_libdir}/monetdb5/lib_geom.*
-# %exclude %{_libdir}/monetdb5/lib_rdf.*
-%exclude %{_libdir}/monetdb5/lib_sql.*
-%{_libdir}/monetdb5/*.so*
+%exclude %{_libdir}/monetdb5/lib_geom.so
+# %exclude %{_libdir}/monetdb5/lib_rdf.so
+%exclude %{_libdir}/monetdb5/lib_sql.so
+%{_libdir}/monetdb5/*.so
%doc %{_mandir}/man5/monetdb5.conf.5.gz
# %package -n MonetDB5-server-rdf
@@ -402,7 +402,7 @@
# %files -n MonetDB5-server-rdf
# %defattr(-,root,root)
# %{_libdir}/monetdb5/autoload/*_rdf.mal
-# %{_libdir}/monetdb5/lib_rdf.so*
+# %{_libdir}/monetdb5/lib_rdf.so
# %{_libdir}/monetdb5/rdf.mal
# %{_libdir}/monetdb5/createdb/*_rdf.sql
@@ -429,7 +429,7 @@
%dir %attr(775,monetdb,monetdb) %{_localstatedir}/log/monetdb
%dir %attr(775,monetdb,monetdb) %{_localstatedir}/run/monetdb
%{_libdir}/monetdb5/autoload/*_sql.mal
-%{_libdir}/monetdb5/lib_sql.so*
+%{_libdir}/monetdb5/lib_sql.so
%{_libdir}/monetdb5/*.sql
%dir %{_libdir}/monetdb5/createdb
%exclude %{_libdir}/monetdb5/createdb/*_geom.sql
diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py
+++ b/buildtools/autogen/autogen/am.py
@@ -600,6 +600,8 @@
else:
ldflags = []
ldflags.append('-export-dynamic')
+ if binmap.has_key('NOINST'):
+ ldflags.append('-no-install')
fd.write(am_additional_flags(norm_binname, "", "BIN", ldflags, am))
for src in binmap['SOURCES']:
@@ -690,6 +692,8 @@
else:
ldflags = []
ldflags.append('-export-dynamic')
+ if binsmap.has_key('NOINST'):
+ ldflags.append('-no-install')
fd.write(am_additional_flags(bin, "", "BIN", ldflags, am))
nsrcs = "nodist_"+am_normalize(bin)+"_SOURCES ="
@@ -805,14 +809,15 @@
fd.write(am_additional_install_libs(libname, sep, libmap["LIBS"], am))
ldflags = []
- if sep == '_' and pref == '':
+ if libmap.has_key('MODULE'):
ldflags.append('-module')
+ ldflags.append('-avoid-version')
if libmap.has_key("LDFLAGS"):
for x in libmap["LDFLAGS"]:
ldflags.append(x)
- if not libmap.has_key('NOINST'):
- ldflags.append('-version-number')
- ldflags.append('$(subst .,:,$(VERSION))')
+ if libmap.has_key('VERSION'):
+ ldflags.append('-version-info')
+ ldflags.append(libmap['VERSION'][0])
for src in libmap['SOURCES']:
base, ext = split_filename(src)
@@ -907,11 +912,15 @@
_libs += libsmap["LIBS"]
if libsmap.has_key("LDFLAGS"):
_libs += libsmap["LDFLAGS"]
- fd.write(am_additional_flags(libname, sep, "LIB",
['-version-number','$(subst .,:,$(VERSION))'], am))
+ if libsmap.has_key('VERSION'):
+ version = ['-version-info', libsmap['VERSION'][0]]
+ elif libsmap.has_key('MODULE'):
+ version = ['-module', '-avoid-version']
+ else:
+ version = []
+ fd.write(am_additional_flags(libname, sep, "LIB", version, am))
if len(_libs) > 0:
fd.write(am_additional_libs(libname, sep, "LIB", _libs, am))
-## if sep == '_':
-## fd.write(am_additional_flags(libname, sep, "LIB", ['-module'],
am))
fullpref = "lib"+sep+libname+'_la'
nsrcs = "nodist_"+fullpref+"_SOURCES ="
diff --git a/clients/mapilib/Makefile.ag b/clients/mapilib/Makefile.ag
--- a/clients/mapilib/Makefile.ag
+++ b/clients/mapilib/Makefile.ag
@@ -20,6 +20,7 @@
INCLUDES = ../../common/options ../../common/stream $(openssl_CFLAGS)
lib_mapi = {
+ VERSION = $(MAPI_VERSION)
SOURCES = mapi.mx mapi.rc
LIBS = $(SOCKET_LIBS) ../../common/stream/libstream \
../../common/options/libmoptions $(openssl_LIBS)
diff --git a/clients/odbc/driver/Makefile.ag b/clients/odbc/driver/Makefile.ag
--- a/clients/odbc/driver/Makefile.ag
+++ b/clients/odbc/driver/Makefile.ag
@@ -23,6 +23,7 @@
DEFS = @DEFS@
lib_MonetODBC = {
+ MODULE
SOURCES = \
ODBCConvert.c \
ODBCDbc.c \
diff --git a/clients/odbc/setup/Makefile.ag b/clients/odbc/setup/Makefile.ag
--- a/clients/odbc/setup/Makefile.ag
+++ b/clients/odbc/setup/Makefile.ag
@@ -20,5 +20,6 @@
DEFS = @DEFS@
lib_MonetODBCs = {
+ MODULE
SOURCES = drvcfg.c drvcfg.h
}
diff --git a/common/stream/Makefile.ag b/common/stream/Makefile.ag
--- a/common/stream/Makefile.ag
+++ b/common/stream/Makefile.ag
@@ -29,6 +29,7 @@
lib_stream = {
SOURCES = stream.c stream.h
+ VERSION = $(STREAM_VERSION)
LIBS = $(SOCKET_LIBS) \
$(zlib_LIBS) \
$(BZ_LIBS) \
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -62,6 +62,12 @@
SOURCE=[`(cd $srcdir && pwd)`]
AC_SUBST(SOURCE)
+. $srcdir/libversions
+AC_SUBST(GDK_VERSION)
+AC_SUBST(MAPI_VERSION)
+AC_SUBST(MONETDB5_VERSION)
+AC_SUBST(STREAM_VERSION)
+
# if no --prefix option, we must set Qprefix to the default value
# the problem is that prefix is set very late in the process if it
# wasn't set by --prefix
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,17 @@
Priority: extra
Maintainer: MonetDB BV <[email protected]>
Homepage: http://www.monetdb.org/
+Vcs-Browser: http://dev.monetdb.org/hg/MonetDB/
+Vcs-Hg: http://dev.monetdb.org/hg/MonetDB/
Build-Depends: debhelper (>= 5), autotools-dev, cdbs, bison, flex, libbz2-dev,
libcfitsio3-dev, libcurl4-gnutls-dev, libgeos-dev, libpcre3-dev, libperl-dev,
libreadline5-dev, libssl-dev, libxml2-dev, perl, python, ruby, rubygems, swig,
unixodbc-dev, uuid-dev, zlib1g-dev
# Build-Depends: libraptor1-dev
Standards-Version: 3.8.0
-Package: libmonetdb11
+Package: libmonetdb2
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libmonetdb1, libmonetdb-dev
+Replaces: libmonetdb1, 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,
@@ -21,7 +24,7 @@
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-stream11
+Package: libmonetdb-stream2
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: MonetDB stream library
@@ -45,10 +48,11 @@
This package contains the files to develop with the
libmonetdb-stream1 library.
-Package: libmonetdb-client11
+Package: libmonetdb-client2
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libmonetdb-client1
+Replaces: libmonetdb-client1
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,
@@ -84,10 +88,11 @@
database so that it can be loaded back later. If you want to use
MonetDB, you will very likely need this package.
-Package: libmonetdb-client-odbc11
+Package: libmonetdb-client-odbc
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libmonetdb-client-odbc1, libmonetdb-client-odbc-dev
+Replaces: libmonetdb-client-odbc1, libmonetdb-client-odbc-dev
Description: MonetDB ODBC driver
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -113,6 +118,7 @@
Depends: ${shlibs:Depends}, ${perl:Depends}
Provides: ${perl:Provides}
Conflicts: libmonetdb-client-perl
+Replaces: libmonetdb-client-perl
Description: MonetDB perl client code
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -147,11 +153,12 @@
MonetDB packages. You probably don't need this, unless you are a
developer.
-Package: libmonetdb5-server-geom11
+Package: libmonetdb5-server-geom
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb5-sql
Conflicts: libmonetdb5-server-geom0, monetdb-geom, monetdb-geom-dev
+Replaces: libmonetdb5-server-geom0, monetdb-geom, monetdb-geom-dev
Description: MonetDB5 SQL GIS support module
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -164,7 +171,8 @@
Package: monetdb5-server
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
-Conflicts: libmonetdb5-server5, libmonetdb5-server-dev
+Conflicts: libmonetdb5-server5, libmonetdb5-server-dev, libmonetdb1,
libmonetdb-dev
+Replaces: libmonetdb5-server5, libmonetdb5-server-dev
Description: MonetDB database server version 5
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -177,8 +185,9 @@
Package: monetdb5-sql
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb5-server
+Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb5-server (=
${source:Version})
Conflicts: libmonetdb5-sql2
+Replaces: libmonetdb5-sql2
Description: MonetDB SQL support for monetdb5
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -202,7 +211,7 @@
Package: monetdb-testing-python
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, python, monetdb-testing,
monetdb-client-testing
+Depends: ${shlibs:Depends}, ${misc:Depends}, python, monetdb-testing (=
${source:Version}), monetdb-client-testing (= ${source:Version})
Description: MonetDB testing Python programs
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
diff --git a/debian/libmonetdb-client-odbc11.install
b/debian/libmonetdb-client-odbc.install
rename from debian/libmonetdb-client-odbc11.install
rename to debian/libmonetdb-client-odbc.install
--- a/debian/libmonetdb-client-odbc11.install
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
