Changeset: 720299d37a72 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=720299d37a72
Modified Files:
        MonetDB/MonetDB.spec
        MonetDB4/MonetDB-server.spec
        MonetDB5/MonetDB-server.spec
        buildtools/conf/MonetDB.m4
        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/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 (298 lines):

diff -r e3a7325c15e4 -r 720299d37a72 .hgtags
--- a/.hgtags   Tue Aug 24 09:28:58 2010 +0200
+++ b/.hgtags   Tue Aug 24 10:40:44 2010 +0200
@@ -422,3 +422,5 @@
 9aa479df22dda265b8c685f9e15b0899244b0184 Jun2010_3
 a6dd584e5bee4d0ec428e6aade193c263c55cdb3 Jun2010_3
 19ede2d368c6cba18d6b67cd8bde9d51af2ac9f8 Jun2010_5
+19ede2d368c6cba18d6b67cd8bde9d51af2ac9f8 Jun2010_5
+931928c216bc600a35580fa19f73daac66bd3571 Jun2010_5
diff -r e3a7325c15e4 -r 720299d37a72 MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec      Tue Aug 24 09:28:58 2010 +0200
+++ b/MonetDB/MonetDB.spec      Tue Aug 24 10:40:44 2010 +0200
@@ -106,6 +106,9 @@
 %{_libdir}/libbat.so
 
 %changelog
+* Tue Aug 24 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.5-20100824
+- Rebuilt.
+
 * Mon Aug 23 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.5-20100823
 - Rebuilt.
 
diff -r e3a7325c15e4 -r 720299d37a72 MonetDB/debian/changelog
--- a/MonetDB/debian/changelog  Tue Aug 24 09:28:58 2010 +0200
+++ b/MonetDB/debian/changelog  Tue Aug 24 10:40:44 2010 +0200
@@ -1,3 +1,9 @@
+monetdb (1.38.5-20100824) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 24 Aug 2010 09:30:18 +0200
+
 monetdb (1.38.5-20100823) unstable; urgency=low
 
   * Rebuilt.
diff -r e3a7325c15e4 -r 720299d37a72 MonetDB4/ChangeLog-Archive
--- a/MonetDB4/ChangeLog-Archive        Tue Aug 24 09:28:58 2010 +0200
+++ b/MonetDB4/ChangeLog-Archive        Tue Aug 24 10:40:44 2010 +0200
@@ -1,6 +1,10 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Tue Aug 24 2010 Sjoerd Mullender <sjo...@acm.org> - 4.38.5-20100824
+- Fixed a crash when calculating certain aggregates on platforms where
+  non-aligned data access is not allowed (e.g. Sparc).
+
 * Thu Jul 22 2010 Sjoerd Mullender <sjo...@acm.org> - 4.38.5-20100823
 - Slight change to Fedora, Debian, Ubuntu installers: the database
   directory now has the group setuid bit set so that new databases
diff -r e3a7325c15e4 -r 720299d37a72 MonetDB4/ChangeLog.Jun2010
--- a/MonetDB4/ChangeLog.Jun2010        Tue Aug 24 09:28:58 2010 +0200
+++ b/MonetDB4/ChangeLog.Jun2010        Tue Aug 24 10:40:44 2010 +0200
@@ -1,7 +1,3 @@
 # ChangeLog file for MonetDB4
 # This file is updated with Maddlog
 
-* Tue Aug 24 2010 Sjoerd Mullender <sjo...@acm.org>
-- Fixed a crash when calculating certain aggregates on platforms where
-  non-aligned data access is not allowed (e.g. Sparc).
-
diff -r e3a7325c15e4 -r 720299d37a72 MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec      Tue Aug 24 09:28:58 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec      Tue Aug 24 10:40:44 2010 +0200
@@ -217,6 +217,13 @@
 %{_libdir}/libembeddedmil.so
 
 %changelog
+* Tue Aug 24 2010 Sjoerd Mullender <sjo...@acm.org> - 4.38.5-20100824
+- Rebuilt.
+
+* Tue Aug 24 2010 Sjoerd Mullender <sjo...@acm.org> - 4.38.5-20100824
+- Fixed a crash when calculating certain aggregates on platforms where
+  non-aligned data access is not allowed (e.g. Sparc).
+
 * Mon Aug 23 2010 Sjoerd Mullender <sjo...@acm.org> - 4.38.5-20100823
 - Rebuilt.
 
diff -r e3a7325c15e4 -r 720299d37a72 MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Tue Aug 24 09:28:58 2010 +0200
+++ b/MonetDB4/debian/changelog Tue Aug 24 10:40:44 2010 +0200
@@ -1,3 +1,16 @@
+monetdb4-server (4.38.5-20100824) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 24 Aug 2010 09:30:18 +0200
+
+monetdb4-server (4.38.5-20100824) unstable; urgency=low
+
+  * Fixed a crash when calculating certain aggregates on platforms where
+    non-aligned data access is not allowed (e.g. Sparc).
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 24 Aug 2010 09:30:18 +0200
+
 monetdb4-server (4.38.5-20100823) unstable; urgency=low
 
   * Rebuilt.
diff -r e3a7325c15e4 -r 720299d37a72 MonetDB5/ChangeLog-Archive
--- a/MonetDB5/ChangeLog-Archive        Tue Aug 24 09:28:58 2010 +0200
+++ b/MonetDB5/ChangeLog-Archive        Tue Aug 24 10:40:44 2010 +0200
@@ -1,6 +1,10 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Tue Aug 24 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.5-20100824
+- Fixed a crash when calculating certain aggregates on platforms where
+  non-aligned data access is not allowed (e.g. Sparc).
+
 * Fri Aug 20 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.5-20100823
 - A bug was fixed where on 32 bit systems (or 64 bit systems using 32 bit
   OIDs), values where sometimes written as 32 bits but read as 64 bits.
diff -r e3a7325c15e4 -r 720299d37a72 MonetDB5/ChangeLog.Jun2010
--- a/MonetDB5/ChangeLog.Jun2010        Tue Aug 24 09:28:58 2010 +0200
+++ b/MonetDB5/ChangeLog.Jun2010        Tue Aug 24 10:40:44 2010 +0200
@@ -1,7 +1,3 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
-* Tue Aug 24 2010 Sjoerd Mullender <sjo...@acm.org>
-- Fixed a crash when calculating certain aggregates on platforms where
-  non-aligned data access is not allowed (e.g. Sparc).
-
diff -r e3a7325c15e4 -r 720299d37a72 MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec      Tue Aug 24 09:28:58 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec      Tue Aug 24 10:40:44 2010 +0200
@@ -214,6 +214,13 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Aug 24 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.5-20100824
+- Rebuilt.
+
+* Tue Aug 24 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.5-20100824
+- Fixed a crash when calculating certain aggregates on platforms where
+  non-aligned data access is not allowed (e.g. Sparc).
+
 * Mon Aug 23 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.5-20100823
 - Rebuilt.
 
diff -r e3a7325c15e4 -r 720299d37a72 MonetDB5/debian/changelog
--- a/MonetDB5/debian/changelog Tue Aug 24 09:28:58 2010 +0200
+++ b/MonetDB5/debian/changelog Tue Aug 24 10:40:44 2010 +0200
@@ -1,3 +1,16 @@
+monetdb5-server (5.20.5-20100824) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 24 Aug 2010 09:30:18 +0200
+
+monetdb5-server (5.20.5-20100824) unstable; urgency=low
+
+  * Fixed a crash when calculating certain aggregates on platforms where
+    non-aligned data access is not allowed (e.g. Sparc).
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 24 Aug 2010 09:30:18 +0200
+
 monetdb5-server (5.20.5-20100823) unstable; urgency=low
 
   * Rebuilt.
diff -r e3a7325c15e4 -r 720299d37a72 clients/MonetDB-client.spec
--- a/clients/MonetDB-client.spec       Tue Aug 24 09:28:58 2010 +0200
+++ b/clients/MonetDB-client.spec       Tue Aug 24 10:40:44 2010 +0200
@@ -301,6 +301,9 @@
 %{_libdir}/MonetDB/Tests/*
 
 %changelog
+* Tue Aug 24 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.5-20100824
+- Rebuilt.
+
 * Mon Aug 23 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.5-20100823
 - Rebuilt.
 
diff -r e3a7325c15e4 -r 720299d37a72 clients/debian/changelog
--- a/clients/debian/changelog  Tue Aug 24 09:28:58 2010 +0200
+++ b/clients/debian/changelog  Tue Aug 24 10:40:44 2010 +0200
@@ -1,3 +1,9 @@
+monetdb-client (1.38.5-20100824) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 24 Aug 2010 09:30:19 +0200
+
 monetdb-client (1.38.5-20100823) unstable; urgency=low
 
   * Rebuilt.
diff -r e3a7325c15e4 -r 720299d37a72 geom/MonetDB-geom.spec
--- a/geom/MonetDB-geom.spec    Tue Aug 24 09:28:58 2010 +0200
+++ b/geom/MonetDB-geom.spec    Tue Aug 24 10:40:44 2010 +0200
@@ -172,6 +172,9 @@
 %endif
 
 %changelog
+* Tue Aug 24 2010 Sjoerd Mullender <sjo...@acm.org> - 0.18.5-20100824
+- Rebuilt.
+
 * Mon Aug 23 2010 Sjoerd Mullender <sjo...@acm.org> - 0.18.5-20100823
 - Rebuilt.
 
diff -r e3a7325c15e4 -r 720299d37a72 geom/debian/changelog
--- a/geom/debian/changelog     Tue Aug 24 09:28:58 2010 +0200
+++ b/geom/debian/changelog     Tue Aug 24 10:40:44 2010 +0200
@@ -1,3 +1,9 @@
+monetdb-geom (0.18.5-20100824) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 24 Aug 2010 09:30:19 +0200
+
 monetdb-geom (0.18.5-20100823) unstable; urgency=low
 
   * Rebuilt.
diff -r e3a7325c15e4 -r 720299d37a72 pathfinder/MonetDB-XQuery.spec
--- a/pathfinder/MonetDB-XQuery.spec    Tue Aug 24 09:28:58 2010 +0200
+++ b/pathfinder/MonetDB-XQuery.spec    Tue Aug 24 10:40:44 2010 +0200
@@ -138,6 +138,9 @@
 %{_bindir}/monetdb-xquery-config
 
 %changelog
+* Tue Aug 24 2010 Sjoerd Mullender <sjo...@acm.org> - 0.38.5-20100824
+- Rebuilt.
+
 * Mon Aug 23 2010 Sjoerd Mullender <sjo...@acm.org> - 0.38.5-20100823
 - Rebuilt.
 
diff -r e3a7325c15e4 -r 720299d37a72 pathfinder/debian/changelog
--- a/pathfinder/debian/changelog       Tue Aug 24 09:28:58 2010 +0200
+++ b/pathfinder/debian/changelog       Tue Aug 24 10:40:44 2010 +0200
@@ -1,3 +1,9 @@
+monetdb-xquery (0.38.5-20100824) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 24 Aug 2010 09:30:19 +0200
+
 monetdb-xquery (0.38.5-20100823) unstable; urgency=low
 
   * Rebuilt.
diff -r e3a7325c15e4 -r 720299d37a72 sql/MonetDB-SQL.spec
--- a/sql/MonetDB-SQL.spec      Tue Aug 24 09:28:58 2010 +0200
+++ b/sql/MonetDB-SQL.spec      Tue Aug 24 10:40:44 2010 +0200
@@ -157,6 +157,9 @@
 %{_libdir}/libembeddedsql5.so
 
 %changelog
+* Tue Aug 24 2010 Sjoerd Mullender <sjo...@acm.org> - 2.38.5-20100824
+- Rebuilt.
+
 * Mon Aug 23 2010 Sjoerd Mullender <sjo...@acm.org> - 2.38.5-20100823
 - Rebuilt.
 
diff -r e3a7325c15e4 -r 720299d37a72 sql/debian/changelog
--- a/sql/debian/changelog      Tue Aug 24 09:28:58 2010 +0200
+++ b/sql/debian/changelog      Tue Aug 24 10:40:44 2010 +0200
@@ -1,3 +1,9 @@
+monetdb-sql (2.38.5-20100824) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 24 Aug 2010 09:30:20 +0200
+
 monetdb-sql (2.38.5-20100823) unstable; urgency=low
 
   * Rebuilt.
diff -r e3a7325c15e4 -r 720299d37a72 testing/MonetDB-testing.spec
--- a/testing/MonetDB-testing.spec      Tue Aug 24 09:28:58 2010 +0200
+++ b/testing/MonetDB-testing.spec      Tue Aug 24 10:40:44 2010 +0200
@@ -112,6 +112,12 @@
 %{python_sitelib}/MonetDBtesting/subprocess26.py
 
 %changelog
+* Tue Aug 24 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.5-20100824
+- Rebuilt.
+
+* Tue Aug 24 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.5-20100824
+- Rebuilt.
+
 * Mon Aug 23 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.5-20100823
 - Rebuilt.
 
diff -r e3a7325c15e4 -r 720299d37a72 testing/debian/changelog
--- a/testing/debian/changelog  Tue Aug 24 09:28:58 2010 +0200
+++ b/testing/debian/changelog  Tue Aug 24 10:40:44 2010 +0200
@@ -1,3 +1,15 @@
+monetdb-testing (1.38.5-20100824) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 24 Aug 2010 09:30:21 +0200
+
+monetdb-testing (1.38.5-20100824) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 24 Aug 2010 09:30:20 +0200
+
 monetdb-testing (1.38.5-20100823) unstable; urgency=low
 
   * Rebuilt.
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to