Changeset: 48b4be11fdf3 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=48b4be11fdf3 Modified Files: MonetDB/MonetDB.spec MonetDB4/MonetDB-server.spec MonetDB5/MonetDB-server.spec clients/MonetDB-client.spec geom/MonetDB-geom.spec pathfinder/MonetDB-XQuery.spec sql/ChangeLog.Jun2010 sql/MonetDB-SQL.spec sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj testing/MonetDB-testing.spec Branch: default Log Message:
Merge with Jun2010 branch. diffs (truncated from 423 to 300 lines): diff -r 7f53bc7587ca -r 48b4be11fdf3 .hgtags --- a/.hgtags Mon Jun 28 06:23:17 2010 +0200 +++ b/.hgtags Mon Jun 28 09:44:16 2010 +0200 @@ -408,3 +408,5 @@ 659965ec908548fa64649bce37f84e245428ce7b Jun2010_1 659965ec908548fa64649bce37f84e245428ce7b Jun2010_1 d83c56c4bba705257e09846d7f7e23bf5bd96627 Jun2010_1 +d83c56c4bba705257e09846d7f7e23bf5bd96627 Jun2010_1 +c0927c19d26910bb3fb5a5acba438a0ca5bba182 Jun2010_1 diff -r 7f53bc7587ca -r 48b4be11fdf3 MonetDB/MonetDB.spec --- a/MonetDB/MonetDB.spec Mon Jun 28 06:23:17 2010 +0200 +++ b/MonetDB/MonetDB.spec Mon Jun 28 09:44:16 2010 +0200 @@ -106,6 +106,9 @@ %{_libdir}/libbat.so %changelog +* Fri Jun 25 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.1-20100625 +- Rebuilt. + * Tue Jun 22 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.1-20100622 - Rebuilt. diff -r 7f53bc7587ca -r 48b4be11fdf3 MonetDB/debian/changelog --- a/MonetDB/debian/changelog Mon Jun 28 06:23:17 2010 +0200 +++ b/MonetDB/debian/changelog Mon Jun 28 09:44:16 2010 +0200 @@ -1,3 +1,9 @@ +monetdb (1.38.1-20100625) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 25 Jun 2010 17:41:34 +0200 + monetdb (1.38.1-20100622) unstable; urgency=low * Rebuilt. diff -r 7f53bc7587ca -r 48b4be11fdf3 MonetDB4/MonetDB-server.spec --- a/MonetDB4/MonetDB-server.spec Mon Jun 28 06:23:17 2010 +0200 +++ b/MonetDB4/MonetDB-server.spec Mon Jun 28 09:44:16 2010 +0200 @@ -216,6 +216,9 @@ %{_libdir}/libembeddedmil.so %changelog +* Fri Jun 25 2010 Sjoerd Mullender <sjo...@acm.org> - 4.38.1-20100625 +- Rebuilt. + * Tue Jun 22 2010 Sjoerd Mullender <sjo...@acm.org> - 4.38.1-20100622 - Rebuilt. diff -r 7f53bc7587ca -r 48b4be11fdf3 MonetDB4/debian/changelog --- a/MonetDB4/debian/changelog Mon Jun 28 06:23:17 2010 +0200 +++ b/MonetDB4/debian/changelog Mon Jun 28 09:44:16 2010 +0200 @@ -1,3 +1,9 @@ +monetdb4-server (4.38.1-20100625) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 25 Jun 2010 17:41:34 +0200 + monetdb4-server (4.38.1-20100622) unstable; urgency=low * Rebuilt. diff -r 7f53bc7587ca -r 48b4be11fdf3 MonetDB5/ChangeLog.Jun2010 --- a/MonetDB5/ChangeLog.Jun2010 Mon Jun 28 06:23:17 2010 +0200 +++ b/MonetDB5/ChangeLog.Jun2010 Mon Jun 28 09:44:16 2010 +0200 @@ -1,6 +1,3 @@ # ChangeLog file for MonetDB5 # This file is updated with Maddlog -* Wed Jun 23 2010 Sjoerd Mullender <sjo...@acm.org> -- When libxml2 is available, the XML module is automatically loaded. - diff -r 7f53bc7587ca -r 48b4be11fdf3 MonetDB5/MonetDB-server.spec --- a/MonetDB5/MonetDB-server.spec Mon Jun 28 06:23:17 2010 +0200 +++ b/MonetDB5/MonetDB-server.spec Mon Jun 28 09:44:16 2010 +0200 @@ -213,6 +213,12 @@ %{_libdir}/*.so %changelog +* Fri Jun 25 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.1-20100625 +- Rebuilt. + +* Wed Jun 23 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.1-20100625 +- When libxml2 is available, the XML module is automatically loaded. + * Tue Jun 22 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.1-20100622 - Rebuilt. diff -r 7f53bc7587ca -r 48b4be11fdf3 MonetDB5/debian/changelog --- a/MonetDB5/debian/changelog Mon Jun 28 06:23:17 2010 +0200 +++ b/MonetDB5/debian/changelog Mon Jun 28 09:44:16 2010 +0200 @@ -1,3 +1,15 @@ +monetdb5-server (5.20.1-20100625) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 25 Jun 2010 17:41:34 +0200 + +monetdb5-server (5.20.1-20100625) unstable; urgency=low + + * When libxml2 is available, the XML module is automatically loaded. + + -- Sjoerd Mullender <sjo...@acm.org> Wed, 23 Jun 2010 17:41:34 +0200 + monetdb5-server (5.20.1-20100622) unstable; urgency=low * Rebuilt. diff -r 7f53bc7587ca -r 48b4be11fdf3 clients/MonetDB-client.spec --- a/clients/MonetDB-client.spec Mon Jun 28 06:23:17 2010 +0200 +++ b/clients/MonetDB-client.spec Mon Jun 28 09:44:16 2010 +0200 @@ -301,6 +301,9 @@ %{_libdir}/MonetDB/Tests/* %changelog +* Fri Jun 25 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.1-20100625 +- Rebuilt. + * Tue Jun 22 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.1-20100622 - Rebuilt. diff -r 7f53bc7587ca -r 48b4be11fdf3 clients/debian/changelog --- a/clients/debian/changelog Mon Jun 28 06:23:17 2010 +0200 +++ b/clients/debian/changelog Mon Jun 28 09:44:16 2010 +0200 @@ -1,3 +1,9 @@ +monetdb-client (1.38.1-20100625) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 25 Jun 2010 17:41:34 +0200 + monetdb-client (1.38.1-20100622) unstable; urgency=low * Rebuilt. diff -r 7f53bc7587ca -r 48b4be11fdf3 clients/src/odbc/winsetup/MonetDB-ODBC-Installer/MonetDB-ODBC-Installer.vdproj --- a/clients/src/odbc/winsetup/MonetDB-ODBC-Installer/MonetDB-ODBC-Installer.vdproj Mon Jun 28 06:23:17 2010 +0200 +++ b/clients/src/odbc/winsetup/MonetDB-ODBC-Installer/MonetDB-ODBC-Installer.vdproj Mon Jun 28 09:44:16 2010 +0200 @@ -592,14 +592,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB ODBC Driver" - "ProductCode" = "8:{ABC2908A-E4BC-4AE0-99CB-B4E50E532ADE}" - "PackageCode" = "8:{5C6E03E0-06B7-4CEA-BD80-DEB0B6A799D2}" + "ProductCode" = "8:{8D3D872E-AAEB-4CC9-9C0A-B2AA780F3613}" + "PackageCode" = "8:{44A4BE04-6D51-47EF-BDAA-D147D5E2934F}" "UpgradeCode" = "8:{C1F69378-3F5C-4120-8224-32F07D3458F3}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:10.6.22" + "ProductVersion" = "8:10.6.25" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://monetdb.cwi.nl/" diff -r 7f53bc7587ca -r 48b4be11fdf3 clients/src/odbc/winsetup/MonetDB-ODBC-Installer64/MonetDB-ODBC-Installer.vdproj --- a/clients/src/odbc/winsetup/MonetDB-ODBC-Installer64/MonetDB-ODBC-Installer.vdproj Mon Jun 28 06:23:17 2010 +0200 +++ b/clients/src/odbc/winsetup/MonetDB-ODBC-Installer64/MonetDB-ODBC-Installer.vdproj Mon Jun 28 09:44:16 2010 +0200 @@ -592,14 +592,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB ODBC Driver" - "ProductCode" = "8:{FB49FD9A-1EB8-4250-BA6A-DD01D0C1DC6D}" - "PackageCode" = "8:{F8517467-5D5F-47ED-A869-C0309CAEAAB4}" + "ProductCode" = "8:{C1A3B0AF-9E7D-40FA-9624-145A019773AC}" + "PackageCode" = "8:{B39B2ABE-EA1C-4EF7-B1F6-D593903A840C}" "UpgradeCode" = "8:{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:10.6.22" + "ProductVersion" = "8:10.6.25" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://monetdb.cwi.nl/" diff -r 7f53bc7587ca -r 48b4be11fdf3 geom/MonetDB-geom.spec --- a/geom/MonetDB-geom.spec Mon Jun 28 06:23:17 2010 +0200 +++ b/geom/MonetDB-geom.spec Mon Jun 28 09:44:16 2010 +0200 @@ -172,6 +172,9 @@ %endif %changelog +* Fri Jun 25 2010 Sjoerd Mullender <sjo...@acm.org> - 0.18.1-20100625 +- Rebuilt. + * Tue Jun 22 2010 Sjoerd Mullender <sjo...@acm.org> - 0.18.1-20100622 - Rebuilt. diff -r 7f53bc7587ca -r 48b4be11fdf3 geom/NT/MonetDB5-Geom/MonetDB5-Geom-Module.vdproj --- a/geom/NT/MonetDB5-Geom/MonetDB5-Geom-Module.vdproj Mon Jun 28 06:23:17 2010 +0200 +++ b/geom/NT/MonetDB5-Geom/MonetDB5-Geom-Module.vdproj Mon Jun 28 09:44:16 2010 +0200 @@ -447,14 +447,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB5 SQL GIS Module" - "ProductCode" = "8:{E035BA85-73DB-4DCB-876E-852728BCD8D4}" - "PackageCode" = "8:{63A75461-258B-44A4-9A96-CD5C26CABC5E}" + "ProductCode" = "8:{A057677F-55B9-45D4-A966-A855347665F1}" + "PackageCode" = "8:{514614EE-78E5-47AE-BB11-9B06F5A45D19}" "UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:10.6.22" + "ProductVersion" = "8:10.6.25" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://monetdb.cwi.nl/" diff -r 7f53bc7587ca -r 48b4be11fdf3 geom/NT/MonetDB5-Geom64/MonetDB5-Geom-Module.vdproj --- a/geom/NT/MonetDB5-Geom64/MonetDB5-Geom-Module.vdproj Mon Jun 28 06:23:17 2010 +0200 +++ b/geom/NT/MonetDB5-Geom64/MonetDB5-Geom-Module.vdproj Mon Jun 28 09:44:16 2010 +0200 @@ -447,14 +447,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB5 SQL GIS Module" - "ProductCode" = "8:{C9DC069B-8213-464E-8502-183C9D6E6605}" - "PackageCode" = "8:{BFBFF42B-FF89-4DEF-86C3-182D961FA230}" + "ProductCode" = "8:{AA7708D3-1E95-48BB-BCB3-7BDF5321FE84}" + "PackageCode" = "8:{F950589E-12C6-42F6-A053-DC8F917A506C}" "UpgradeCode" = "8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:10.6.22" + "ProductVersion" = "8:10.6.25" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://monetdb.cwi.nl/" diff -r 7f53bc7587ca -r 48b4be11fdf3 geom/debian/changelog --- a/geom/debian/changelog Mon Jun 28 06:23:17 2010 +0200 +++ b/geom/debian/changelog Mon Jun 28 09:44:16 2010 +0200 @@ -1,3 +1,9 @@ +monetdb-geom (0.18.1-20100625) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 25 Jun 2010 17:41:34 +0200 + monetdb-geom (0.18.1-20100622) unstable; urgency=low * Rebuilt. diff -r 7f53bc7587ca -r 48b4be11fdf3 pathfinder/MonetDB-XQuery.spec --- a/pathfinder/MonetDB-XQuery.spec Mon Jun 28 06:23:17 2010 +0200 +++ b/pathfinder/MonetDB-XQuery.spec Mon Jun 28 09:44:16 2010 +0200 @@ -138,6 +138,9 @@ %{_bindir}/monetdb-xquery-config %changelog +* Fri Jun 25 2010 Sjoerd Mullender <sjo...@acm.org> - 0.38.1-20100625 +- Rebuilt. + * Tue Jun 22 2010 Sjoerd Mullender <sjo...@acm.org> - 0.38.1-20100622 - Rebuilt. diff -r 7f53bc7587ca -r 48b4be11fdf3 pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj --- a/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj Mon Jun 28 06:23:17 2010 +0200 +++ b/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj Mon Jun 28 09:44:16 2010 +0200 @@ -4246,14 +4246,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB4" - "ProductCode" = "8:{DF6DFF30-77D4-4A01-BC9F-E061DF25486B}" - "PackageCode" = "8:{6D9A6078-895A-4ACB-A01E-A362C68BBED4}" + "ProductCode" = "8:{D288557E-4374-4358-AC97-48C846514826}" + "PackageCode" = "8:{C8C66D9C-0E2C-42A8-8A5C-DD5AD2221345}" "UpgradeCode" = "8:{4F980AC7-863E-4C5E-A3BF-138F9DEDDB8A}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:10.6.22" + "ProductVersion" = "8:10.6.25" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://monetdb.cwi.nl/" diff -r 7f53bc7587ca -r 48b4be11fdf3 pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj --- a/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj Mon Jun 28 06:23:17 2010 +0200 +++ b/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj Mon Jun 28 09:44:16 2010 +0200 @@ -4214,14 +4214,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB4" - "ProductCode" = "8:{D1144867-3F41-46E8-82EC-3CF268D4CD3C}" - "PackageCode" = "8:{D5E7A113-0404-4017-B4B2-F402AA8959C8}" + "ProductCode" = "8:{4C165EBD-2CAB-4850-B623-830D40EC5245}" + "PackageCode" = "8:{12A4D0D8-F4D1-4153-88DA-5E865B4C0363}" "UpgradeCode" = "8:{AE963DBC-EE5D-4FCB-AAFD-37FED2302241}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:10.6.22" + "ProductVersion" = "8:10.6.25" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://monetdb.cwi.nl/" diff -r 7f53bc7587ca -r 48b4be11fdf3 pathfinder/debian/changelog --- a/pathfinder/debian/changelog Mon Jun 28 06:23:17 2010 +0200 +++ b/pathfinder/debian/changelog Mon Jun 28 09:44:16 2010 +0200 _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list