Changeset: be8ff3e8c615 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=be8ff3e8c615 Modified Files: MonetDB.spec NT/monetdb_config.h.in clients/python/setup.py configure.ag debian/changelog gdk/ChangeLog-Archive gdk/ChangeLog.Mar2011 Branch: Mar2011 Log Message:
Preparations for building the Mar2011 release. Moved contents of ChangeLog.Mar2011 to .spec file and debian/changelog. diffs (97 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -782,6 +782,13 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Thu Mar 24 2011 Sjoerd Mullender <[email protected]> - 11.1.1-20110324 +- Rebuilt. + +* Tue Mar 22 2011 Fabian Groffen <[email protected]> - 11.1.1-20110324 +- gdk: Fixed memory detection on Darwin (Mac OS X) systems not to return + bogus values + * Thu Mar 17 2011 Sjoerd Mullender <[email protected]> - 11.1.1-20110317 - Rebuilt. diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in --- a/NT/monetdb_config.h.in +++ b/NT/monetdb_config.h.in @@ -689,7 +689,7 @@ #define MONETDB5_PASSWDHASH "SHA512" /* Release name or "unreleased" */ -#define MONETDB_RELEASE "unreleased" +#define MONETDB_RELEASE "Mar2011" /* Define if the oid type should use 32 bits on a 64-bit architecture */ /* 32-bit OIDs are used by default on 64-bit Windows; diff --git a/clients/python/setup.py b/clients/python/setup.py --- a/clients/python/setup.py +++ b/clients/python/setup.py @@ -35,6 +35,6 @@ author_email='[email protected]', url='http://monetdb.cwi.nl/', packages=['monetdb', 'monetdb.sql'], - download_url='<will be filled in before a release>/python-monetdb-1.0.tar.gz', + download_url='http://dev.monetdb.org/downloads/sources/Mar2011/python-monetdb-1.0.tar.gz', ) diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -131,7 +131,7 @@ ;; esac -AC_DEFINE(MONETDB_RELEASE, "unreleased", [Release name or "unreleased"]) +AC_DEFINE(MONETDB_RELEASE, "Mar2011", [Release name or "unreleased"]) dft_monetdb4=auto AC_ARG_ENABLE(monetdb4, diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +monetdb (11.1.1-20110324) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <[email protected]> Thu, 24 Mar 2011 09:12:25 +0100 + +monetdb (11.1.1-20110324) unstable; urgency=low + + * gdk: Fixed memory detection on Darwin (Mac OS X) systems not to return + bogus values + + -- Fabian Groffen <[email protected]> Tue, 22 Mar 2011 09:12:24 +0100 + monetdb (11.1.1-20110317) unstable; urgency=low * Rebuilt. diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive --- a/gdk/ChangeLog-Archive +++ b/gdk/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Tue Mar 22 2011 Fabian Groffen <[email protected]> - 11.1.1-20110324 +- Fixed memory detection on Darwin (Mac OS X) systems not to return + bogus values + * Fri Jan 14 2011 Fabian Groffen <[email protected]> - 11.1.1-20110317 - MonetDB/src/gdk was moved to gdk diff --git a/gdk/ChangeLog.Mar2011 b/gdk/ChangeLog.Mar2011 --- a/gdk/ChangeLog.Mar2011 +++ b/gdk/ChangeLog.Mar2011 @@ -1,7 +1,3 @@ # ChangeLog file for MonetDB # This file is updated with Maddlog -* Tue Mar 22 2011 Fabian Groffen <[email protected]> -- Fixed memory detection on Darwin (Mac OS X) systems not to return - bogus values - _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
