Changeset: c360a431a190 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c360a431a190
Modified Files:
MonetDB.spec
debian/monetdb5-server.install
Branch: remote_auth
Log Message:
Merge with default
diffs (30 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -679,7 +679,6 @@ fi
%endif
%{_libdir}/monetdb5/lib_capi.so
%{_libdir}/monetdb5/lib_generator.so
-%{_libdir}/monetdb5/lib_lsst.so
%{_libdir}/monetdb5/lib_opt_sql_append.so
%{_libdir}/monetdb5/lib_udf.so
%{_libdir}/monetdb5/lib_vault.so
diff --git a/debian/monetdb5-server.install b/debian/monetdb5-server.install
--- a/debian/monetdb5-server.install
+++ b/debian/monetdb5-server.install
@@ -3,7 +3,6 @@ debian/tmp/usr/lib/libmonetdb5.so.* usr/
# usr/lib/monetdb5/lib_*.so EXCEPT: lib_{bam,geom,gsl,lidar,pyapi,rapi,sql}.so
debian/tmp/usr/lib/monetdb5/lib_generator.so usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/lib_lsst.so usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/lib_opt_sql_append.so usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/lib_udf.so usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/lib_vault.so usr/lib/monetdb5
@@ -25,7 +24,6 @@ debian/tmp/usr/lib/monetdb5/u[!d]*.mal u
debian/tmp/usr/lib/monetdb5/autoload/??_batcalc.mal usr/lib/monetdb5/autoload
debian/tmp/usr/lib/monetdb5/autoload/??_calc.mal usr/lib/monetdb5/autoload
debian/tmp/usr/lib/monetdb5/autoload/??_generator.mal usr/lib/monetdb5/autoload
-debian/tmp/usr/lib/monetdb5/autoload/??_lsst.mal usr/lib/monetdb5/autoload
debian/tmp/usr/lib/monetdb5/autoload/??_opt_sql_append.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
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
