Changeset: 5cbb6814d689 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5cbb6814d689
Modified Files:
.hgtags
MonetDB.spec
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
clients/python/setup.py
configure.ag
debian/changelog
gdk/libbat.rc
libversions
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: default
Log Message:
Merge with Oct2012 branch.
diffs (57 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -497,3 +497,6 @@ 322e81ffa03687b5be8c37208cdd6808d1347091
e89e4367f1106e7bc85a0a37bbb5bccf655a493d Oct2012_root
4d73d1902798944fddc156f95c0d656d76cfc3d8 Jul2012_9
f21bc494423c56e9cb68bae0b400e1f2a6d0c2bc Jul2012_SP2_release
+3350908e3e6786034cea69f151e22f841eb3b49a Jul2012_11
+f21bc494423c56e9cb68bae0b400e1f2a6d0c2bc Jul2012_SP2_release
+f8e913e56b99223764b1c22f526087d6bcad2656 Jul2012_SP2_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -695,6 +695,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
rm -fr $RPM_BUILD_ROOT
%changelog
+* Mon Sep 17 2012 Sjoerd Mullender <sjo...@acm.org> - 11.11.11-20120917
+- Rebuilt.
+
* Tue Sep 11 2012 Sjoerd Mullender <sjo...@acm.org> - 11.11.9-20120911
- Rebuilt.
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+monetdb (11.11.11-20120917) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Mon, 17 Sep 2012 10:00:19 +0200
+
monetdb (11.11.9-20120911) 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=7:1:1
+GDK_VERSION=7:2:1
# version of the MAPI library (subdirectory clients/mapilib)
-MAPI_VERSION=6:3:0
+MAPI_VERSION=6:4:0
# version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=12:2:0
+MONETDB5_VERSION=12:3:0
# version of the STREAM library (subdirectory common/stream)
-STREAM_VERSION=4:4:1
+STREAM_VERSION=4:5:1
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
