Changeset: 41c906e61c8a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=41c906e61c8a Modified Files: .hgtags MonetDB.spec Branch: Aug2011 Log Message:
Merge with Apr2011 branch. diffs (55 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -446,3 +446,6 @@ b540445f1e7aa333708963a7afb46acd1914fdb3 Aug2011_root dbf80a87be87b463e6603221e0ed6e31d85d94c3 Apr2011_5 bb8536db427b60b0226bbdec8dbfddfa7a26f37f Apr2011_SP2_release +0fd8df3e7fc2f320fe7638af8e4883bf433ef61b Apr2011_7 +bb8536db427b60b0226bbdec8dbfddfa7a26f37f Apr2011_SP2_release +a155d5445790c798ddf7a3e1b54094c13e1b3eaa Apr2011_SP2_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -585,6 +585,9 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Tue Jul 26 2011 Sjoerd Mullender <[email protected]> - 11.3.7-20110726 +- Rebuilt. + * Wed Jul 20 2011 Sjoerd Mullender <[email protected]> - 11.3.5-20110720 - Rebuilt. diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +monetdb (11.3.7-20110726) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <[email protected]> Tue, 26 Jul 2011 09:53:37 +0200 + monetdb (11.3.5-20110720) unstable; urgency=low * Rebuilt. diff --git a/libversions b/libversions --- a/libversions +++ b/libversions @@ -30,13 +30,13 @@ # version of the GDK library (subdirectory gdk; also includes # common/options and common/mutils) -GDK_VERSION=3:2:0 +GDK_VERSION=3:3:0 # version of the MAPI library (subdirectory clients/mapilib) MAPI_VERSION=3:2:0 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=7:2:0 +MONETDB5_VERSION=7:3:0 # version of the STREAM library (subdirectory common/stream) STREAM_VERSION=2:1:0 _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
