Changeset: 3984ec32f8aa for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3984ec32f8aa
Modified Files:
MonetDB.spec
debian/monetdb5-server.install
Branch: default
Log Message:
Merge with Mar2011 branch.
diffs (40 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -378,7 +378,6 @@
%{_libdir}/monetdb5/*.mal
%{_libdir}/monetdb5/autoload/*_fits.mal
%{_libdir}/monetdb5/autoload/*_vault.mal
-%{_libdir}/monetdb5/autoload/*_xml.mal
%exclude %{_libdir}/monetdb5/lib_geom.so
# %exclude %{_libdir}/monetdb5/lib_rdf.so
%exclude %{_libdir}/monetdb5/lib_sql.so
diff --git a/debian/libmonetdb4-server-geom.install
b/debian/libmonetdb4-server-geom.install
--- a/debian/libmonetdb4-server-geom.install
+++ b/debian/libmonetdb4-server-geom.install
@@ -1,2 +1,2 @@
debian/tmp/usr/lib/monetdb4/geom.mil usr/lib/monetdb4
-debian/tmp/usr/lib/monetdb4/lib/lib_geom.so usr/lib/monetdb4/lib
+debian/tmp/usr/lib/monetdb4/lib/lib_geom.so* usr/lib/monetdb4/lib
diff --git a/debian/libmonetdb4-xquery.install
b/debian/libmonetdb4-xquery.install
--- a/debian/libmonetdb4-xquery.install
+++ b/debian/libmonetdb4-xquery.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/monetdb4/lib/lib_pathfinder.so usr/lib/monetdb4/lib
-debian/tmp/usr/lib/monetdb4/lib/lib_pf*.so usr/lib/monetdb4/lib
-debian/tmp/usr/lib/monetdb4/lib/lib_probxml.so usr/lib/monetdb4/lib
-debian/tmp/usr/lib/monetdb4/lib/lib_xrpc*.so usr/lib/monetdb4/lib
+debian/tmp/usr/lib/monetdb4/lib/lib_pathfinder* usr/lib/monetdb4/lib
+debian/tmp/usr/lib/monetdb4/lib/lib_pf* usr/lib/monetdb4/lib
+debian/tmp/usr/lib/monetdb4/lib/lib_probxml* usr/lib/monetdb4/lib
+debian/tmp/usr/lib/monetdb4/lib/lib_xrpc* usr/lib/monetdb4/lib
diff --git a/debian/monetdb5-server.install b/debian/monetdb5-server.install
--- a/debian/monetdb5-server.install
+++ b/debian/monetdb5-server.install
@@ -1,6 +1,5 @@
debian/tmp/usr/bin/mserver5 usr/bin
debian/tmp/usr/lib/libmonetdb5.so.* usr/lib
-debian/tmp/usr/lib/monetdb5/autoload/05_xml.mal usr/lib/monetdb5/autoload
debian/tmp/usr/lib/monetdb5/autoload/70_vault.mal usr/lib/monetdb5/autoload
debian/tmp/usr/lib/monetdb5/autoload/72_fits.mal usr/lib/monetdb5/autoload
debian/tmp/usr/lib/monetdb5/lib_batxml.so usr/lib/monetdb5
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
