Changeset: c68523bc41f8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c68523bc41f8
Added Files:
debian/monetdb-client-tools.install
Modified Files:
MonetDB.spec
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
debian/control
debian/monetdb-client.install
debian/monetdb5-sql.install
Branch: default
Log Message:
Merge with Feb2013 branch.
diffs (263 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -143,11 +143,28 @@ MonetDB, you will very likely need this
%defattr(-,root,root)
%{_bindir}/mclient
%{_bindir}/msqldump
-%{_bindir}/stethoscope
%{_libdir}/libmapi.so.*
%doc %{_mandir}/man1/mclient.1.gz
%doc %{_mandir}/man1/msqldump.1.gz
+%package client-tools
+Summary: MonetDB - Monet Database Management System Client Programs
+Group: Applications/Databases
+Requires: %{name}-client = %{version}-%{release}
+
+%description client-tools
+MonetDB is a database management system that is developed from a
+main-memory perspective with use of a fully decomposed storage model,
+automatic index management, extensibility of data types and search
+accelerators. It also has an SQL frontend.
+
+This package contains stethoscope and tomograph.
+
+%files client-tools
+%defattr(-,root,root)
+%{_bindir}/stethoscope
+%{_bindir}/tomograph
+
%package client-devel
Summary: MonetDB - Monet Database Management System Client Programs
Group: Applications/Databases
@@ -688,7 +705,6 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir
# .la files
rm -f $RPM_BUILD_ROOT%{_libdir}/monetdb5/*.la
# internal development stuff
-rm -f $RPM_BUILD_ROOT%{_bindir}/calibrator
rm -f $RPM_BUILD_ROOT%{_bindir}/Maddlog
rm -f $RPM_BUILD_ROOT%{_libdir}/libbat.la
rm -f $RPM_BUILD_ROOT%{_libdir}/libbat.so
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -231,6 +231,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_399DA9FEC3D14CA1ABCAA84D75F3532E"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_3B793520B49D47C18CC14D2B737DA38C"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1721,6 +1727,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_399DA9FEC3D14CA1ABCAA84D75F3532E"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\createdb\\75_storagemodel.sql"
+ "TargetName" = "8:75_storagemodel.sql"
+ "Tag" = "8:"
+ "Folder" = "8:_7F962DDBDF894636B6CAFE6FE4887567"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3B793520B49D47C18CC14D2B737DA38C"
{
"SourcePath" = "8:lib\\monetdb5\\microbenchmark.mal"
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -369,12 +369,6 @@
}
"Entry"
{
- "MsmKey" = "8:_FEC2A3A2B0AE4D0990D6AE908F876EE4"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_6B9091C26D034EFD92BB0864ADB05B61"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -699,6 +693,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_BE5D88D9A25C4ED1A987747ABA28C358"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_BF77ED0A7E9C49478C26BAF11A3F2C37"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -915,6 +915,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_FEC2A3A2B0AE4D0990D6AE908F876EE4"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_FF4ED691FBAF49DEA4726DF1C1C90785"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -2181,26 +2187,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FEC2A3A2B0AE4D0990D6AE908F876EE4"
- {
- "SourcePath" = "8:lib\\monetdb5\\iterator.mal"
- "TargetName" = "8:iterator.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6B9091C26D034EFD92BB0864ADB05B61"
{
"SourcePath" = "8:lib\\monetdb5\\json.mal"
@@ -3261,6 +3247,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BE5D88D9A25C4ED1A987747ABA28C358"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\createdb\\75_storagemodel.sql"
+ "TargetName" = "8:75_storagemodel.sql"
+ "Tag" = "8:"
+ "Folder" = "8:_7F962DDBDF894636B6CAFE6FE4887567"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BF77ED0A7E9C49478C26BAF11A3F2C37"
{
"SourcePath" = "8:lib\\monetdb5\\constraints.mal"
@@ -3981,6 +3987,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FEC2A3A2B0AE4D0990D6AE908F876EE4"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\iterator.mal"
+ "TargetName" = "8:iterator.mal"
+ "Tag" = "8:"
+ "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FF4ED691FBAF49DEA4726DF1C1C90785"
{
"SourcePath" = "8:lib\\monetdb5\\lib_udf.dll"
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -97,6 +97,17 @@ Description: MonetDB database client
database so that it can be loaded back later. If you want to use
MonetDB, you will very likely need this package.
+Package: monetdb-client-tools
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb-client
+Description: MonetDB database client
+ MonetDB is a database management system that is developed from a
+ main-memory perspective with use of a fully decomposed storage model,
+ automatic index management, extensibility of data types and search
+ accelerators. It also has an SQL frontend.
+ .
+ This package contains stethoscope and tomograph.
+
Package: libmonetdb-client-odbc
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/monetdb-client-tools.install
b/debian/monetdb-client-tools.install
new file mode 100644
--- /dev/null
+++ b/debian/monetdb-client-tools.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/bin/stethoscope usr/bin
+debian/tmp/usr/bin/tomograph usr/bin
diff --git a/debian/monetdb-client.install b/debian/monetdb-client.install
--- a/debian/monetdb-client.install
+++ b/debian/monetdb-client.install
@@ -1,3 +1,2 @@
debian/tmp/usr/bin/mclient usr/bin
debian/tmp/usr/bin/msqldump usr/bin
-debian/tmp/usr/bin/stethoscope usr/bin
diff --git a/debian/monetdb5-sql.install b/debian/monetdb5-sql.install
--- a/debian/monetdb5-sql.install
+++ b/debian/monetdb5-sql.install
@@ -4,6 +4,9 @@ debian/tmp/usr/lib/monetdb5/*.sql usr/li
debian/tmp/usr/lib/monetdb5/autoload/*_sql.mal usr/lib/monetdb5/autoload
debian/tmp/usr/lib/monetdb5/sql.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/lib_sql.so usr/lib/monetdb5
+debian/tmp/var/monetdb5/dbfarm/.merovingian_properties var/monetdb5/dbfarm
+
+# usr/lib/monetdb5/createdb/*.sql EXCEPT: *_geom.sql
debian/tmp/usr/lib/monetdb5/createdb/09_like.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/10_math.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/11_times.sql usr/lib/monetdb5/createdb
@@ -22,6 +25,6 @@ debian/tmp/usr/lib/monetdb5/createdb/23_
debian/tmp/usr/lib/monetdb5/createdb/24_zorder.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/25_debug.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/39_analytics.sql usr/lib/monetdb5/createdb
+debian/tmp/usr/lib/monetdb5/createdb/75_storagemodel.sql
usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/80_udf.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/99_system.sql usr/lib/monetdb5/createdb
-debian/tmp/var/monetdb5/dbfarm/.merovingian_properties var/monetdb5/dbfarm
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
