Changeset: 7dc852170b1e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7dc852170b1e
Modified Files:
clients/MonetDB-client.spec
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (43 lines):
diff -r fc58f6cf4cf3 -r 7dc852170b1e MonetDB/debian/libmonetdb-dev.install
--- a/MonetDB/debian/libmonetdb-dev.install Thu Nov 04 13:56:26 2010 +0100
+++ b/MonetDB/debian/libmonetdb-dev.install Thu Nov 04 16:53:48 2010 +0100
@@ -5,3 +5,4 @@
debian/tmp/usr/lib/libbat.so usr/lib
debian/tmp/usr/lib/libmutils.so usr/lib
debian/tmp/usr/lib/libstream.so usr/lib
+debian/tmp/usr/lib/pkgconfig/*.pc usr/lib/pkgconfig
diff -r fc58f6cf4cf3 -r 7dc852170b1e
MonetDB5/debian/libmonetdb5-server-dev.install
--- a/MonetDB5/debian/libmonetdb5-server-dev.install Thu Nov 04 13:56:26
2010 +0100
+++ b/MonetDB5/debian/libmonetdb5-server-dev.install Thu Nov 04 16:53:48
2010 +0100
@@ -9,3 +9,4 @@
debian/tmp/usr/include/MonetDB5/rdf/*.h usr/include/MonetDB5/rdf
debian/tmp/usr/include/MonetDB5/tools/*.h usr/include/MonetDB5/tools
debian/tmp/usr/lib/lib*.so usr/lib
+debian/tmp/usr/lib/pkgconfig/*.pc usr/lib/pkgconfig
diff -r fc58f6cf4cf3 -r 7dc852170b1e clients/MonetDB-client.spec
--- a/clients/MonetDB-client.spec Thu Nov 04 13:56:26 2010 +0100
+++ b/clients/MonetDB-client.spec Thu Nov 04 16:53:48 2010 +0100
@@ -264,7 +264,6 @@
%dir %{_includedir}/MonetDB/mapilib
%{_includedir}/MonetDB/mapilib/Mapi.h
%{_libdir}/pkgconfig/monetdb-mapi.pc
-%{_libdir}/pkgconfig/monetdb-odbc.pc
# todo odbc-devel package ?
%files odbc
diff -r fc58f6cf4cf3 -r 7dc852170b1e
clients/debian/libmonetdb-client-dev.install
--- a/clients/debian/libmonetdb-client-dev.install Thu Nov 04 13:56:26
2010 +0100
+++ b/clients/debian/libmonetdb-client-dev.install Thu Nov 04 16:53:48
2010 +0100
@@ -1,3 +1,4 @@
debian/tmp/usr/bin/monetdb-clients-config usr/bin
debian/tmp/usr/include/MonetDB/mapilib/Mapi.h usr/include/MonetDB/mapilib
debian/tmp/usr/lib/libMapi.so usr/lib
+debian/tmp/usr/lib/pkgconfig/monetdb-mapi.pc usr/lib/pkgconfig
diff -r fc58f6cf4cf3 -r 7dc852170b1e sql/debian/libmonetdb5-sql-dev.install
--- a/sql/debian/libmonetdb5-sql-dev.install Thu Nov 04 13:56:26 2010 +0100
+++ b/sql/debian/libmonetdb5-sql-dev.install Thu Nov 04 16:53:48 2010 +0100
@@ -1,3 +1,4 @@
debian/tmp/usr/bin/monetdb-sql-config usr/bin
debian/tmp/usr/include/MonetDB5/sql/embeddedclient.h usr/include/MonetDB5/sql
debian/tmp/usr/lib/lib*.so /usr/lib
+debian/tmp/usr/lib/pkgconfig/*.pc usr/lib/pkgconfig
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
