Changeset: 4702495ed780 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4702495ed780
Removed Files:
        buildtools/ChangeLog.Dec2011
        clients/ChangeLog.Dec2011
        gdk/ChangeLog.Dec2011
        geom/ChangeLog.Dec2011
        java/ChangeLog.Dec2011
        monetdb5/ChangeLog.Dec2011
        sql/ChangeLog.Dec2011
        testing/ChangeLog.Dec2011
        tools/merovingian/ChangeLog.Dec2011
Modified Files:
        MonetDB.spec
        clients/ChangeLog-Archive
        clients/ChangeLog.Apr2012
        debian/changelog
        gdk/ChangeLog-Archive
        gdk/ChangeLog.Apr2012
        java/ChangeLog-Archive
        java/ChangeLog.Apr2012
        libversions
        monetdb5/ChangeLog-Archive
        monetdb5/ChangeLog.Apr2012
        tools/merovingian/ChangeLog-Archive
        tools/merovingian/ChangeLog.Apr2012
Branch: Apr2012
Log Message:

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


diffs (truncated from 335 to 300 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -27,7 +27,7 @@ Vendor: MonetDB BV <[email protected]>
 Group: Applications/Databases
 License: MPL - http://www.monetdb.org/Legal/MonetDBLicense
 URL: http://www.monetdb.org/
-Source: 
http://dev.monetdb.org/downloads/sources/Dec2011-SP2/%{name}-%{version}.tar.bz2
+Source: 
http://dev.monetdb.org/downloads/sources/Apr2012/%{name}-%{version}.tar.bz2
 
 BuildRequires: bison
 BuildRequires: bzip2-devel
@@ -629,6 +629,35 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Wed Apr 18 2012 Sjoerd Mullender <[email protected]> - 11.9.1-20120418
+- Rebuilt.
+
+* Mon Mar 12 2012 Fabian Groffen <[email protected]> - 11.9.1-20120418
+- merovingian: The logfile and pidfile monetdbd properties are now displayed 
with
+  dbfarm path when relative
+
+* Mon Mar 12 2012 Sjoerd Mullender <[email protected]> - 11.9.1-20120418
+- clients: ODBC: Implemented the SQL_ATTR_CONNECTION_TIMEOUT attribute.
+
+* Mon Mar 12 2012 Sjoerd Mullender <[email protected]> - 11.9.1-20120418
+- clients: mclient now has a -a (--autocommit) option to turn off autocommit 
mode.
+
+* Mon Mar 12 2012 Wouter Alink <[email protected]> - 11.9.1-20120418
+- java: Password reading by JdbcClient no longer results in strange artifacts
+- java: JdbcClient now returns exit code 1 in case of failures
+
+* Mon Mar 12 2012 Sjoerd Mullender <[email protected]> - 11.9.1-20120418
+- gdk: The type "chr" has been removed.
+  chr has long been superseded by bte for 1 byte arithmetic plus it is
+  pretty useless to hold single characters since we use Unicode and
+  thus only a tiny subset of the supported character set would fit.
+
+* Mon Mar 12 2012 Sjoerd Mullender <[email protected]> - 11.9.1-20120418
+- monetdb5: The type "chr" has been removed.
+  chr has long been superseded by bte for 1 byte arithmetic plus it is
+  pretty useless to hold single characters since we use Unicode and
+  thus only a tiny subset of the supported character set would fit.
+
 * Mon Mar 12 2012 Fabian Groffen <[email protected]> - 11.7.9-20120312
 - Rebuilt.
 
diff --git a/buildtools/ChangeLog.Dec2011 b/buildtools/ChangeLog.Dec2011
deleted file mode 100644
--- a/buildtools/ChangeLog.Dec2011
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for buildtools
-# This file is updated with Maddlog
-
diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive
--- a/clients/ChangeLog-Archive
+++ b/clients/ChangeLog-Archive
@@ -1,6 +1,12 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Fri Mar  9 2012 Sjoerd Mullender <[email protected]> - 11.9.1-20120418
+- ODBC: Implemented the SQL_ATTR_CONNECTION_TIMEOUT attribute.
+
+* Tue Mar  6 2012 Sjoerd Mullender <[email protected]> - 11.9.1-20120418
+- mclient now has a -a (--autocommit) option to turn off autocommit mode.
+
 * Wed Dec  7 2011 Fabian Groffen <[email protected]> - 11.7.1-20120111
 - Fix making connections with stethoscope to hosts without monetdbd.
   Bug #2944.
diff --git a/clients/ChangeLog.Apr2012 b/clients/ChangeLog.Apr2012
--- a/clients/ChangeLog.Apr2012
+++ b/clients/ChangeLog.Apr2012
@@ -1,9 +1,3 @@
 # ChangeLog file for clients
 # This file is updated with Maddlog
 
-* Fri Mar  9 2012 Sjoerd Mullender <[email protected]>
-- ODBC: Implemented the SQL_ATTR_CONNECTION_TIMEOUT attribute.
-
-* Tue Mar  6 2012 Sjoerd Mullender <[email protected]>
-- mclient now has a -a (--autocommit) option to turn off autocommit mode.
-
diff --git a/clients/ChangeLog.Dec2011 b/clients/ChangeLog.Dec2011
deleted file mode 100644
--- a/clients/ChangeLog.Dec2011
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for clients
-# This file is updated with Maddlog
-
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,53 @@
+monetdb (11.9.1-20120418) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]>  Wed, 18 Apr 2012 09:48:42 +0200
+
+monetdb (11.9.1-20120418) unstable; urgency=low
+
+  * merovingian: The logfile and pidfile monetdbd properties are now displayed 
with
+    dbfarm path when relative
+
+ -- Fabian Groffen <[email protected]>  Mon, 12 Mar 2012 09:48:40 +0200
+
+monetdb (11.9.1-20120418) unstable; urgency=low
+
+  * clients: ODBC: Implemented the SQL_ATTR_CONNECTION_TIMEOUT attribute.
+
+ -- Sjoerd Mullender <[email protected]>  Mon, 12 Mar 2012 09:48:40 +0200
+
+monetdb (11.9.1-20120418) unstable; urgency=low
+
+  * clients: mclient now has a -a (--autocommit) option to turn off autocommit 
mode.
+
+ -- Sjoerd Mullender <[email protected]>  Mon, 12 Mar 2012 09:48:40 +0200
+
+monetdb (11.9.1-20120418) unstable; urgency=low
+
+  * java: Password reading by JdbcClient no longer results in strange artifacts
+  * java: JdbcClient now returns exit code 1 in case of failures
+
+ -- Wouter Alink <[email protected]>  Mon, 12 Mar 2012 09:48:40 +0200
+
+monetdb (11.9.1-20120418) unstable; urgency=low
+
+  * gdk: The type "chr" has been removed.
+    chr has long been superseded by bte for 1 byte arithmetic plus it is
+    pretty useless to hold single characters since we use Unicode and
+    thus only a tiny subset of the supported character set would fit.
+
+ -- Sjoerd Mullender <[email protected]>  Mon, 12 Mar 2012 09:48:40 +0200
+
+monetdb (11.9.1-20120418) unstable; urgency=low
+
+  * monetdb5: The type "chr" has been removed.
+    chr has long been superseded by bte for 1 byte arithmetic plus it is
+    pretty useless to hold single characters since we use Unicode and
+    thus only a tiny subset of the supported character set would fit.
+
+ -- Sjoerd Mullender <[email protected]>  Mon, 12 Mar 2012 09:48:40 +0200
+
 monetdb (11.7.9-20120312) 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,12 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Tue Feb  7 2012 Sjoerd Mullender <[email protected]> - 11.9.1-20120418
+- The type "chr" has been removed.
+  chr has long been superseded by bte for 1 byte arithmetic plus it is
+  pretty useless to hold single characters since we use Unicode and
+  thus only a tiny subset of the supported character set would fit.
+
 * Tue Dec  6 2011 Fabian Groffen <[email protected]> - 11.7.1-20120111
 - Fixed memory detection on 32-bits Solaris systems with more memory
   than can be addressed in 32-bits mode, bug #2935
diff --git a/gdk/ChangeLog.Apr2012 b/gdk/ChangeLog.Apr2012
--- a/gdk/ChangeLog.Apr2012
+++ b/gdk/ChangeLog.Apr2012
@@ -1,9 +1,3 @@
 # ChangeLog file for MonetDB
 # This file is updated with Maddlog
 
-* Tue Feb  7 2012 Sjoerd Mullender <[email protected]>
-- The type "chr" has been removed.
-  chr has long been superseded by bte for 1 byte arithmetic plus it is
-  pretty useless to hold single characters since we use Unicode and
-  thus only a tiny subset of the supported character set would fit.
-
diff --git a/gdk/ChangeLog.Dec2011 b/gdk/ChangeLog.Dec2011
deleted file mode 100644
--- a/gdk/ChangeLog.Dec2011
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for MonetDB
-# This file is updated with Maddlog
-
diff --git a/geom/ChangeLog.Dec2011 b/geom/ChangeLog.Dec2011
deleted file mode 100644
--- a/geom/ChangeLog.Dec2011
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for geom
-# This file is updated with Maddlog
-
diff --git a/java/ChangeLog-Archive b/java/ChangeLog-Archive
--- a/java/ChangeLog-Archive
+++ b/java/ChangeLog-Archive
@@ -1,6 +1,10 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Fri Mar  2 2012 Wouter Alink <[email protected]> - 11.9.1-20120418
+- Password reading by JdbcClient no longer results in strange artifacts
+- JdbcClient now returns exit code 1 in case of failures
+
 * Tue Feb 28 2012 Fabian Groffen <[email protected]> - 11.7.9-20120312
 - Implemented missing Number types support in
   PreparedStatement.setObject()
diff --git a/java/ChangeLog.Apr2012 b/java/ChangeLog.Apr2012
--- a/java/ChangeLog.Apr2012
+++ b/java/ChangeLog.Apr2012
@@ -1,7 +1,3 @@
 # ChangeLog file for java
 # This file is updated with Maddlog
 
-* Fri Mar  2 2012 Wouter Alink <[email protected]>
-- Password reading by JdbcClient no longer results in strange artifacts
-- JdbcClient now returns exit code 1 in case of failures
-
diff --git a/java/ChangeLog.Dec2011 b/java/ChangeLog.Dec2011
deleted file mode 100644
--- a/java/ChangeLog.Dec2011
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for java
-# This file is updated with Maddlog
-
diff --git a/libversions b/libversions
--- a/libversions
+++ b/libversions
@@ -35,13 +35,13 @@
 
 # version of the GDK library (subdirectory gdk; also includes
 # common/options and common/mutils)
-GDK_VERSION=4:5:0
+GDK_VERSION=5:0:0
 
 # version of the MAPI library (subdirectory clients/mapilib)
-MAPI_VERSION=5:0:0
+MAPI_VERSION=6:0:0
 
 # version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=10:4:0
+MONETDB5_VERSION=11:0:0
 
 # version of the STREAM library (subdirectory common/stream)
-STREAM_VERSION=3:0:0
+STREAM_VERSION=4:0:1
diff --git a/monetdb5/ChangeLog-Archive b/monetdb5/ChangeLog-Archive
--- a/monetdb5/ChangeLog-Archive
+++ b/monetdb5/ChangeLog-Archive
@@ -1,6 +1,12 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Tue Feb  7 2012 Sjoerd Mullender <[email protected]> - 11.9.1-20120418
+- The type "chr" has been removed.
+  chr has long been superseded by bte for 1 byte arithmetic plus it is
+  pretty useless to hold single characters since we use Unicode and
+  thus only a tiny subset of the supported character set would fit.
+
 * Thu Feb  9 2012 Sjoerd Mullender <[email protected]> - 11.7.7-20120224
 - Fixed potential crash by dealing better with non-standard types.
 
diff --git a/monetdb5/ChangeLog.Apr2012 b/monetdb5/ChangeLog.Apr2012
--- a/monetdb5/ChangeLog.Apr2012
+++ b/monetdb5/ChangeLog.Apr2012
@@ -1,9 +1,3 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
-* Tue Feb  7 2012 Sjoerd Mullender <[email protected]>
-- The type "chr" has been removed.
-  chr has long been superseded by bte for 1 byte arithmetic plus it is
-  pretty useless to hold single characters since we use Unicode and
-  thus only a tiny subset of the supported character set would fit.
-
diff --git a/monetdb5/ChangeLog.Dec2011 b/monetdb5/ChangeLog.Dec2011
deleted file mode 100644
--- a/monetdb5/ChangeLog.Dec2011
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for MonetDB5
-# This file is updated with Maddlog
-
diff --git a/sql/ChangeLog.Dec2011 b/sql/ChangeLog.Dec2011
deleted file mode 100644
--- a/sql/ChangeLog.Dec2011
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for sql
-# This file is updated with Maddlog
-
diff --git a/testing/ChangeLog.Dec2011 b/testing/ChangeLog.Dec2011
deleted file mode 100644
--- a/testing/ChangeLog.Dec2011
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for testing
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to