Changeset: 0bb0900cc340 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0bb0900cc340 Added Files: ChangeLog-Archive Modified Files: .hgtags ChangeLog.Jun2016 MonetDB.spec debian/changelog java/Makefile.ag java/build.properties java/pom.xml java/release.txt libversions Branch: default Log Message:
Merge with Jun2016 branch. diffs (144 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -627,3 +627,5 @@ 192e3168234a5f9f8a4d1c4ce17805f608f001c3 b29fdfe9c590f674208212bf4ead617beef4b73c Jun2016_3 192e3168234a5f9f8a4d1c4ce17805f608f001c3 Jun2016_release b29fdfe9c590f674208212bf4ead617beef4b73c Jun2016_release +4a05df3932a97865ac7e4037361723d5563490b3 Jun2016_5 +4a05df3932a97865ac7e4037361723d5563490b3 Jun2016_SP1_release diff --git a/ChangeLog-Archive b/ChangeLog-Archive new file mode 100644 --- /dev/null +++ b/ChangeLog-Archive @@ -0,0 +1,6 @@ +# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY +# This file contains past ChangeLog entries + +* Fri Jul 1 2016 Sjoerd Mullender <sjo...@acm.org> - 11.23.5-20160704 +- Lots of memory leaks have been plugged across the whole system. + diff --git a/ChangeLog.Jun2016 b/ChangeLog.Jun2016 --- a/ChangeLog.Jun2016 +++ b/ChangeLog.Jun2016 @@ -1,6 +1,3 @@ # ChangeLog file for candidate # This file is updated with Maddlog -* Fri Jul 1 2016 Sjoerd Mullender <sjo...@acm.org> -- Lots of memory leaks have been plugged across the whole system. - diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -119,7 +119,7 @@ Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases License: MPLv2.0 URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Jun2016/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Jun2016-SP1/%{name}-%{version}.tar.bz2 # we need systemd for the _unitdir macro to exist %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 @@ -962,6 +962,13 @@ rm -f %{buildroot}%{_bindir}/Maddlog %postun -p /sbin/ldconfig %changelog +* Mon Jul 04 2016 Sjoerd Mullender <sjo...@acm.org> - 11.23.5-20160704 +- Rebuilt. +- BZ#4031: mclient doesn't accept - argument to refer to stdin + +* Fri Jul 1 2016 Sjoerd Mullender <sjo...@acm.org> - 11.23.5-20160704 +- MonetDB: Lots of memory leaks have been plugged across the whole system. + * Fri Jun 10 2016 Sjoerd Mullender <sjo...@acm.org> - 11.23.3-20160610 - Rebuilt. - BZ#4015: Daemon crashes on database release command diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +monetdb (11.23.5) unstable; urgency=low + + * Rebuilt. + * BZ#4031: mclient doesn't accept - argument to refer to stdin + + -- Sjoerd Mullender <sjo...@acm.org> Mon, 04 Jul 2016 12:57:25 +0200 + +monetdb (11.23.5) unstable; urgency=low + + * MonetDB: Lots of memory leaks have been plugged across the whole system. + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 1 Jul 2016 12:57:25 +0200 + monetdb (11.23.3) unstable; urgency=low * Rebuilt. diff --git a/java/Makefile.ag b/java/Makefile.ag --- a/java/Makefile.ag +++ b/java/Makefile.ag @@ -16,7 +16,7 @@ JAVA_HOME = @JAVA_HOME@ ant_distjdbc = { COND = HAVE_JAVAJDBC DIR = datadir/monetdb/lib - FILES = monetdb-mcl-1.13.jar monetdb-jdbc-2.21.jar jdbcclient.jar + FILES = monetdb-mcl-1.13.jar monetdb-jdbc-2.22.jar jdbcclient.jar } ant_distmerocontrol = { diff --git a/java/build.properties b/java/build.properties --- a/java/build.properties +++ b/java/build.properties @@ -19,7 +19,7 @@ MCL_MINOR=13 # major release number JDBC_MAJOR=2 # minor release number -JDBC_MINOR=21 +JDBC_MINOR=22 # an additional identifying string JDBC_VER_SUFFIX=Liberica # the default port to connect on, if no port given when using SQL diff --git a/java/pom.xml b/java/pom.xml --- a/java/pom.xml +++ b/java/pom.xml @@ -6,7 +6,7 @@ <groupId>monetdb</groupId> <artifactId>monetdb-jdbc</artifactId> - <version>2.21</version> + <version>2.22</version> <name>${project.groupId}:${project.artifactId}</name> <description>MonetDB JDBC driver</description> <url>https://www.monetdb.org</url> diff --git a/java/release.txt b/java/release.txt --- a/java/release.txt +++ b/java/release.txt @@ -1,6 +1,6 @@ RELEASE NOTES -MonetDB JDBC driver version 2.21 (Liberica/MCL-1.13) -Release date: 2016-06-10 +MonetDB JDBC driver version 2.22 (Liberica/MCL-1.13) +Release date: 2016-07-04 This JDBC driver is designed for use with MonetDB, a main-memory database. For more information see https://www.monetdb.org/. diff --git a/libversions b/libversions --- a/libversions +++ b/libversions @@ -36,13 +36,13 @@ # version of the GDK library (subdirectory gdk; also includes # common/options and common/utils) -GDK_VERSION=13:1:0 +GDK_VERSION=13:2:0 # version of the MAPI library (subdirectory clients/mapilib) MAPI_VERSION=8:0:0 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=21:1:0 +MONETDB5_VERSION=21:2:0 # version of the STREAM library (subdirectory common/stream) -STREAM_VERSION=8:0:0 +STREAM_VERSION=8:1:0 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
