Changeset: c89203cffcff for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c89203cffcff
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 (244 lines):
diff -r 661916449461 -r c89203cffcff .hgtags
--- a/.hgtags Tue Nov 09 09:34:12 2010 +0100
+++ b/.hgtags Tue Nov 09 10:55:56 2010 +0100
@@ -428,3 +428,5 @@
ae12a56d3420aae3cf9928d4a7ddae30d3bf70be Oct2010_1
ae12a56d3420aae3cf9928d4a7ddae30d3bf70be Oct2010_1
5740074a9a9b6cc9919304f76a3a6924dde4768e Oct2010_1
+5740074a9a9b6cc9919304f76a3a6924dde4768e Oct2010_1
+49a13817f9ce7c7d75476f9cb37ab29b9a30a9c8 Oct2010_1
diff -r 661916449461 -r c89203cffcff MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Tue Nov 09 09:34:12 2010 +0100
+++ b/MonetDB/MonetDB.spec Tue Nov 09 10:55:56 2010 +0100
@@ -110,6 +110,9 @@
%{_libdir}/libbat.so
%changelog
+* Tue Nov 09 2010 Sjoerd Mullender <[email protected]> - 1.40.1-20101109
+- Rebuilt.
+
* Fri Nov 05 2010 Sjoerd Mullender <[email protected]> - 1.40.1-20101105
- Rebuilt.
diff -r 661916449461 -r c89203cffcff MonetDB/debian/changelog
--- a/MonetDB/debian/changelog Tue Nov 09 09:34:12 2010 +0100
+++ b/MonetDB/debian/changelog Tue Nov 09 10:55:56 2010 +0100
@@ -1,3 +1,9 @@
+monetdb (1.40.1-20101109) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Tue, 09 Nov 2010 09:34:16 +0100
+
monetdb (1.40.1-20101105) unstable; urgency=low
* Rebuilt.
diff -r 661916449461 -r c89203cffcff MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Tue Nov 09 09:34:12 2010 +0100
+++ b/MonetDB4/MonetDB-server.spec Tue Nov 09 10:55:56 2010 +0100
@@ -216,6 +216,9 @@
%{_libdir}/libembeddedmil.so
%changelog
+* Tue Nov 09 2010 Sjoerd Mullender <[email protected]> - 4.40.1-20101109
+- Rebuilt.
+
* Fri Nov 05 2010 Sjoerd Mullender <[email protected]> - 4.40.1-20101105
- Rebuilt.
diff -r 661916449461 -r c89203cffcff MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Tue Nov 09 09:34:12 2010 +0100
+++ b/MonetDB4/debian/changelog Tue Nov 09 10:55:56 2010 +0100
@@ -1,3 +1,9 @@
+monetdb4-server (4.40.1-20101109) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Tue, 09 Nov 2010 09:34:16 +0100
+
monetdb4-server (4.40.1-20101105) unstable; urgency=low
* Rebuilt.
diff -r 661916449461 -r c89203cffcff MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Tue Nov 09 09:34:12 2010 +0100
+++ b/MonetDB5/MonetDB-server.spec Tue Nov 09 10:55:56 2010 +0100
@@ -216,6 +216,9 @@
%{_libdir}/pkgconfig/monetdb-mal.pc
%changelog
+* Tue Nov 09 2010 Sjoerd Mullender <[email protected]> - 5.22.1-20101109
+- Rebuilt.
+
* Fri Nov 05 2010 Sjoerd Mullender <[email protected]> - 5.22.1-20101105
- Rebuilt.
diff -r 661916449461 -r c89203cffcff MonetDB5/debian/changelog
--- a/MonetDB5/debian/changelog Tue Nov 09 09:34:12 2010 +0100
+++ b/MonetDB5/debian/changelog Tue Nov 09 10:55:56 2010 +0100
@@ -1,3 +1,9 @@
+monetdb5-server (5.22.1-20101109) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Tue, 09 Nov 2010 09:34:16 +0100
+
monetdb5-server (5.22.1-20101105) unstable; urgency=low
* Rebuilt.
diff -r 661916449461 -r c89203cffcff clients/MonetDB-client.spec
--- a/clients/MonetDB-client.spec Tue Nov 09 09:34:12 2010 +0100
+++ b/clients/MonetDB-client.spec Tue Nov 09 10:55:56 2010 +0100
@@ -303,6 +303,9 @@
%{_libdir}/MonetDB/Tests/*
%changelog
+* Tue Nov 09 2010 Sjoerd Mullender <[email protected]> - 1.40.1-20101109
+- Rebuilt.
+
* Fri Nov 05 2010 Sjoerd Mullender <[email protected]> - 1.40.1-20101105
- Rebuilt.
diff -r 661916449461 -r c89203cffcff clients/debian/changelog
--- a/clients/debian/changelog Tue Nov 09 09:34:12 2010 +0100
+++ b/clients/debian/changelog Tue Nov 09 10:55:56 2010 +0100
@@ -1,3 +1,9 @@
+monetdb-client (1.40.1-20101109) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Tue, 09 Nov 2010 09:34:17 +0100
+
monetdb-client (1.40.1-20101105) unstable; urgency=low
* Rebuilt.
diff -r 661916449461 -r c89203cffcff geom/MonetDB-geom.spec
--- a/geom/MonetDB-geom.spec Tue Nov 09 09:34:12 2010 +0100
+++ b/geom/MonetDB-geom.spec Tue Nov 09 10:55:56 2010 +0100
@@ -172,6 +172,9 @@
%endif
%changelog
+* Tue Nov 09 2010 Sjoerd Mullender <[email protected]> - 0.20.1-20101109
+- Rebuilt.
+
* Fri Nov 05 2010 Sjoerd Mullender <[email protected]> - 0.20.1-20101105
- Rebuilt.
diff -r 661916449461 -r c89203cffcff geom/debian/changelog
--- a/geom/debian/changelog Tue Nov 09 09:34:12 2010 +0100
+++ b/geom/debian/changelog Tue Nov 09 10:55:56 2010 +0100
@@ -1,3 +1,9 @@
+monetdb-geom (0.20.1-20101109) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Tue, 09 Nov 2010 09:34:17 +0100
+
monetdb-geom (0.20.1-20101105) unstable; urgency=low
* Rebuilt.
diff -r 661916449461 -r c89203cffcff java/ChangeLog-Archive
--- a/java/ChangeLog-Archive Tue Nov 09 09:34:12 2010 +0100
+++ b/java/ChangeLog-Archive Tue Nov 09 10:55:56 2010 +0100
@@ -1,6 +1,11 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* 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
+ operating with the latest Java 1.6.
+
* Fri Oct 22 2010 Fabian Groffen <[email protected]> - 1.40.1-20101029
- Fix for bug #2703, allow to have multiple metadata ResultSets open at
the same time
diff -r 661916449461 -r c89203cffcff java/ChangeLog.Oct2010
--- a/java/ChangeLog.Oct2010 Tue Nov 09 09:34:12 2010 +0100
+++ b/java/ChangeLog.Oct2010 Tue Nov 09 10:55:56 2010 +0100
@@ -1,8 +1,3 @@
# ChangeLog file for java
# This file is updated with mchangelog (Gentoo echangelog bastard script)
-* Mon Nov 8 2010 Fabian Groffen <[email protected]>
-- 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
- operating with the latest Java 1.6.
-
diff -r 661916449461 -r c89203cffcff pathfinder/MonetDB-XQuery.spec
--- a/pathfinder/MonetDB-XQuery.spec Tue Nov 09 09:34:12 2010 +0100
+++ b/pathfinder/MonetDB-XQuery.spec Tue Nov 09 10:55:56 2010 +0100
@@ -155,6 +155,9 @@
%{_includedir}/pf_ferry.h
%changelog
+* Tue Nov 09 2010 Sjoerd Mullender <[email protected]> - 0.40.1-20101109
+- Rebuilt.
+
* Fri Nov 05 2010 Sjoerd Mullender <[email protected]> - 0.40.1-20101105
- Rebuilt.
diff -r 661916449461 -r c89203cffcff pathfinder/debian/changelog
--- a/pathfinder/debian/changelog Tue Nov 09 09:34:12 2010 +0100
+++ b/pathfinder/debian/changelog Tue Nov 09 10:55:56 2010 +0100
@@ -1,3 +1,9 @@
+monetdb-xquery (0.40.1-20101109) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Tue, 09 Nov 2010 09:34:17 +0100
+
monetdb-xquery (0.40.1-20101105) unstable; urgency=low
* Rebuilt.
diff -r 661916449461 -r c89203cffcff sql/MonetDB-SQL.spec
--- a/sql/MonetDB-SQL.spec Tue Nov 09 09:34:12 2010 +0100
+++ b/sql/MonetDB-SQL.spec Tue Nov 09 10:55:56 2010 +0100
@@ -159,6 +159,9 @@
%{_includedir}/MonetDB5/sql/*.h
%changelog
+* Tue Nov 09 2010 Sjoerd Mullender <[email protected]> - 2.40.1-20101109
+- Rebuilt.
+
* Fri Nov 05 2010 Sjoerd Mullender <[email protected]> - 2.40.1-20101105
- Rebuilt.
diff -r 661916449461 -r c89203cffcff sql/debian/changelog
--- a/sql/debian/changelog Tue Nov 09 09:34:12 2010 +0100
+++ b/sql/debian/changelog Tue Nov 09 10:55:56 2010 +0100
@@ -1,3 +1,9 @@
+monetdb-sql (2.40.1-20101109) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Tue, 09 Nov 2010 09:34:18 +0100
+
monetdb-sql (2.40.1-20101105) unstable; urgency=low
* Rebuilt.
diff -r 661916449461 -r c89203cffcff testing/MonetDB-testing.spec
--- a/testing/MonetDB-testing.spec Tue Nov 09 09:34:12 2010 +0100
+++ b/testing/MonetDB-testing.spec Tue Nov 09 10:55:56 2010 +0100
@@ -112,6 +112,9 @@
%{python_sitelib}/MonetDBtesting/subprocess26.py
%changelog
+* Tue Nov 09 2010 Sjoerd Mullender <[email protected]> - 1.40.1-20101109
+- Rebuilt.
+
* Fri Nov 05 2010 Sjoerd Mullender <[email protected]> - 1.40.1-20101105
- Rebuilt.
diff -r 661916449461 -r c89203cffcff testing/debian/changelog
--- a/testing/debian/changelog Tue Nov 09 09:34:12 2010 +0100
+++ b/testing/debian/changelog Tue Nov 09 10:55:56 2010 +0100
@@ -1,3 +1,9 @@
+monetdb-testing (1.40.1-20101109) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Tue, 09 Nov 2010 09:34:18 +0100
+
monetdb-testing (1.40.1-20101105) unstable; urgency=low
* Rebuilt.
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
