Changeset: db529d5806a8 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=db529d5806a8 Modified Files: .hgtags MonetDB.spec debian/changelog libversions Branch: default Log Message:
Merge with Oct2012 branch. diffs (63 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -506,3 +506,5 @@ d762ae2e83bd42a48aebf0ebb051a643f77f77d7 6f4501510506b9f074351d5b592a2a745b296571 Oct2012_3 4233be3c7f49f704e5ed466d2c1836c9dcfbb9f7 Oct2012_release 3c157ea4be5369d5718c7d578f10c0b934fbf2e6 Oct2012_release +55c1892e82a764a7a6003dded13a6228de3d1661 Oct2012_5 +5ba19bc11f7691610501c95ba8d0f1d9e5083a94 Oct2012_SP1_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/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Oct2012-SP1/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -695,6 +695,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet rm -fr $RPM_BUILD_ROOT %changelog +* Fri Nov 16 2012 Sjoerd Mullender <sjo...@acm.org> - 11.13.5-20121116 +- Rebuilt. + * Tue Oct 16 2012 Fabian Groffen <fab...@monetdb.org> - 11.13.3-20121016 - Rebuilt. diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +monetdb (11.13.5-20121116) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 16 Nov 2012 09:29:41 +0100 + monetdb (11.13.3-20121016) 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:0:0 +GDK_VERSION=8:1: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:0:0 +MONETDB5_VERSION=13:1: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
