Changeset: 83cbe43676dc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=83cbe43676dc
Modified Files:
MonetDB/MonetDB.spec
MonetDB4/MonetDB-server.spec
MonetDB5/MonetDB-server.spec
clients/MonetDB-client.spec
clients/src/odbc/winsetup/MonetDB-ODBC-Installer/MonetDB-ODBC-Installer.vdproj
clients/src/odbc/winsetup/MonetDB-ODBC-Installer64/MonetDB-ODBC-Installer.vdproj
geom/MonetDB-geom.spec
geom/NT/MonetDB5-Geom/MonetDB5-Geom-Module.vdproj
geom/NT/MonetDB5-Geom64/MonetDB5-Geom-Module.vdproj
pathfinder/MonetDB-XQuery.spec
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
sql/ChangeLog.Jun2010
sql/MonetDB-SQL.spec
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
testing/MonetDB-testing.spec
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (260 lines):
diff -r 0e0de722f848 -r 83cbe43676dc .hgtags
--- a/.hgtags Mon Jul 12 11:28:28 2010 +0200
+++ b/.hgtags Mon Jul 12 12:41:02 2010 +0200
@@ -417,3 +417,5 @@
700a31b47b8a8fd449607d16f14c5c96d3c503cb Jun2010_3
700a31b47b8a8fd449607d16f14c5c96d3c503cb Jun2010_3
e4fe1c3cabfee2bba0b620aee6c3e9d569d37e17 Jun2010_3
+e4fe1c3cabfee2bba0b620aee6c3e9d569d37e17 Jun2010_3
+9aa479df22dda265b8c685f9e15b0899244b0184 Jun2010_3
diff -r 0e0de722f848 -r 83cbe43676dc MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Mon Jul 12 11:28:28 2010 +0200
+++ b/MonetDB/MonetDB.spec Mon Jul 12 12:41:02 2010 +0200
@@ -106,6 +106,9 @@
%{_libdir}/libbat.so
%changelog
+* Mon Jul 12 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.3-20100712
+- Rebuilt.
+
* Fri Jul 09 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.3-20100709
- Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc MonetDB/debian/changelog
--- a/MonetDB/debian/changelog Mon Jul 12 11:28:28 2010 +0200
+++ b/MonetDB/debian/changelog Mon Jul 12 12:41:02 2010 +0200
@@ -1,3 +1,9 @@
+monetdb (1.38.3-20100712) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Mon, 12 Jul 2010 12:00:27 +0200
+
monetdb (1.38.3-20100709) unstable; urgency=low
* Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Mon Jul 12 11:28:28 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec Mon Jul 12 12:41:02 2010 +0200
@@ -216,6 +216,9 @@
%{_libdir}/libembeddedmil.so
%changelog
+* Mon Jul 12 2010 Sjoerd Mullender <sjo...@acm.org> - 4.38.3-20100712
+- Rebuilt.
+
* Fri Jul 09 2010 Sjoerd Mullender <sjo...@acm.org> - 4.38.3-20100709
- Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Mon Jul 12 11:28:28 2010 +0200
+++ b/MonetDB4/debian/changelog Mon Jul 12 12:41:02 2010 +0200
@@ -1,3 +1,9 @@
+monetdb4-server (4.38.3-20100712) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Mon, 12 Jul 2010 12:00:27 +0200
+
monetdb4-server (4.38.3-20100709) unstable; urgency=low
* Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Mon Jul 12 11:28:28 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec Mon Jul 12 12:41:02 2010 +0200
@@ -213,6 +213,9 @@
%{_libdir}/*.so
%changelog
+* Mon Jul 12 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.3-20100712
+- Rebuilt.
+
* Fri Jul 09 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.3-20100709
- Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc MonetDB5/debian/changelog
--- a/MonetDB5/debian/changelog Mon Jul 12 11:28:28 2010 +0200
+++ b/MonetDB5/debian/changelog Mon Jul 12 12:41:02 2010 +0200
@@ -1,3 +1,9 @@
+monetdb5-server (5.20.3-20100712) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Mon, 12 Jul 2010 12:00:27 +0200
+
monetdb5-server (5.20.3-20100709) unstable; urgency=low
* Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc clients/MonetDB-client.spec
--- a/clients/MonetDB-client.spec Mon Jul 12 11:28:28 2010 +0200
+++ b/clients/MonetDB-client.spec Mon Jul 12 12:41:02 2010 +0200
@@ -301,6 +301,9 @@
%{_libdir}/MonetDB/Tests/*
%changelog
+* Mon Jul 12 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.3-20100712
+- Rebuilt.
+
* Fri Jul 09 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.3-20100709
- Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc clients/debian/changelog
--- a/clients/debian/changelog Mon Jul 12 11:28:28 2010 +0200
+++ b/clients/debian/changelog Mon Jul 12 12:41:02 2010 +0200
@@ -1,3 +1,9 @@
+monetdb-client (1.38.3-20100712) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Mon, 12 Jul 2010 12:00:28 +0200
+
monetdb-client (1.38.3-20100709) unstable; urgency=low
* Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc geom/MonetDB-geom.spec
--- a/geom/MonetDB-geom.spec Mon Jul 12 11:28:28 2010 +0200
+++ b/geom/MonetDB-geom.spec Mon Jul 12 12:41:02 2010 +0200
@@ -172,6 +172,9 @@
%endif
%changelog
+* Mon Jul 12 2010 Sjoerd Mullender <sjo...@acm.org> - 0.18.3-20100712
+- Rebuilt.
+
* Fri Jul 09 2010 Sjoerd Mullender <sjo...@acm.org> - 0.18.3-20100709
- Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc geom/debian/changelog
--- a/geom/debian/changelog Mon Jul 12 11:28:28 2010 +0200
+++ b/geom/debian/changelog Mon Jul 12 12:41:02 2010 +0200
@@ -1,3 +1,9 @@
+monetdb-geom (0.18.3-20100712) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Mon, 12 Jul 2010 12:00:28 +0200
+
monetdb-geom (0.18.3-20100709) unstable; urgency=low
* Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc pathfinder/MonetDB-XQuery.spec
--- a/pathfinder/MonetDB-XQuery.spec Mon Jul 12 11:28:28 2010 +0200
+++ b/pathfinder/MonetDB-XQuery.spec Mon Jul 12 12:41:02 2010 +0200
@@ -138,6 +138,9 @@
%{_bindir}/monetdb-xquery-config
%changelog
+* Mon Jul 12 2010 Sjoerd Mullender <sjo...@acm.org> - 0.38.3-20100712
+- Rebuilt.
+
* Fri Jul 09 2010 Sjoerd Mullender <sjo...@acm.org> - 0.38.3-20100709
- Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc pathfinder/debian/changelog
--- a/pathfinder/debian/changelog Mon Jul 12 11:28:28 2010 +0200
+++ b/pathfinder/debian/changelog Mon Jul 12 12:41:02 2010 +0200
@@ -1,3 +1,9 @@
+monetdb-xquery (0.38.3-20100712) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Mon, 12 Jul 2010 12:00:28 +0200
+
monetdb-xquery (0.38.3-20100709) unstable; urgency=low
* Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc sql/ChangeLog.Jun2010
--- a/sql/ChangeLog.Jun2010 Mon Jul 12 11:28:28 2010 +0200
+++ b/sql/ChangeLog.Jun2010 Mon Jul 12 12:41:02 2010 +0200
@@ -1,13 +1,3 @@
# ChangeLog file for sql
# This file is updated with Maddlog
-* Mon Jul 12 2010 Stefan Manegold <stefan.maneg...@cwi.nl>
-- Make queries like
- (SELECT ...) UNION ALL (SELECT ...) ORDER BY ...;
- work, again, that were broken since Jun 22 2010
- triggering errors like "ORDER BY: missing select operator"
-
-* Fri Jul 9 2010 Fabian Groffen <fab...@cwi.nl>
-- Removed false connection warning about missing SQL script ("could not
- read createdb.sql") received by the client upon first connect on a
- newly created database. Bug #2591
diff -r 0e0de722f848 -r 83cbe43676dc sql/MonetDB-SQL.spec
--- a/sql/MonetDB-SQL.spec Mon Jul 12 11:28:28 2010 +0200
+++ b/sql/MonetDB-SQL.spec Mon Jul 12 12:41:02 2010 +0200
@@ -157,6 +157,19 @@
%{_libdir}/libembeddedsql5.so
%changelog
+* Mon Jul 12 2010 Sjoerd Mullender <sjo...@acm.org> - 2.38.3-20100712
+- Rebuilt.
+
+* Mon Jul 12 2010 Stefan Manegold <stefan.maneg...@cwi.nl> - 2.38.3-20100712
+- Make queries like
+(SELECT ...) UNION ALL (SELECT ...) ORDER BY ...;
+work, again, that were broken since Jun 22 2010
+triggering errors like "ORDER BY: missing select operator"
+
+* Fri Jul 9 2010 Fabian Groffen <fab...@cwi.nl> - 2.38.3-20100712
+- Removed false connection warning about missing SQL script ("could not
+read createdb.sql") received by the client upon first connect on a
+newly created database. Bug #2591
* Fri Jul 09 2010 Sjoerd Mullender <sjo...@acm.org> - 2.38.3-20100709
- Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc sql/debian/changelog
--- a/sql/debian/changelog Mon Jul 12 11:28:28 2010 +0200
+++ b/sql/debian/changelog Mon Jul 12 12:41:02 2010 +0200
@@ -1,3 +1,25 @@
+monetdb-sql (2.38.3-20100712) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Mon, 12 Jul 2010 12:00:28 +0200
+
+monetdb-sql (2.38.3-20100712) unstable; urgency=low
+
+ * Make queries like
+(SELECT ...) UNION ALL (SELECT ...) ORDER BY ...;
+work, again, that were broken since Jun 22 2010
+triggering errors like "ORDER BY: missing select operator"
+
+ -- Stefan Manegold <stefan.maneg...@cwi.nl> Mon, 12 Jul 2010 12:00:28 +0200
+
+monetdb-sql (2.38.3-20100712) unstable; urgency=low
+
+ * Removed false connection warning about missing SQL script ("could not
+read createdb.sql") received by the client upon first connect on a
+
+ -- Fabian Groffen <fab...@cwi.nl> Fri, 9 Jul 2010 12:00:28 +0200
+
monetdb-sql (2.38.3-20100709) unstable; urgency=low
* Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc testing/MonetDB-testing.spec
--- a/testing/MonetDB-testing.spec Mon Jul 12 11:28:28 2010 +0200
+++ b/testing/MonetDB-testing.spec Mon Jul 12 12:41:02 2010 +0200
@@ -112,6 +112,9 @@
%{python_sitelib}/MonetDBtesting/subprocess26.py
%changelog
+* Mon Jul 12 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.3-20100712
+- Rebuilt.
+
* Fri Jul 09 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.3-20100709
- Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc testing/debian/changelog
--- a/testing/debian/changelog Mon Jul 12 11:28:28 2010 +0200
+++ b/testing/debian/changelog Mon Jul 12 12:41:02 2010 +0200
@@ -1,3 +1,9 @@
+monetdb-testing (1.38.3-20100712) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Mon, 12 Jul 2010 12:00:28 +0200
+
monetdb-testing (1.38.3-20100709) unstable; urgency=low
* Rebuilt.
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
