Changeset: 500a4a7f987d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=500a4a7f987d
Modified Files:
        .hgeol
        MonetDB/.cvsignore
        MonetDB/MonetDB.spec
        MonetDB/NT/.cvsignore
        MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj
        MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj
        MonetDB/NT/rules.msc
        MonetDB/conf/.cvsignore
        MonetDB/configure.ag
        MonetDB/src/gdk/gdk_bbp.mx
        MonetDB/src/gdk/gdk_posix.mx
        MonetDB/src/gdk/libbat.rc
        MonetDB/vertoo.data
        MonetDB4/.cvsignore
        MonetDB4/MonetDB-server.spec
        MonetDB4/NT/.cvsignore
        MonetDB4/NT/MonetDB.iss
        MonetDB4/NT/MonetDB4-Server/MonetDB4-Server.vdproj
        MonetDB4/NT/MonetDB4-Server/MonetDB4-Server64.vdproj
        MonetDB4/NT/rules.msc
        MonetDB4/NT/winservice/.cvsignore
        MonetDB4/VERSION
        MonetDB4/conf/.cvsignore
        MonetDB4/conf/MonetDB.conf.in
        MonetDB4/configure.ag
        MonetDB4/src/monet/.cvsignore
        MonetDB4/src/monet/libmonet.rc
        MonetDB4/src/tools/.cvsignore
        MonetDB4/vertoo.data
        MonetDB5/.cvsignore
        MonetDB5/MonetDB-server.spec
        MonetDB5/NT/.cvsignore
        MonetDB5/NT/MonetDB5-Installer/.cvsignore
        MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdproj
        MonetDB5/NT/MonetDB5-Server/MonetDB5-Server64.vdproj
        MonetDB5/NT/rules.msc
        MonetDB5/VERSION
        MonetDB5/conf/.cvsignore
        MonetDB5/conf/monetdb5.conf.in
        MonetDB5/configure.ag
        MonetDB5/debian/monetdb5-server.install
        MonetDB5/src/mal/Tests/.cvsignore
        MonetDB5/src/mal/libmonetdb5.rc
        MonetDB5/src/modules/kernel/bat5.mx
        MonetDB5/src/modules/kernel/batcalc.mx
        MonetDB5/src/tools/.cvsignore
        MonetDB5/vertoo.data
        buildtools/.cvsignore
        buildtools/Mx/.cvsignore
        buildtools/Mx/Mx.vcproj
        buildtools/Mx/MxLib.vcproj
        buildtools/Mx/config.vcproj
        buildtools/autogen/.cvsignore
        buildtools/burg/.cvsignore
        buildtools/mel/.cvsignore
        clients/.cvsignore
        clients/MonetDB-client.spec
        clients/NT/.cvsignore
        clients/NT/MonetDB-Clients/MonetDB-Clients.vdproj
        clients/NT/MonetDB-Clients/MonetDB-Clients64.vdproj
        clients/NT/rules.msc
        clients/conf/.cvsignore
        clients/configure.ag
        clients/src/mapilib/Mapi.rc
        clients/src/odbc/driver/driver.rc
        clients/src/odbc/winsetup/MonetDB-ODBC-Installer/.cvsignore
        clients/src/odbc/winsetup/MonetDB-ODBC-Installer64/.cvsignore
        clients/src/odbc/winsetup/setup.rc
        clients/vertoo.data
        geom/.cvsignore
        geom/MonetDB-geom.spec
        geom/NT/.cvsignore
        geom/NT/MonetDB5-Geom/.cvsignore
        geom/NT/MonetDB5-Geom64/.cvsignore
        geom/NT/rules.msc
        geom/conf/.cvsignore
        geom/configure.ag
        geom/src/.cvsignore
        geom/vertoo.data
        java/.cvsignore
        java/NT/.cvsignore
        java/conf/.cvsignore
        java/configure.ag
        java/vertoo.data
        pathfinder/.cvsignore
        pathfinder/MonetDB-XQuery.spec
        pathfinder/NT/.cvsignore
        pathfinder/NT/MonetDB4-XQuery/.cvsignore
        pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj
        pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery64.vdproj
        pathfinder/NT/MonetDB4-XQuery64/.cvsignore
        pathfinder/NT/rules.msc
        pathfinder/VERSION
        pathfinder/conf/.cvsignore
        pathfinder/configure.ag
        pathfinder/runtime/pathfinder.mx
        pathfinder/runtime/xrpc/admin/title.html.in
        pathfinder/vertoo.data
        sql/.cvsignore
        sql/ChangeLog.Jun2010
        sql/MonetDB-SQL.spec
        sql/NT/.cvsignore
        sql/NT/MonetDB5-SQL/.cvsignore
        sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
        sql/NT/MonetDB5-SQL/MonetDB5-SQL.vdproj
        sql/NT/MonetDB5-SQL/MonetDB5-SQL64.vdproj
        sql/NT/MonetDB5-SQL64/.cvsignore
        sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
        sql/NT/rules.msc
        sql/VERSION
        sql/conf/.cvsignore
        sql/configure.ag
        sql/vertoo.data
        template/.cvsignore
        template/conf/.cvsignore
        template/configure.ag
        template/vertoo.data
        testing/.cvsignore
        testing/MonetDB-testing.spec
        testing/NT/.cvsignore
        testing/NT/rules.msc
        testing/conf/.cvsignore
        testing/configure.ag
        testing/vertoo.data
Branch: default
Log Message:

Merge from Jun2010 branch.


diffs (truncated from 3862 to 300 lines):

diff -r 99d16aff6ce6 -r 500a4a7f987d MonetDB/.cvsignore
--- a/MonetDB/.cvsignore        Thu Jun 17 14:39:08 2010 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-java
-Linux*
-SunOS*
-CYGWIN*
-IRIX*
-AIX*
-aclocal.m4
-acout.in
-autom4te*.cache
-configure
-configure.in
-install.lst
-doc.lst
diff -r 99d16aff6ce6 -r 500a4a7f987d MonetDB/ChangeLog.Jun2010
--- a/MonetDB/ChangeLog.Jun2010 Thu Jun 17 14:39:08 2010 +0200
+++ b/MonetDB/ChangeLog.Jun2010 Sun Jun 20 15:12:52 2010 +0200
@@ -1,23 +1,3 @@
 # ChangeLog file for MonetDB
 # This file is updated with Maddlog
 
-* Mon May 31 2010 Sjoerd Mullender <sjo...@acm.org>
-- Updated Vendor information.
-
-* Wed Mar 31 2010 Stefan Manegold <maneg...@cwi.nl>
-- Made compilation of "testing" (and "java") independent of MonetDB.
-  This is mainy for Windows, but also on other systems, "testing" can now be
-  built independently of (and hence before) "MonetDB".
-  Files that mimic configure functionality on Windows were moved from
-  "MonetDB" to "buildtools"; hence, this affects all packages on Windows,
-  requiring a complete rebuild from scratch on Windows.
-  getopt() support in testing has changed; hence, (most probably) requiring a
-  rebuild from scratch of testing on other systems.
-
-* Wed Mar 24 2010 Stefan Manegold <maneg...@cwi.nl>
-- Implemented build directory support for Windows,
-  i.e., like on Unix/Linux also on Windows we can now build in a separate
-  build directory as alternative to ...<package>NT, and thus keep the
-  latter clean from files generated during the build.
-  On Windows, the build directory must be a sibling of ...<package>NT .
-
diff -r 99d16aff6ce6 -r 500a4a7f987d MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec      Thu Jun 17 14:39:08 2010 +0200
+++ b/MonetDB/MonetDB.spec      Sun Jun 20 15:12:52 2010 +0200
@@ -106,6 +106,29 @@
 %{_libdir}/libbat.so
 
 %changelog
+* Fri Jun 18 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.1-20100618
+- Rebuilt.
+
+* Mon May 31 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.1-20100618
+- Updated Vendor information.
+
+* Tue Apr 20 2010 Stefan Manegold <maneg...@cwi.nl> - 1.38.1-20100618
+- Made compilation of "testing" (and "java") independent of MonetDB.
+  This is mainy for Windows, but also on other systems, "testing" can now be
+  built independently of (and hence before) "MonetDB".
+  Files that mimic configure functionality on Windows were moved from
+  "MonetDB" to "buildtools"; hence, this affects all packages on Windows,
+  requiring a complete rebuild from scratch on Windows.
+  getopt() support in testing has changed; hence, (most probably) requiring a
+  rebuild from scratch of testing on other systems.
+
+* Tue Apr 20 2010 Stefan Manegold <maneg...@cwi.nl> - 1.38.1-20100618
+- Implemented build directory support for Windows,
+  i.e., like on Unix/Linux also on Windows we can now build in a separate
+  build directory as alternative to ...<package>NT, and thus keep the
+  latter clean from files generated during the build.
+  On Windows, the build directory must be a sibling of ...<package>NT .
+
 * Tue Apr 20 2010 Sjoerd Mullender <sjo...@acm.org> - 1.36.5-20100420
 - Rebuilt.
 
diff -r 99d16aff6ce6 -r 500a4a7f987d MonetDB/NT/.cvsignore
--- a/MonetDB/NT/.cvsignore     Thu Jun 17 14:39:08 2010 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-MonetDB.pc
-Run*.bat
-bin
-com
-conf
-doc
-etc
-include
-info
-lady.gif
-lib
-libexec
-man
-monetdb_config.h
-sbin
-scripts
-share
-src
-tests
-unistd.h
-var
diff -r 99d16aff6ce6 -r 500a4a7f987d MonetDB/conf/.cvsignore
--- a/MonetDB/conf/.cvsignore   Thu Jun 17 14:39:08 2010 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-compile
-config.guess
-config.h.in
-config.sub
-install-sh
-ltmain.sh
-mkinstalldirs
-missing
diff -r 99d16aff6ce6 -r 500a4a7f987d MonetDB/debian/changelog
--- a/MonetDB/debian/changelog  Thu Jun 17 14:39:08 2010 +0200
+++ b/MonetDB/debian/changelog  Sun Jun 20 15:12:52 2010 +0200
@@ -1,3 +1,38 @@
+monetdb (1.38.1-20100618) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Fri, 18 Jun 2010 10:58:37 +0200
+
+monetdb (1.38.1-20100618) unstable; urgency=low
+
+  * Updated Vendor information.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Mon, 31 May 2010 10:58:37 +0200
+
+monetdb (1.38.1-20100618) unstable; urgency=low
+
+  * Made compilation of "testing" (and "java") independent of MonetDB.
+    This is mainy for Windows, but also on other systems, "testing" can now be
+    built independently of (and hence before) "MonetDB".
+    Files that mimic configure functionality on Windows were moved from
+    "MonetDB" to "buildtools"; hence, this affects all packages on Windows,
+    requiring a complete rebuild from scratch on Windows.
+    getopt() support in testing has changed; hence, (most probably) requiring a
+    rebuild from scratch of testing on other systems.
+
+ -- Stefan Manegold <maneg...@cwi.nl>  Tue, 20 Apr 2010 10:58:37 +0200
+
+monetdb (1.38.1-20100618) unstable; urgency=low
+
+  * Implemented build directory support for Windows,
+    i.e., like on Unix/Linux also on Windows we can now build in a separate
+    build directory as alternative to ...<package>NT, and thus keep the
+    latter clean from files generated during the build.
+    On Windows, the build directory must be a sibling of ...<package>NT .
+
+ -- Stefan Manegold <maneg...@cwi.nl>  Tue, 20 Apr 2010 10:58:37 +0200
+
 monetdb (1.36.5-20100420) unstable; urgency=low
 
   * Rebuilt.
diff -r 99d16aff6ce6 -r 500a4a7f987d MonetDB/src/gdk/gdk_posix.mx
--- a/MonetDB/src/gdk/gdk_posix.mx      Thu Jun 17 14:39:08 2010 +0200
+++ b/MonetDB/src/gdk/gdk_posix.mx      Sun Jun 20 15:12:52 2010 +0200
@@ -2105,8 +2105,8 @@
 
 #define MT_PAGESIZE(s)         ((((s)-1)/MT_pagesize()+1)*MT_pagesize())
 
-#if defined(MAP_ANON)
-#define MMAP_FLAGS(f)          f|MAP_ANON
+#if defined(MAP_ANONYMOUS)
+#define MMAP_FLAGS(f)          f|MAP_ANONYMOUS
 #define MMAP_FD                        -1
 #define MMAP_OPEN_DEV_ZERO     int fd = 1
 #define MMAP_CLOSE_DEV_ZERO    (void)fd
diff -r 99d16aff6ce6 -r 500a4a7f987d MonetDB4/.cvsignore
--- a/MonetDB4/.cvsignore       Thu Jun 17 14:39:08 2010 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-java
-Linux*
-SunOS*
-CYGWIN*
-IRIX*
-AIX*
-aclocal.m4
-acout.in
-autom4te*.cache
-configure
-configure.in
-install.lst
-doc.lst
diff -r 99d16aff6ce6 -r 500a4a7f987d MonetDB4/ChangeLog.Jun2010
--- a/MonetDB4/ChangeLog.Jun2010        Thu Jun 17 14:39:08 2010 +0200
+++ b/MonetDB4/ChangeLog.Jun2010        Sun Jun 20 15:12:52 2010 +0200
@@ -1,23 +1,3 @@
 # ChangeLog file for MonetDB4
 # This file is updated with Maddlog
 
-* Mon May 31 2010 Sjoerd Mullender <sjo...@acm.org>
-- Updated Vendor information.
-
-* Wed Mar 31 2010 Stefan Manegold <maneg...@cwi.nl>
-- Made compilation of "testing" (and "java") independent of MonetDB.
-  This is mainy for Windows, but also on other systems, "testing" can now be
-  built independently of (and hence before) "MonetDB".
-  Files that mimic configure functionality on Windows were moved from
-  "MonetDB" to "buildtools"; hence, this affects all packages on Windows,
-  requiring a complete rebuild from scratch on Windows.
-  getopt() support in testing has changed; hence, (most probably) requiring a
-  rebuild from scratch of testing on other systems.
-
-* Wed Mar 24 2010 Stefan Manegold <maneg...@cwi.nl>
-- Implemented build directory support for Windows,
-  i.e., like on Unix/Linux also on Windows we can now build in a separate
-  build directory as alternative to ...<package>NT, and thus keep the
-  latter clean from files generated during the build.
-  On Windows, the build directory must be a sibling of ...<package>NT .
-
diff -r 99d16aff6ce6 -r 500a4a7f987d MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec      Thu Jun 17 14:39:08 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec      Sun Jun 20 15:12:52 2010 +0200
@@ -216,6 +216,29 @@
 %{_libdir}/libembeddedmil.so
 
 %changelog
+* Fri Jun 18 2010 Sjoerd Mullender <sjo...@acm.org> - 4.38.1-20100618
+- Rebuilt.
+
+* Mon May 31 2010 Sjoerd Mullender <sjo...@acm.org> - 4.38.1-20100618
+- Updated Vendor information.
+
+* Tue Apr 20 2010 Stefan Manegold <maneg...@cwi.nl> - 4.38.1-20100618
+- Made compilation of "testing" (and "java") independent of MonetDB.
+  This is mainy for Windows, but also on other systems, "testing" can now be
+  built independently of (and hence before) "MonetDB".
+  Files that mimic configure functionality on Windows were moved from
+  "MonetDB" to "buildtools"; hence, this affects all packages on Windows,
+  requiring a complete rebuild from scratch on Windows.
+  getopt() support in testing has changed; hence, (most probably) requiring a
+  rebuild from scratch of testing on other systems.
+
+* Tue Apr 20 2010 Stefan Manegold <maneg...@cwi.nl> - 4.38.1-20100618
+- Implemented build directory support for Windows,
+  i.e., like on Unix/Linux also on Windows we can now build in a separate
+  build directory as alternative to ...<package>NT, and thus keep the
+  latter clean from files generated during the build.
+  On Windows, the build directory must be a sibling of ...<package>NT .
+
 * Tue Apr 20 2010 Sjoerd Mullender <sjo...@acm.org> - 4.36.5-20100420
 - Rebuilt.
 
diff -r 99d16aff6ce6 -r 500a4a7f987d MonetDB4/NT/.cvsignore
--- a/MonetDB4/NT/.cvsignore    Thu Jun 17 14:39:08 2010 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-MonetDB.pc
-Run*.bat
-bin
-com
-conf
-doc
-etc
-include
-info
-lady.gif
-lib
-libexec
-man
-monetdb4_config.h
-sbin
-scripts
-share
-src
-tests
-unistd.h
-var
diff -r 99d16aff6ce6 -r 500a4a7f987d MonetDB4/NT/winservice/.cvsignore
--- a/MonetDB4/NT/winservice/.cvsignore Thu Jun 17 14:39:08 2010 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-*.ilk
-*.pdb
-*.exe
-*.obj
diff -r 99d16aff6ce6 -r 500a4a7f987d MonetDB4/conf/.cvsignore
--- a/MonetDB4/conf/.cvsignore  Thu Jun 17 14:39:08 2010 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-compile
-config.guess
-config.h.in
-config.sub
-install-sh
-ltmain.sh
-mkinstalldirs
-missing
diff -r 99d16aff6ce6 -r 500a4a7f987d MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Thu Jun 17 14:39:08 2010 +0200
+++ b/MonetDB4/debian/changelog Sun Jun 20 15:12:52 2010 +0200
@@ -1,3 +1,38 @@
+monetdb4-server (4.38.1-20100618) unstable; urgency=low
+
+  * Rebuilt.
+
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to