Changeset: 24c4d5e6120d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=24c4d5e6120d 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 from Jun2010 branch: Preparations for building the Jun2010 release. diffs (truncated from 470 to 300 lines): diff -r eeae4a0a1d16 -r 24c4d5e6120d MonetDB/MonetDB.spec --- a/MonetDB/MonetDB.spec Tue Jun 22 13:28:29 2010 +0200 +++ b/MonetDB/MonetDB.spec Tue Jun 22 14:54:19 2010 +0200 @@ -26,7 +26,7 @@ Group: Applications/Databases License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html URL: http://monetdb.cwi.nl/ -Source: http://downloads.sourceforge.net/monetdb/%{name}-%{version}.tar.gz +Source: http://dev.monetdb.org/downloads/sources/Jun2010/%{name}-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: zlib-devel, bzip2-devel, openssl-devel @@ -106,6 +106,9 @@ %{_libdir}/libbat.so %changelog +* Tue Jun 22 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.1-20100622 +- Rebuilt. + * Fri Jun 18 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.1-20100618 - Rebuilt. diff -r eeae4a0a1d16 -r 24c4d5e6120d MonetDB/debian/changelog --- a/MonetDB/debian/changelog Tue Jun 22 13:28:29 2010 +0200 +++ b/MonetDB/debian/changelog Tue Jun 22 14:54:19 2010 +0200 @@ -1,3 +1,9 @@ +monetdb (1.38.1-20100622) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 22 Jun 2010 14:39:07 +0200 + monetdb (1.38.1-20100618) unstable; urgency=low * Rebuilt. diff -r eeae4a0a1d16 -r 24c4d5e6120d MonetDB4/MonetDB-server.spec --- a/MonetDB4/MonetDB-server.spec Tue Jun 22 13:28:29 2010 +0200 +++ b/MonetDB4/MonetDB-server.spec Tue Jun 22 14:54:19 2010 +0200 @@ -26,7 +26,7 @@ Group: Applications/Databases License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html URL: http://monetdb.cwi.nl/ -Source: http://downloads.sourceforge.net/monetdb/MonetDB4-server-%{version}.tar.gz +Source: http://dev.monetdb.org/downloads/sources/Jun2010/MonetDB4-server-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires(pre): shadow-utils @@ -216,6 +216,9 @@ %{_libdir}/libembeddedmil.so %changelog +* Tue Jun 22 2010 Sjoerd Mullender <sjo...@acm.org> - 4.38.1-20100622 +- Rebuilt. + * Fri Jun 18 2010 Sjoerd Mullender <sjo...@acm.org> - 4.38.1-20100618 - Rebuilt. diff -r eeae4a0a1d16 -r 24c4d5e6120d MonetDB4/debian/changelog --- a/MonetDB4/debian/changelog Tue Jun 22 13:28:29 2010 +0200 +++ b/MonetDB4/debian/changelog Tue Jun 22 14:54:19 2010 +0200 @@ -1,3 +1,9 @@ +monetdb4-server (4.38.1-20100622) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 22 Jun 2010 14:39:07 +0200 + monetdb4-server (4.38.1-20100618) unstable; urgency=low * Rebuilt. diff -r eeae4a0a1d16 -r 24c4d5e6120d MonetDB5/MonetDB-server.spec --- a/MonetDB5/MonetDB-server.spec Tue Jun 22 13:28:29 2010 +0200 +++ b/MonetDB5/MonetDB-server.spec Tue Jun 22 14:54:19 2010 +0200 @@ -26,7 +26,7 @@ Group: Applications/Databases License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html URL: http://monetdb.cwi.nl/ -Source: http://downloads.sourceforge.net/monetdb/MonetDB5-server-%{version}.tar.gz +Source: http://dev.monetdb.org/downloads/sources/Jun2010/MonetDB5-server-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %{!?_with_raptor: %{!?_without_raptor: %define _with_raptor --with-raptor}} @@ -213,6 +213,9 @@ %{_libdir}/*.so %changelog +* Tue Jun 22 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.1-20100622 +- Rebuilt. + * Fri Jun 18 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.1-20100618 - Rebuilt. diff -r eeae4a0a1d16 -r 24c4d5e6120d MonetDB5/debian/changelog --- a/MonetDB5/debian/changelog Tue Jun 22 13:28:29 2010 +0200 +++ b/MonetDB5/debian/changelog Tue Jun 22 14:54:19 2010 +0200 @@ -1,3 +1,9 @@ +monetdb5-server (5.20.1-20100622) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 22 Jun 2010 14:39:07 +0200 + monetdb5-server (5.20.1-20100618) unstable; urgency=low * Rebuilt. diff -r eeae4a0a1d16 -r 24c4d5e6120d clients/MonetDB-client.spec --- a/clients/MonetDB-client.spec Tue Jun 22 13:28:29 2010 +0200 +++ b/clients/MonetDB-client.spec Tue Jun 22 14:54:19 2010 +0200 @@ -26,7 +26,7 @@ Group: Applications/Databases License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html URL: http://monetdb.cwi.nl/ -Source: http://downloads.sourceforge.net/monetdb/MonetDB-client-%{version}.tar.gz +Source: http://dev.monetdb.org/downloads/sources/Jun2010/MonetDB-client-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires: MonetDB >= 1.38 @@ -301,6 +301,9 @@ %{_libdir}/MonetDB/Tests/* %changelog +* Tue Jun 22 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.1-20100622 +- Rebuilt. + * Fri Jun 18 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.1-20100618 - Rebuilt. diff -r eeae4a0a1d16 -r 24c4d5e6120d clients/debian/changelog --- a/clients/debian/changelog Tue Jun 22 13:28:29 2010 +0200 +++ b/clients/debian/changelog Tue Jun 22 14:54:19 2010 +0200 @@ -1,3 +1,9 @@ +monetdb-client (1.38.1-20100622) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 22 Jun 2010 14:39:07 +0200 + monetdb-client (1.38.1-20100618) unstable; urgency=low * Rebuilt. diff -r eeae4a0a1d16 -r 24c4d5e6120d clients/src/odbc/winsetup/MonetDB-ODBC-Installer/MonetDB-ODBC-Installer.vdproj --- a/clients/src/odbc/winsetup/MonetDB-ODBC-Installer/MonetDB-ODBC-Installer.vdproj Tue Jun 22 13:28:29 2010 +0200 +++ b/clients/src/odbc/winsetup/MonetDB-ODBC-Installer/MonetDB-ODBC-Installer.vdproj Tue Jun 22 14:54:19 2010 +0200 @@ -592,14 +592,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB ODBC Driver" - "ProductCode" = "8:{3B278EEC-AF3E-447F-881F-6C5B0D4279DF}" - "PackageCode" = "8:{914FD2F3-0C4E-4691-B7B8-ED9600E7CD80}" + "ProductCode" = "8:{ABC2908A-E4BC-4AE0-99CB-B4E50E532ADE}" + "PackageCode" = "8:{5C6E03E0-06B7-4CEA-BD80-DEB0B6A799D2}" "UpgradeCode" = "8:{C1F69378-3F5C-4120-8224-32F07D3458F3}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:10.6.18" + "ProductVersion" = "8:10.6.22" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://monetdb.cwi.nl/"; diff -r eeae4a0a1d16 -r 24c4d5e6120d clients/src/odbc/winsetup/MonetDB-ODBC-Installer64/MonetDB-ODBC-Installer.vdproj --- a/clients/src/odbc/winsetup/MonetDB-ODBC-Installer64/MonetDB-ODBC-Installer.vdproj Tue Jun 22 13:28:29 2010 +0200 +++ b/clients/src/odbc/winsetup/MonetDB-ODBC-Installer64/MonetDB-ODBC-Installer.vdproj Tue Jun 22 14:54:19 2010 +0200 @@ -592,14 +592,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB ODBC Driver" - "ProductCode" = "8:{5C7D37BF-20C1-4A92-B7A0-85A2C02BBD52}" - "PackageCode" = "8:{06CBC873-9582-4899-9CAE-DB1F95F03842}" + "ProductCode" = "8:{FB49FD9A-1EB8-4250-BA6A-DD01D0C1DC6D}" + "PackageCode" = "8:{F8517467-5D5F-47ED-A869-C0309CAEAAB4}" "UpgradeCode" = "8:{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:10.6.18" + "ProductVersion" = "8:10.6.22" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://monetdb.cwi.nl/"; diff -r eeae4a0a1d16 -r 24c4d5e6120d geom/MonetDB-geom.spec --- a/geom/MonetDB-geom.spec Tue Jun 22 13:28:29 2010 +0200 +++ b/geom/MonetDB-geom.spec Tue Jun 22 14:54:19 2010 +0200 @@ -26,7 +26,7 @@ Group: Applications/Databases License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html URL: http://monetdb.cwi.nl/ -Source: http://downloads.sourceforge.net/monetdb/MonetDB-geom-%{version}.tar.gz +Source: http://dev.monetdb.org/downloads/sources/Jun2010/MonetDB-geom-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %{!?_with_monetdb4: %{!?_without_monetdb4: %define _without_monetdb4 --without-monetdb4}} @@ -172,6 +172,9 @@ %endif %changelog +* Tue Jun 22 2010 Sjoerd Mullender <sjo...@acm.org> - 0.18.1-20100622 +- Rebuilt. + * Fri Jun 18 2010 Sjoerd Mullender <sjo...@acm.org> - 0.18.1-20100618 - Rebuilt. diff -r eeae4a0a1d16 -r 24c4d5e6120d geom/NT/MonetDB5-Geom/MonetDB5-Geom-Module.vdproj --- a/geom/NT/MonetDB5-Geom/MonetDB5-Geom-Module.vdproj Tue Jun 22 13:28:29 2010 +0200 +++ b/geom/NT/MonetDB5-Geom/MonetDB5-Geom-Module.vdproj Tue Jun 22 14:54:19 2010 +0200 @@ -447,14 +447,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB5 SQL GIS Module" - "ProductCode" = "8:{269A6FCF-19C0-40A7-A26F-4ECC03F3EC5E}" - "PackageCode" = "8:{376F5173-936A-4DFE-92DF-2479F1DAF063}" + "ProductCode" = "8:{E035BA85-73DB-4DCB-876E-852728BCD8D4}" + "PackageCode" = "8:{63A75461-258B-44A4-9A96-CD5C26CABC5E}" "UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:10.6.18" + "ProductVersion" = "8:10.6.22" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://monetdb.cwi.nl/"; diff -r eeae4a0a1d16 -r 24c4d5e6120d geom/NT/MonetDB5-Geom64/MonetDB5-Geom-Module.vdproj --- a/geom/NT/MonetDB5-Geom64/MonetDB5-Geom-Module.vdproj Tue Jun 22 13:28:29 2010 +0200 +++ b/geom/NT/MonetDB5-Geom64/MonetDB5-Geom-Module.vdproj Tue Jun 22 14:54:19 2010 +0200 @@ -447,14 +447,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB5 SQL GIS Module" - "ProductCode" = "8:{0217C91F-19F0-4478-8C9E-2B07436F399F}" - "PackageCode" = "8:{A645DE2C-2DEA-43C9-9245-453601931F32}" + "ProductCode" = "8:{C9DC069B-8213-464E-8502-183C9D6E6605}" + "PackageCode" = "8:{BFBFF42B-FF89-4DEF-86C3-182D961FA230}" "UpgradeCode" = "8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:10.6.18" + "ProductVersion" = "8:10.6.22" "Manufacturer" = "8:MonetDB" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://monetdb.cwi.nl/"; diff -r eeae4a0a1d16 -r 24c4d5e6120d geom/debian/changelog --- a/geom/debian/changelog Tue Jun 22 13:28:29 2010 +0200 +++ b/geom/debian/changelog Tue Jun 22 14:54:19 2010 +0200 @@ -1,3 +1,9 @@ +monetdb-geom (0.18.1-20100622) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 22 Jun 2010 14:39:07 +0200 + monetdb-geom (0.18.1-20100618) unstable; urgency=low * Rebuilt. diff -r eeae4a0a1d16 -r 24c4d5e6120d pathfinder/MonetDB-XQuery.spec --- a/pathfinder/MonetDB-XQuery.spec Tue Jun 22 13:28:29 2010 +0200 +++ b/pathfinder/MonetDB-XQuery.spec Tue Jun 22 14:54:19 2010 +0200 @@ -21,7 +21,7 @@ Group: Applications/Databases License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html URL: http://monetdb.cwi.nl/ -Source: http://downloads.sourceforge.net/monetdb/MonetDB-XQuery-%{version}.tar.gz +Source: http://dev.monetdb.org/downloads/sources/Jun2010/MonetDB-XQuery-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires: MonetDB4-server >= 4.38 @@ -138,6 +138,9 @@ %{_bindir}/monetdb-xquery-config %changelog +* Tue Jun 22 2010 Sjoerd Mullender <sjo...@acm.org> - 0.38.1-20100622 +- Rebuilt. + * Fri Jun 18 2010 Sjoerd Mullender <sjo...@acm.org> - 0.38.1-20100618 - Rebuilt. diff -r eeae4a0a1d16 -r 24c4d5e6120d pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj --- a/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj Tue Jun 22 13:28:29 2010 +0200 +++ b/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj Tue Jun 22 14:54:19 2010 +0200 @@ -4246,14 +4246,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MonetDB4" - "ProductCode" = "8:{DBAAA257-362C-40BA-94A8-AA588D9D424E}" - "PackageCode" = "8:{2629BE4E-4F1F-4A6A-989C-252F6266CD1E}" + "ProductCode" = "8:{DF6DFF30-77D4-4A01-BC9F-E061DF25486B}" + "PackageCode" = "8:{6D9A6078-895A-4ACB-A01E-A362C68BBED4}" "UpgradeCode" = "8:{4F980AC7-863E-4C5E-A3BF-138F9DEDDB8A}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:10.6.18" + "ProductVersion" = "8:10.6.22" "Manufacturer" = "8:MonetDB" _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
