Changeset: fe9190c7fc94 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fe9190c7fc94
Modified Files:
MonetDB.spec
debian/monetdb5-jaql.install
debian/monetdb5-server.install
Branch: default
Log Message:
Package json_atom in MonetDB server package, not in JAQL package.
diffs (53 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -441,7 +441,8 @@ querly language for JavaScript Object No
%defattr(-,root,root)
%{_libdir}/monetdb5/autoload/*_jaql.mal
%{_libdir}/monetdb5/jaql*.mal
-%{_libdir}/monetdb5/json*.mal
+%{_libdir}/monetdb5/json.mal
+%{_libdir}/monetdb5/json_util.mal
%{_libdir}/monetdb5/lib_jaql.so
%{_libdir}/monetdb5/lib_json.so
@@ -497,7 +498,8 @@ fi
# %exclude %{_libdir}/monetdb5/rdf.mal
%exclude %{_libdir}/monetdb5/sql.mal
%exclude %{_libdir}/monetdb5/jaql*.mal
-%exclude %{_libdir}/monetdb5/json*.mal
+%exclude %{_libdir}/monetdb5/json.mal
+%exclude %{_libdir}/monetdb5/json_util.mal
%{_libdir}/monetdb5/*.mal
# %{_libdir}/monetdb5/autoload/*_fits.mal
%{_libdir}/monetdb5/autoload/*_lsst.mal
diff --git a/debian/monetdb5-jaql.install b/debian/monetdb5-jaql.install
--- a/debian/monetdb5-jaql.install
+++ b/debian/monetdb5-jaql.install
@@ -1,5 +1,6 @@
debian/tmp/usr/lib/monetdb5/autoload/*_jaql.mal usr/lib/monetdb5/autoload
debian/tmp/usr/lib/monetdb5/jaql*.mal usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/json*.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/json.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/json_util.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/lib_jaql.so usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/lib_json.so usr/lib/monetdb5
diff --git a/debian/monetdb5-server.install b/debian/monetdb5-server.install
--- a/debian/monetdb5-server.install
+++ b/debian/monetdb5-server.install
@@ -7,13 +7,14 @@ debian/tmp/usr/lib/monetdb5/lib_opt_sql_
debian/tmp/usr/lib/monetdb5/lib_udf.so usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/lib_vault.so usr/lib/monetdb5
-# usr/lib/monetdb5/*.mal EXCEPT: geom.mal, gsl.mal, jaql*.mal, json*.mal,
sql*.mal
+# usr/lib/monetdb5/*.mal EXCEPT: geom.mal, gsl.mal, jaql*.mal, json.mal,
json_util.mal, sql*.mal
debian/tmp/usr/lib/monetdb5/a*.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/b*.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/c*.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/f*.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/gr*.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/i*.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/json_atom.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/l*.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/m*.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/o*.mal usr/lib/monetdb5
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
