Changeset: ae11a161fb7d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ae11a161fb7d Modified Files: .hgtags MonetDB.spec debian/changelog java/ChangeLog-Archive java/ChangeLog.Dec2011 libversions Branch: Apr2012 Log Message:
Merge with Dec2011 branch. diffs (99 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -472,3 +472,5 @@ 32665cf67d03011ff1fcc2c8e118370c47e5fae6 d159bb1ba293002773b896353854b14aeb4e5cd1 Dec2011_7 f47248f30989933b245a4d6f2e31a9e443f1078b Dec2011_SP1_release ab662699300b790a0c20b3c40b6ca0eebf25cd14 Apr2012_root +e36693f883f56d50da695471b876542755306736 Dec2011_9 +f50d60ffdbeec52cc17a72ecb91eed6753ab403c Dec2011_SP2_release 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/Dec2011-SP1/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Dec2011-SP2/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -626,6 +626,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet rm -fr $RPM_BUILD_ROOT %changelog +* Mon Mar 12 2012 Fabian Groffen <fab...@monetdb.org> - 11.7.9-20120312 +- Rebuilt. + +* Tue Feb 28 2012 Fabian Groffen <fab...@cwi.nl> - 11.7.9-20120312 +- java: Implemented missing Number types support in + PreparedStatement.setObject() + * Fri Feb 24 2012 Fabian Groffen <fab...@monetdb.org> - 11.7.7-20120224 - Rebuilt. diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +monetdb (11.7.9-20120312) unstable; urgency=low + + * Rebuilt. + + -- Fabian Groffen <fab...@monetdb.org> Mon, 12 Mar 2012 14:32:53 +0100 + +monetdb (11.7.9-20120312) unstable; urgency=low + + * java: Implemented missing Number types support in + PreparedStatement.setObject() + + -- Fabian Groffen <fab...@cwi.nl> Tue, 28 Feb 2012 14:32:53 +0100 + monetdb (11.7.7-20120224) unstable; urgency=low * Rebuilt. 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 +* Tue Feb 28 2012 Fabian Groffen <fab...@cwi.nl> - 11.7.9-20120312 +- Implemented missing Number types support in + PreparedStatement.setObject() + * Mon Feb 20 2012 Fabian Groffen <fab...@cwi.nl> - 11.7.7-20120224 - Fixed bug in DatabaseMetaData.getSchemas() method that caused an SQL error when called with catalog and schema argument. diff --git a/java/ChangeLog.Dec2011 b/java/ChangeLog.Dec2011 --- a/java/ChangeLog.Dec2011 +++ b/java/ChangeLog.Dec2011 @@ -1,7 +1,3 @@ # ChangeLog file for java # This file is updated with Maddlog -* Tue Feb 28 2012 Fabian Groffen <fab...@cwi.nl> -- Implemented missing Number types support in - PreparedStatement.setObject() - 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:4:0 +GDK_VERSION=4:5:0 # version of the MAPI library (subdirectory clients/mapilib) MAPI_VERSION=5:0:0 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=10:3:0 +MONETDB5_VERSION=10:4:0 # version of the STREAM library (subdirectory common/stream) STREAM_VERSION=3:0:0 _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
