Changeset: 675c7e41a474 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=675c7e41a474
Modified Files:
debian/libmonetdb4-server-geom.install
debian/libmonetdb4-xquery.install
Branch: headless
Log Message:
Merge with default branch.
diffs (65 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/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -104,7 +104,6 @@
dft_develop=no
fi
dft_warning=no
-dft_netcdf=auto
dnl small hack to get icc -no-gcc, done here because AC_PROG_CC shouldn't
dnl set GCC=yes if we use icc.
@@ -3190,7 +3189,6 @@
dnl CFLAGS for our code are stricter than what autoconf can cope with.
CFLAGS="$CFLAGS \$(X_CFLAGS)"
-dnl pathfinder code is not (yet?) up to this
case "$GCC-$gcc_ver-$host_os" in
yes-3.[[4-9]].*-*|yes-[[4-9]].*-*)
CFLAGS="$CFLAGS -Wno-declaration-after-statement";;
diff --git a/debian/libmonetdb4-server-geom.install
b/debian/libmonetdb4-server-geom.install
deleted file mode 100644
--- a/debian/libmonetdb4-server-geom.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/monetdb4/geom.mil usr/lib/monetdb4
-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
deleted file mode 100644
--- a/debian/libmonetdb4-xquery.install
+++ /dev/null
@@ -1,4 +0,0 @@
-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
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
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -3,4 +3,4 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-strict=no --enable-assert=no
--enable-debug=no --enable-optimize=yes --enable-java=no --enable-rdf=no
--enable-monetdb4=yes --enable-pathfinder=yes --with-gc=no --with-valgrind=no
--with-netcdf=no --with-mseed=no --with-rubygem-dir=lib/ruby/gems/1.8
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-strict=no --enable-assert=no
--enable-debug=no --enable-optimize=yes --enable-java=no --enable-rdf=no
--with-valgrind=no --with-mseed=no --with-rubygem-dir=lib/ruby/gems/1.8
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
