Changeset: ff43c1f6f50c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ff43c1f6f50c Modified Files: MonetDB.spec NT/monetdb_config.h.in clients/python/setup.py configure.ag debian/changelog tools/merovingian/ChangeLog-Archive tools/merovingian/ChangeLog.Apr2011 Branch: Apr2011 Log Message:
Preparations for building the Apr2011 release. Moved contents of ChangeLog.Apr2011 to .spec file and debian/changelog. diffs (93 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -574,6 +574,12 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Thu Apr 21 2011 Sjoerd Mullender <[email protected]> - 11.3.1-20110421 +- Rebuilt. + +* Mon Apr 18 2011 Fabian Groffen <[email protected]> - 11.3.1-20110421 +- merovingian: Fix monetdb return code upon failure to start/stop a database + * Thu Apr 14 2011 Sjoerd Mullender <[email protected]> - 11.3.1-20110414 - 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 @@ -659,7 +659,7 @@ #define MONETDB5_PASSWDHASH "SHA512" /* Release name or "unreleased" */ -#define MONETDB_RELEASE "unreleased" +#define MONETDB_RELEASE "Apr2011" /* 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/Apr2011/python-monetdb-1.0.tar.gz', ) diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -130,7 +130,7 @@ ;; esac -AC_DEFINE(MONETDB_RELEASE, "unreleased", [Release name or "unreleased"]) +AC_DEFINE(MONETDB_RELEASE, "Apr2011", [Release name or "unreleased"]) dft_monetdb5=auto AC_ARG_ENABLE(monetdb5, diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +monetdb (11.3.1-20110421) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <[email protected]> Thu, 21 Apr 2011 09:38:31 +0200 + +monetdb (11.3.1-20110421) unstable; urgency=low + + * merovingian: Fix monetdb return code upon failure to start/stop a database + + -- Fabian Groffen <[email protected]> Mon, 18 Apr 2011 09:38:31 +0200 + monetdb (11.3.1-20110414) unstable; urgency=low * Rebuilt. diff --git a/tools/merovingian/ChangeLog-Archive b/tools/merovingian/ChangeLog-Archive --- a/tools/merovingian/ChangeLog-Archive +++ b/tools/merovingian/ChangeLog-Archive @@ -1,6 +1,9 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Mon Apr 18 2011 Fabian Groffen <[email protected]> - 11.3.1-20110421 +- Fix monetdb return code upon failure to start/stop a database + * Wed Feb 16 2011 Fabian Groffen <[email protected]> - 11.3.1-20110414 - The forward property for databases has been removed. Instead, only a global proxy or redirect mode can be set using monetdbd. diff --git a/tools/merovingian/ChangeLog.Apr2011 b/tools/merovingian/ChangeLog.Apr2011 --- a/tools/merovingian/ChangeLog.Apr2011 +++ b/tools/merovingian/ChangeLog.Apr2011 @@ -1,6 +1,3 @@ # ChangeLog file for sql/src/backends/monet5/merovingian # This file is updated with mchangelog -* Mon Apr 18 2011 Fabian Groffen <[email protected]> -- Fix monetdb return code upon failure to start/stop a database - _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
