Changeset: 817fdd257b06 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=817fdd257b06
Modified Files:
        MonetDB.spec
Branch: default
Log Message:

Merge with Apr2011 branch.


diffs (192 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -441,3 +441,5 @@
 568733c4fc9fc0275d4b264fa188df6c70ede9cf Apr2011_1
 568733c4fc9fc0275d4b264fa188df6c70ede9cf Apr2011_1
 ff43c1f6f50cf795cf12b9336f74fd86686a5fd6 Apr2011_1
+1833949cae477d8f1efde8caea6608c04f67ad6d Apr2011_3
+c8a6189f95ae3d7cfb8d14f3b002c1077a4c437c Apr2011_SP1_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -27,7 +27,7 @@
 Group: Applications/Databases
 License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
 URL: http://monetdb.cwi.nl/
-Source: 
http://dev.monetdb.org/downloads/sources/Apr2011/%{name}-%{version}.tar.bz2
+Source: 
http://dev.monetdb.org/downloads/sources/Apr2011-SP1/%{name}-%{version}.tar.bz2
 
 BuildRequires: bison
 BuildRequires: bzip2-devel
@@ -577,6 +577,26 @@
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Tue May 17 2011 Sjoerd Mullender <[email protected]> - 11.3.3-20110517
+- Rebuilt.
+
+* Fri May 13 2011 Sjoerd Mullender <[email protected]> - 11.3.3-20110517
+- gdk: Fixed a bug where large files (> 2GB) didn't always get deleted on
+Windows.
+
+* Wed May 11 2011 Fabian Groffen <[email protected]> - 11.3.3-20110517
+- java: Insertion via PreparedStatement and retrieval via ResultSet of 
timestamp
+and time fields with and without timezones was improved to better
+respect timezones, as partly indicated in bug #2781.
+
+* Wed May 11 2011 Sjoerd Mullender <[email protected]> - 11.3.3-20110517
+- monetdb5: Fixed a bug in conversion from string to the URL type.  The bug was
+an incorrect call to free().
+
+* Wed Apr 27 2011 Sjoerd Mullender <[email protected]> - 11.3.3-20110517
+- geom: Fixed various problems so that now all our tests work correctly on
+all our testing platforms.
+
 * Thu Apr 21 2011 Sjoerd Mullender <[email protected]> - 11.3.1-20110421
 - Rebuilt.
 
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,38 @@
+monetdb (11.3.3-20110517) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]>  Tue, 17 May 2011 16:45:39 +0200
+
+monetdb (11.3.3-20110517) unstable; urgency=low
+
+  * gdk: Fixed a bug where large files (> 2GB) didn't always get deleted on
+Windows.
+
+ -- Sjoerd Mullender <[email protected]>  Fri, 13 May 2011 16:45:38 +0200
+
+monetdb (11.3.3-20110517) unstable; urgency=low
+
+  * java: Insertion via PreparedStatement and retrieval via ResultSet of 
timestamp
+and time fields with and without timezones was improved to better
+respect timezones, as partly indicated in bug #2781.
+
+ -- Fabian Groffen <[email protected]>  Wed, 11 May 2011 16:45:38 +0200
+
+monetdb (11.3.3-20110517) unstable; urgency=low
+
+  * monetdb5: Fixed a bug in conversion from string to the URL type.  The bug 
was
+an incorrect call to free().
+
+ -- Sjoerd Mullender <[email protected]>  Wed, 11 May 2011 16:45:38 +0200
+
+monetdb (11.3.3-20110517) unstable; urgency=low
+
+  * geom: Fixed various problems so that now all our tests work correctly on
+all our testing platforms.
+
+ -- Sjoerd Mullender <[email protected]>  Wed, 27 Apr 2011 16:45:38 +0200
+
 monetdb (11.3.1-20110421) unstable; urgency=low
 
   * Rebuilt.
diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive
--- a/gdk/ChangeLog-Archive
+++ b/gdk/ChangeLog-Archive
@@ -1,6 +1,10 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Fri May 13 2011 Sjoerd Mullender <[email protected]> - 11.3.3-20110517
+- Fixed a bug where large files (> 2GB) didn't always get deleted on
+  Windows.
+
 * Thu Apr 14 2011 Sjoerd Mullender <[email protected]> - 11.3.1-20110414
 - Fixed bugs in antiselect which gave the incorrect result when upper
   and lower bound were equal.  This bug could be triggered by the SQL
diff --git a/gdk/ChangeLog.Apr2011 b/gdk/ChangeLog.Apr2011
--- a/gdk/ChangeLog.Apr2011
+++ b/gdk/ChangeLog.Apr2011
@@ -1,7 +1,3 @@
 # ChangeLog file for MonetDB
 # This file is updated with Maddlog
 
-* Fri May 13 2011 Sjoerd Mullender <[email protected]>
-- Fixed a bug where large files (> 2GB) didn't always get deleted on
-  Windows.
-
diff --git a/geom/ChangeLog-Archive b/geom/ChangeLog-Archive
--- a/geom/ChangeLog-Archive
+++ b/geom/ChangeLog-Archive
@@ -1,6 +1,10 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Wed Apr 27 2011 Sjoerd Mullender <[email protected]> - 11.3.3-20110517
+- Fixed various problems so that now all our tests work correctly on
+  all our testing platforms.
+
 * Tue Mar 15 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317
 - Set endianness for wkb en/decoding.
 
diff --git a/geom/ChangeLog.Apr2011 b/geom/ChangeLog.Apr2011
--- a/geom/ChangeLog.Apr2011
+++ b/geom/ChangeLog.Apr2011
@@ -1,7 +1,3 @@
 # ChangeLog file for geom
 # This file is updated with Maddlog
 
-* Wed Apr 27 2011 Sjoerd Mullender <[email protected]>
-- Fixed various problems so that now all our tests work correctly on
-  all our testing platforms.
-
diff --git a/java/ChangeLog-Archive b/java/ChangeLog-Archive
--- a/java/ChangeLog-Archive
+++ b/java/ChangeLog-Archive
@@ -1,6 +1,11 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Wed May 11 2011 Fabian Groffen <[email protected]> - 11.3.3-20110517
+- Insertion via PreparedStatement and retrieval via ResultSet of timestamp
+  and time fields with and without timezones was improved to better
+  respect timezones, as partly indicated in bug #2781.
+
 * Tue Apr  5 2011 Fabian Groffen <[email protected]> - 11.3.1-20110414
 - clarify exception messages for unsupported methods
 
diff --git a/java/ChangeLog.Apr2011 b/java/ChangeLog.Apr2011
--- a/java/ChangeLog.Apr2011
+++ b/java/ChangeLog.Apr2011
@@ -1,8 +1,3 @@
 # ChangeLog file for java
 # This file is updated with Maddlog
 
-* Wed May 11 2011 Fabian Groffen <[email protected]>
-- Insertion via PreparedStatement and retrieval via ResultSet of timestamp
-  and time fields with and without timezones was improved to better
-  respect timezones, as partly indicated in bug #2781.
-
diff --git a/monetdb5/ChangeLog-Archive b/monetdb5/ChangeLog-Archive
--- a/monetdb5/ChangeLog-Archive
+++ b/monetdb5/ChangeLog-Archive
@@ -1,6 +1,10 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Wed May 11 2011 Sjoerd Mullender <[email protected]> - 11.3.3-20110517
+- Fixed a bug in conversion from string to the URL type.  The bug was
+  an incorrect call to free().
+
 * Thu Feb  3 2011 Fabian Groffen <[email protected]> - 11.3.1-20110414
 - mserver5 no longer reads monetdb5.conf upon startup by default.
   Use --config=file to have mserver5 read a configuration on startup
diff --git a/monetdb5/ChangeLog.Apr2011 b/monetdb5/ChangeLog.Apr2011
--- a/monetdb5/ChangeLog.Apr2011
+++ b/monetdb5/ChangeLog.Apr2011
@@ -1,7 +1,3 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
-* Wed May 11 2011 Sjoerd Mullender <[email protected]>
-- Fixed a bug in conversion from string to the URL type.  The bug was
-  an incorrect call to free().
-
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to