Changeset: 9adf84280f96 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9adf84280f96 Modified Files: .hgtags MonetDB.spec debian/changelog libversions Branch: Feb2013 Log Message:
Merge with Oct2012 branch. diffs (63 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -511,3 +511,5 @@ 5ba19bc11f7691610501c95ba8d0f1d9e5083a94 c341b78e1c2e38445f43bd3ec89fdf40792bed01 Feb2013_root 0ef42179e99bbd8450d9993cf419fcbed96cf61c Oct2012_7 14b7be52b2212bf3aeb51edecbaee020554b3158 Oct2012_SP2_release +0d23123db0a3fd8564564c46789e8e549320c77b Oct2012_9 +1f74df406780bccca94e6128c6c62a0b101fc847 Oct2012_SP3_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/Oct2012-SP2/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Oct2012-SP3/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -706,6 +706,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet rm -fr $RPM_BUILD_ROOT %changelog +* Tue Jan 15 2013 Sjoerd Mullender <sjo...@acm.org> - 11.13.9-20130115 +- Rebuilt. + * Wed Dec 12 2012 Sjoerd Mullender <sjo...@acm.org> - 11.13.7-20121212 - Rebuilt. diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +monetdb (11.13.9-20130115) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 15 Jan 2013 09:59:17 +0100 + monetdb (11.13.7-20121212) unstable; urgency=low * Rebuilt. 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=8:2:0 +GDK_VERSION=8:3:0 # version of the MAPI library (subdirectory clients/mapilib) MAPI_VERSION=6:4:0 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=13:2:0 +MONETDB5_VERSION=13:3:0 # version of the STREAM library (subdirectory common/stream) STREAM_VERSION=4:5:1 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
