Changeset: 2355808f3ea0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2355808f3ea0
Modified Files:
        MonetDB.spec
        clients/ChangeLog-Archive
        clients/ChangeLog.Aug2011
        debian/changelog
        libversions
        tools/merovingian/ChangeLog-Archive
        tools/merovingian/ChangeLog.Aug2011
Branch: Aug2011
Log Message:

Moved contents of ChangeLog.Aug2011 to MonetDB.spec, debian/changelog and 
ChangeLog-Archive.


diffs (truncated from 307 to 300 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -27,7 +27,7 @@ Vendor: MonetDB BV <i...@monetdb.org>
 Group: Applications/Databases
 License: MPL - http://www.monetdb.org/Legal/MonetDBLicense
 URL: http://www.monetdb.org/
-Source: 
http://dev.monetdb.org/downloads/sources/Aug2011-SP1/%{name}-%{version}.tar.bz2
+Source: 
http://dev.monetdb.org/downloads/sources/Aug2011-SP2/%{name}-%{version}.tar.bz2
 
 BuildRequires: bison
 BuildRequires: bzip2-devel
@@ -618,6 +618,55 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Tue Oct 18 2011 Sjoerd Mullender <sjo...@acm.org> - 11.5.5-20111018
+- Rebuilt.
+
+* Mon Oct 17 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018
+- clients: Small improvement to mclient's table rendering for tables without
+  any rows.  Previously, the column names in the header could be
+  squeezed to very small widths, degrading readability.
+
+* Wed Oct 12 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018
+- clients: Python DB API connect() function now supports PEP 249-style 
arguments
+  user and host, bug #2901
+
+* Wed Oct 12 2011 Sjoerd Mullender <sjo...@acm.org> - 11.5.5-20111018
+- clients: mclient now checks the result of encoding conversions using the 
iconv
+  library.
+
+* Mon Oct 10 2011 Sjoerd Mullender <sjo...@acm.org> - 11.5.5-20111018
+- clients: Fixed a source of crashes in mclient when a query on the command 
line
+  using the -s option is combined with input on standard input (e.g. in
+  the construct mclient -s 'COPY INTO t FROM STDIN ...' < file.csv).
+
+* Sun Oct  9 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018
+- merovingian: Resolved problem where monetdbd would terminate abnormally when
+  databases named 'control', 'discovery' or 'merovingian' were stopped.
+
+* Fri Oct  7 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018
+- merovingian: monetdbd get status now also reports the version of the running 
monetdbd
+
+* Fri Oct  7 2011 Sjoerd Mullender <sjo...@acm.org> - 11.5.5-20111018
+- clients: Fixed bug 2897 where slow (network) reads could cause blocks to not
+  be fully read in one go, causing errors in the subsequent use of
+  those blocks.  With thanks to Rémy Chibois.
+
+* Thu Oct  6 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018
+- merovingian: Improved response time of 'monetdb start' when the database 
fails
+  to start.
+
+* Wed Oct  5 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018
+- merovingian: Fixed a bug in monetdbd where starting a failing database could
+  incorrectly be reported as a 'running but dead' database.
+
+* Fri Sep 30 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018
+- merovingian: To avoid confusion, all occurrences of merovingian were changed 
into
+  monetdbd for error messages sent to a client.
+
+* Tue Sep 27 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018
+- clients: Fixed a bug in mclient where processing queries from files could 
result
+  in ghost empty results to be reported in the output
+
 * Sun Sep 25 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.3-20110925
 - Rebuilt.
 
diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive
--- a/clients/ChangeLog-Archive
+++ b/clients/ChangeLog-Archive
@@ -1,6 +1,33 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Mon Oct 17 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018
+- Small improvement to mclient's table rendering for tables without
+  any rows.  Previously, the column names in the header could be
+  squeezed to very small widths, degrading readability.
+
+* Wed Oct 12 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018
+- Python DB API connect() function now supports PEP 249-style arguments
+  user and host, bug #2901
+
+* Wed Oct 12 2011 Sjoerd Mullender <sjo...@acm.org> - 11.5.5-20111018
+- mclient now checks the result of encoding conversions using the iconv
+  library.
+
+* Mon Oct 10 2011 Sjoerd Mullender <sjo...@acm.org> - 11.5.5-20111018
+- Fixed a source of crashes in mclient when a query on the command line
+  using the -s option is combined with input on standard input (e.g. in
+  the construct mclient -s 'COPY INTO t FROM STDIN ...' < file.csv).
+
+* Fri Oct  7 2011 Sjoerd Mullender <sjo...@acm.org> - 11.5.5-20111018
+- Fixed bug 2897 where slow (network) reads could cause blocks to not
+  be fully read in one go, causing errors in the subsequent use of
+  those blocks.  With thanks to Rémy Chibois.
+
+* Tue Sep 27 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018
+- Fixed a bug in mclient where processing queries from files could result
+  in ghost empty results to be reported in the output
+
 * Fri Sep 23 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.3-20110925
 - Fixed Perl DBD rowcount for larger results, bug #2889
 
diff --git a/clients/ChangeLog.Aug2011 b/clients/ChangeLog.Aug2011
--- a/clients/ChangeLog.Aug2011
+++ b/clients/ChangeLog.Aug2011
@@ -1,30 +1,3 @@
 # ChangeLog file for clients
 # This file is updated with Maddlog
 
-* Mon Oct 17 2011 Fabian Groffen <fab...@cwi.nl>
-- Small improvement to mclient's table rendering for tables without
-  any rows.  Previously, the column names in the header could be
-  squeezed to very small widths, degrading readability.
-
-* Wed Oct 12 2011 Fabian Groffen <fab...@cwi.nl>
-- Python DB API connect() function now supports PEP 249-style arguments
-  user and host, bug #2901
-
-* Wed Oct 12 2011 Sjoerd Mullender <sjo...@acm.org>
-- mclient now checks the result of encoding conversions using the iconv
-  library.
-
-* Mon Oct 10 2011 Sjoerd Mullender <sjo...@acm.org>
-- Fixed a source of crashes in mclient when a query on the command line
-  using the -s option is combined with input on standard input (e.g. in
-  the construct mclient -s 'COPY INTO t FROM STDIN ...' < file.csv).
-
-* Fri Oct  7 2011 Sjoerd Mullender <sjo...@acm.org>
-- Fixed bug 2897 where slow (network) reads could cause blocks to not
-  be fully read in one go, causing errors in the subsequent use of
-  those blocks.  With thanks to Rémy Chibois.
-
-* Tue Sep 27 2011 Fabian Groffen <fab...@cwi.nl>
-- Fixed a bug in mclient where processing queries from files could result
-  in ghost empty results to be reported in the output
-
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,88 @@
+monetdb (11.5.5-20111018) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 18 Oct 2011 09:33:46 +0200
+
+monetdb (11.5.5-20111018) unstable; urgency=low
+
+  * clients: Small improvement to mclient's table rendering for tables without
+    any rows.  Previously, the column names in the header could be
+    squeezed to very small widths, degrading readability.
+
+ -- Fabian Groffen <fab...@cwi.nl>  Mon, 17 Oct 2011 09:33:45 +0200
+
+monetdb (11.5.5-20111018) unstable; urgency=low
+
+  * clients: Python DB API connect() function now supports PEP 249-style 
arguments
+    user and host, bug #2901
+
+ -- Fabian Groffen <fab...@cwi.nl>  Wed, 12 Oct 2011 09:33:45 +0200
+
+monetdb (11.5.5-20111018) unstable; urgency=low
+
+  * clients: mclient now checks the result of encoding conversions using the 
iconv
+    library.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Wed, 12 Oct 2011 09:33:45 +0200
+
+monetdb (11.5.5-20111018) unstable; urgency=low
+
+  * clients: Fixed a source of crashes in mclient when a query on the command 
line
+    using the -s option is combined with input on standard input (e.g. in
+    the construct mclient -s 'COPY INTO t FROM STDIN ...' < file.csv).
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Mon, 10 Oct 2011 09:33:45 +0200
+
+monetdb (11.5.5-20111018) unstable; urgency=low
+
+  * merovingian: Resolved problem where monetdbd would terminate abnormally 
when
+    databases named 'control', 'discovery' or 'merovingian' were stopped.
+
+ -- Fabian Groffen <fab...@cwi.nl>  Sun, 9 Oct 2011 09:33:45 +0200
+
+monetdb (11.5.5-20111018) unstable; urgency=low
+
+  * merovingian: monetdbd get status now also reports the version of the 
running monetdbd
+
+ -- Fabian Groffen <fab...@cwi.nl>  Fri, 7 Oct 2011 09:33:45 +0200
+
+monetdb (11.5.5-20111018) unstable; urgency=low
+
+  * clients: Fixed bug 2897 where slow (network) reads could cause blocks to 
not
+    be fully read in one go, causing errors in the subsequent use of
+    those blocks.  With thanks to Rémy Chibois.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Fri, 7 Oct 2011 09:33:45 +0200
+
+monetdb (11.5.5-20111018) unstable; urgency=low
+
+  * merovingian: Improved response time of 'monetdb start' when the database 
fails
+    to start.
+
+ -- Fabian Groffen <fab...@cwi.nl>  Thu, 6 Oct 2011 09:33:45 +0200
+
+monetdb (11.5.5-20111018) unstable; urgency=low
+
+  * merovingian: Fixed a bug in monetdbd where starting a failing database 
could
+    incorrectly be reported as a 'running but dead' database.
+
+ -- Fabian Groffen <fab...@cwi.nl>  Wed, 5 Oct 2011 09:33:45 +0200
+
+monetdb (11.5.5-20111018) unstable; urgency=low
+
+  * merovingian: To avoid confusion, all occurrences of merovingian were 
changed into
+    monetdbd for error messages sent to a client.
+
+ -- Fabian Groffen <fab...@cwi.nl>  Fri, 30 Sep 2011 09:33:45 +0200
+
+monetdb (11.5.5-20111018) unstable; urgency=low
+
+  * clients: Fixed a bug in mclient where processing queries from files could 
result
+    in ghost empty results to be reported in the output
+
+ -- Fabian Groffen <fab...@cwi.nl>  Tue, 27 Sep 2011 09:33:45 +0200
+
 monetdb (11.5.3-20110925) unstable; urgency=low
 
   * Rebuilt.
diff --git a/libversions b/libversions
--- a/libversions
+++ b/libversions
@@ -32,14 +32,13 @@
 
 # version of the GDK library (subdirectory gdk; also includes
 # common/options and common/mutils)
-GDK_VERSION=4:1:0
+GDK_VERSION=4:2:0
 
 # version of the MAPI library (subdirectory clients/mapilib)
-MAPI_VERSION=4:0:1
+MAPI_VERSION=4:1:1
 
 # version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-# 26cb61b1604b: NEW
-MONETDB5_VERSION=8:1:0
+MONETDB5_VERSION=9:0:1
 
 # version of the STREAM library (subdirectory common/stream)
 STREAM_VERSION=2:2:0
diff --git a/tools/merovingian/ChangeLog-Archive 
b/tools/merovingian/ChangeLog-Archive
--- a/tools/merovingian/ChangeLog-Archive
+++ b/tools/merovingian/ChangeLog-Archive
@@ -1,6 +1,25 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Sun Oct  9 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018
+- Resolved problem where monetdbd would terminate abnormally when
+  databases named 'control', 'discovery' or 'merovingian' were stopped.
+
+* Fri Oct  7 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018
+- monetdbd get status now also reports the version of the running monetdbd
+
+* Thu Oct  6 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018
+- Improved response time of 'monetdb start' when the database fails
+  to start.
+
+* Wed Oct  5 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018
+- Fixed a bug in monetdbd where starting a failing database could
+  incorrectly be reported as a 'running but dead' database.
+
+* Fri Sep 30 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018
+- To avoid confusion, all occurrences of merovingian were changed into
+  monetdbd for error messages sent to a client.
+
 * Tue Aug 23 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.1-20110907
 - Fixed confusing 'Success' error message for monetdb commands where an
   invalid hostname was given
diff --git a/tools/merovingian/ChangeLog.Aug2011 
b/tools/merovingian/ChangeLog.Aug2011
--- a/tools/merovingian/ChangeLog.Aug2011
+++ b/tools/merovingian/ChangeLog.Aug2011
@@ -1,22 +1,3 @@
 # ChangeLog file for sql/src/backends/monet5/merovingian
 # This file is updated with mchangelog
 
-* Sun Oct  9 2011 Fabian Groffen <fab...@cwi.nl>
-- Resolved problem where monetdbd would terminate abnormally when
-  databases named 'control', 'discovery' or 'merovingian' were stopped.
-
-* Fri Oct  7 2011 Fabian Groffen <fab...@cwi.nl>
-- monetdbd get status now also reports the version of the running monetdbd
-
-* Thu Oct  6 2011 Fabian Groffen <fab...@cwi.nl>
-- Improved response time of 'monetdb start' when the database fails
-  to start.
-
-* Wed Oct  5 2011 Fabian Groffen <fab...@cwi.nl>
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to