Changeset: 72a27d7610be for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=72a27d7610be
Modified Files:
        MonetDB.spec
        debian/monetdb-client-testing.install
        debian/monetdb5-server.install
Branch: default
Log Message:

Merge with Apr2012 branch.


diffs (35 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -295,6 +295,7 @@ developer.
 
 %files client-tests
 %defattr(-,root,root)
+%{_bindir}/arraytest
 %{_bindir}/odbcsample1
 %{_bindir}/sample0
 %{_bindir}/sample1
@@ -391,6 +392,7 @@ fi
 %{_libdir}/monetdb5/autoload/*_vault.mal
 %{_libdir}/monetdb5/autoload/*_lsst.mal
 %{_libdir}/monetdb5/autoload/*_udf.mal
+%{_libdir}/monetdb5/autoload/*_opt_sql_append.mal
 %if %{?centos:0}%{!?centos:1}
 %exclude %{_libdir}/monetdb5/lib_geom.so
 %endif
diff --git a/debian/monetdb-client-testing.install 
b/debian/monetdb-client-testing.install
--- a/debian/monetdb-client-testing.install
+++ b/debian/monetdb-client-testing.install
@@ -1,3 +1,4 @@
+debian/tmp/usr/bin/arraytest usr/bin
 debian/tmp/usr/bin/odbcsample1 usr/bin
 debian/tmp/usr/bin/sample0 usr/bin
 debian/tmp/usr/bin/sample1 usr/bin
diff --git a/debian/monetdb5-server.install b/debian/monetdb5-server.install
--- a/debian/monetdb5-server.install
+++ b/debian/monetdb5-server.install
@@ -74,3 +74,4 @@ debian/tmp/usr/lib/monetdb5/zorder.mal u
 debian/tmp/usr/lib/monetdb5/autoload/*_lsst.mal usr/lib/monetdb5/autoload
 debian/tmp/usr/lib/monetdb5/autoload/*_udf.mal usr/lib/monetdb5/autoload
 debian/tmp/usr/lib/monetdb5/autoload/*_vault.mal usr/lib/monetdb5/autoload
+debian/tmp/usr/lib/monetdb5/autoload/*_opt_sql_append.mal 
usr/lib/monetdb5/autoload
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to