Changeset: 55b256dd5883 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=55b256dd5883
Modified Files:
MonetDB/MonetDB.spec
MonetDB4/MonetDB-server.spec
MonetDB5/MonetDB-server.spec
buildtools/conf/MonetDB.m4
clients/MonetDB-client.spec
geom/MonetDB-geom.spec
pathfinder/MonetDB-XQuery.spec
sql/MonetDB-SQL.spec
testing/MonetDB-testing.spec
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (252 lines):
diff -r aa35e0279381 -r 55b256dd5883 .hgtags
--- a/.hgtags Wed Nov 10 09:16:59 2010 +0100
+++ b/.hgtags Wed Nov 10 10:19:54 2010 +0100
@@ -430,3 +430,5 @@
5740074a9a9b6cc9919304f76a3a6924dde4768e Oct2010_1
5740074a9a9b6cc9919304f76a3a6924dde4768e Oct2010_1
49a13817f9ce7c7d75476f9cb37ab29b9a30a9c8 Oct2010_1
+49a13817f9ce7c7d75476f9cb37ab29b9a30a9c8 Oct2010_1
+491925a23d21d3599a5680618f4f00f8b8710c78 Oct2010_1
diff -r aa35e0279381 -r 55b256dd5883 MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Wed Nov 10 09:16:59 2010 +0100
+++ b/MonetDB/MonetDB.spec Wed Nov 10 10:19:54 2010 +0100
@@ -110,6 +110,9 @@
%{_libdir}/libbat.so
%changelog
+* Wed Nov 10 2010 Sjoerd Mullender <[email protected]> - 1.40.1-20101110
+- Rebuilt.
+
* Tue Nov 09 2010 Sjoerd Mullender <[email protected]> - 1.40.1-20101109
- Rebuilt.
diff -r aa35e0279381 -r 55b256dd5883 MonetDB/debian/changelog
--- a/MonetDB/debian/changelog Wed Nov 10 09:16:59 2010 +0100
+++ b/MonetDB/debian/changelog Wed Nov 10 10:19:54 2010 +0100
@@ -1,3 +1,9 @@
+monetdb (1.40.1-20101110) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Wed, 10 Nov 2010 09:17:03 +0100
+
monetdb (1.40.1-20101109) unstable; urgency=low
* Rebuilt.
diff -r aa35e0279381 -r 55b256dd5883 MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Wed Nov 10 09:16:59 2010 +0100
+++ b/MonetDB4/MonetDB-server.spec Wed Nov 10 10:19:54 2010 +0100
@@ -216,6 +216,9 @@
%{_libdir}/libembeddedmil.so
%changelog
+* Wed Nov 10 2010 Sjoerd Mullender <[email protected]> - 4.40.1-20101110
+- Rebuilt.
+
* Tue Nov 09 2010 Sjoerd Mullender <[email protected]> - 4.40.1-20101109
- Rebuilt.
diff -r aa35e0279381 -r 55b256dd5883 MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Wed Nov 10 09:16:59 2010 +0100
+++ b/MonetDB4/debian/changelog Wed Nov 10 10:19:54 2010 +0100
@@ -1,3 +1,9 @@
+monetdb4-server (4.40.1-20101110) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Wed, 10 Nov 2010 09:17:03 +0100
+
monetdb4-server (4.40.1-20101109) unstable; urgency=low
* Rebuilt.
diff -r aa35e0279381 -r 55b256dd5883 MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Wed Nov 10 09:16:59 2010 +0100
+++ b/MonetDB5/MonetDB-server.spec Wed Nov 10 10:19:54 2010 +0100
@@ -216,6 +216,9 @@
%{_libdir}/pkgconfig/monetdb-mal.pc
%changelog
+* Wed Nov 10 2010 Sjoerd Mullender <[email protected]> - 5.22.1-20101110
+- Rebuilt.
+
* Tue Nov 09 2010 Sjoerd Mullender <[email protected]> - 5.22.1-20101109
- Rebuilt.
diff -r aa35e0279381 -r 55b256dd5883 MonetDB5/debian/changelog
--- a/MonetDB5/debian/changelog Wed Nov 10 09:16:59 2010 +0100
+++ b/MonetDB5/debian/changelog Wed Nov 10 10:19:54 2010 +0100
@@ -1,3 +1,9 @@
+monetdb5-server (5.22.1-20101110) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Wed, 10 Nov 2010 09:17:03 +0100
+
monetdb5-server (5.22.1-20101109) unstable; urgency=low
* Rebuilt.
diff -r aa35e0279381 -r 55b256dd5883 clients/MonetDB-client.spec
--- a/clients/MonetDB-client.spec Wed Nov 10 09:16:59 2010 +0100
+++ b/clients/MonetDB-client.spec Wed Nov 10 10:19:54 2010 +0100
@@ -303,6 +303,9 @@
%{_libdir}/MonetDB/Tests/*
%changelog
+* Wed Nov 10 2010 Sjoerd Mullender <[email protected]> - 1.40.1-20101110
+- Rebuilt.
+
* Tue Nov 09 2010 Sjoerd Mullender <[email protected]> - 1.40.1-20101109
- Rebuilt.
diff -r aa35e0279381 -r 55b256dd5883 clients/debian/changelog
--- a/clients/debian/changelog Wed Nov 10 09:16:59 2010 +0100
+++ b/clients/debian/changelog Wed Nov 10 10:19:54 2010 +0100
@@ -1,3 +1,9 @@
+monetdb-client (1.40.1-20101110) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Wed, 10 Nov 2010 09:17:04 +0100
+
monetdb-client (1.40.1-20101109) unstable; urgency=low
* Rebuilt.
diff -r aa35e0279381 -r 55b256dd5883 geom/MonetDB-geom.spec
--- a/geom/MonetDB-geom.spec Wed Nov 10 09:16:59 2010 +0100
+++ b/geom/MonetDB-geom.spec Wed Nov 10 10:19:54 2010 +0100
@@ -172,6 +172,9 @@
%endif
%changelog
+* Wed Nov 10 2010 Sjoerd Mullender <[email protected]> - 0.20.1-20101110
+- Rebuilt.
+
* Tue Nov 09 2010 Sjoerd Mullender <[email protected]> - 0.20.1-20101109
- Rebuilt.
diff -r aa35e0279381 -r 55b256dd5883 geom/debian/changelog
--- a/geom/debian/changelog Wed Nov 10 09:16:59 2010 +0100
+++ b/geom/debian/changelog Wed Nov 10 10:19:54 2010 +0100
@@ -1,3 +1,9 @@
+monetdb-geom (0.20.1-20101110) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Wed, 10 Nov 2010 09:17:04 +0100
+
monetdb-geom (0.20.1-20101109) unstable; urgency=low
* Rebuilt.
diff -r aa35e0279381 -r 55b256dd5883 java/ChangeLog-Archive
--- a/java/ChangeLog-Archive Wed Nov 10 09:16:59 2010 +0100
+++ b/java/ChangeLog-Archive Wed Nov 10 10:19:54 2010 +0100
@@ -1,6 +1,15 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Tue Nov 9 2010 Fabian Groffen <[email protected]> - 1.40.1-20101110
+- Fix SQL syntax of inserting BLOB code, using setBytes()
+- Added propery 'treat_blob_as_binary' to simulate BINARY types based on
+ BLOBs for applications, (e.g. Hibernate-based) that rely on BINARY's
+ byte array mapping
+- Added code to handle BINARY types
+- Fixed implementation of getBytes to match the specifications
+- Implemented getBinaryStream according to the specifications
+
* Mon Nov 8 2010 Fabian Groffen <[email protected]> - 1.40.1-20101109
- Java 1.6's subSequence() bug has changed into a slice() bug since
1.6.0_22. Revert workaround for subSequence breakage, since it breaks
diff -r aa35e0279381 -r 55b256dd5883 java/ChangeLog.Oct2010
--- a/java/ChangeLog.Oct2010 Wed Nov 10 09:16:59 2010 +0100
+++ b/java/ChangeLog.Oct2010 Wed Nov 10 10:19:54 2010 +0100
@@ -1,12 +1,3 @@
# ChangeLog file for java
# This file is updated with mchangelog (Gentoo echangelog bastard script)
-* Tue Nov 9 2010 Fabian Groffen <[email protected]>
-- Fix SQL syntax of inserting BLOB code, using setBytes()
-- Added propery 'treat_blob_as_binary' to simulate BINARY types based on
- BLOBs for applications, (e.g. Hibernate-based) that rely on BINARY's
- byte array mapping
-- Added code to handle BINARY types
-- Fixed implementation of getBytes to match the specifications
-- Implemented getBinaryStream according to the specifications
-
diff -r aa35e0279381 -r 55b256dd5883 pathfinder/MonetDB-XQuery.spec
--- a/pathfinder/MonetDB-XQuery.spec Wed Nov 10 09:16:59 2010 +0100
+++ b/pathfinder/MonetDB-XQuery.spec Wed Nov 10 10:19:54 2010 +0100
@@ -155,6 +155,9 @@
%{_includedir}/pf_ferry.h
%changelog
+* Wed Nov 10 2010 Sjoerd Mullender <[email protected]> - 0.40.1-20101110
+- Rebuilt.
+
* Tue Nov 09 2010 Sjoerd Mullender <[email protected]> - 0.40.1-20101109
- Rebuilt.
diff -r aa35e0279381 -r 55b256dd5883 pathfinder/debian/changelog
--- a/pathfinder/debian/changelog Wed Nov 10 09:16:59 2010 +0100
+++ b/pathfinder/debian/changelog Wed Nov 10 10:19:54 2010 +0100
@@ -1,3 +1,9 @@
+monetdb-xquery (0.40.1-20101110) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Wed, 10 Nov 2010 09:17:04 +0100
+
monetdb-xquery (0.40.1-20101109) unstable; urgency=low
* Rebuilt.
diff -r aa35e0279381 -r 55b256dd5883 sql/MonetDB-SQL.spec
--- a/sql/MonetDB-SQL.spec Wed Nov 10 09:16:59 2010 +0100
+++ b/sql/MonetDB-SQL.spec Wed Nov 10 10:19:54 2010 +0100
@@ -159,6 +159,9 @@
%{_includedir}/MonetDB5/sql/*.h
%changelog
+* Wed Nov 10 2010 Sjoerd Mullender <[email protected]> - 2.40.1-20101110
+- Rebuilt.
+
* Tue Nov 09 2010 Sjoerd Mullender <[email protected]> - 2.40.1-20101109
- Rebuilt.
diff -r aa35e0279381 -r 55b256dd5883 sql/debian/changelog
--- a/sql/debian/changelog Wed Nov 10 09:16:59 2010 +0100
+++ b/sql/debian/changelog Wed Nov 10 10:19:54 2010 +0100
@@ -1,3 +1,9 @@
+monetdb-sql (2.40.1-20101110) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Wed, 10 Nov 2010 09:17:05 +0100
+
monetdb-sql (2.40.1-20101109) unstable; urgency=low
* Rebuilt.
diff -r aa35e0279381 -r 55b256dd5883 testing/MonetDB-testing.spec
--- a/testing/MonetDB-testing.spec Wed Nov 10 09:16:59 2010 +0100
+++ b/testing/MonetDB-testing.spec Wed Nov 10 10:19:54 2010 +0100
@@ -112,6 +112,9 @@
%{python_sitelib}/MonetDBtesting/subprocess26.py
%changelog
+* Wed Nov 10 2010 Sjoerd Mullender <[email protected]> - 1.40.1-20101110
+- Rebuilt.
+
* Tue Nov 09 2010 Sjoerd Mullender <[email protected]> - 1.40.1-20101109
- Rebuilt.
diff -r aa35e0279381 -r 55b256dd5883 testing/debian/changelog
--- a/testing/debian/changelog Wed Nov 10 09:16:59 2010 +0100
+++ b/testing/debian/changelog Wed Nov 10 10:19:54 2010 +0100
@@ -1,3 +1,9 @@
+monetdb-testing (1.40.1-20101110) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Wed, 10 Nov 2010 09:17:05 +0100
+
monetdb-testing (1.40.1-20101109) unstable; urgency=low
* Rebuilt.
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list