Update of /cvsroot/monetdb/sql/NT/MonetDB5-SQL64
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5178/NT/MonetDB5-SQL64

Modified Files:
        MonetDB5-SQL-Installer.vdproj 
Log Message:
propagated changes of Monday Jun 16 2008 - Tuesday Jun 17 2008
from the SQL_2-24 branch to the development trunk

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/16 - sjoerd:
        
NT/MonetDB4-SQL/MonetDB4-SQL-Installer.vdproj,1.11.2.4(SQL_2-24,SQL_2-24-0,Stable_DailyBuild-17)
        
NT/MonetDB4-SQL64/MonetDB4-SQL-Installer.vdproj,1.6.2.5(SQL_2-24,SQL_2-24-0,Stable_DailyBuild-17)
        
NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj,1.19.2.4(SQL_2-24,SQL_2-24-0,Stable_DailyBuild-17)
        
NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj,1.9.2.4(SQL_2-24,SQL_2-24-0,Stable_DailyBuild-17)
Removed JDBC .jar files.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/16 - mr-meltdown:
        src/jdbc/tests/Tests/Test.SQL.bat,1.6.4.1(SQL_2-24,Stable_DailyBuild-17)
Update JDBC version number.  Not updating the windows installers since
they are changed not to install Java jars any more.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/16 - sjoerd:
        MonetDB-SQL.spec.in,1.63.2.4(SQL_2-24,Stable_DailyBuild-17)
Split off a devel4 subpackage that is for M4 development so that devel does not 
depend on any M4 RPMs.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


Index: MonetDB5-SQL-Installer.vdproj
===================================================================
RCS file: /cvsroot/monetdb/sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- MonetDB5-SQL-Installer.vdproj       13 Jun 2008 12:49:01 -0000      1.12
+++ MonetDB5-SQL-Installer.vdproj       16 Jun 2008 23:37:57 -0000      1.13
@@ -243,12 +243,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_3BB3996E3E4D4A64B574C39D8398AB69"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_3BC19487680D4FDABB2C736F2E431A70"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -363,12 +357,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_4E67A17847DB460D885B52FAF4D3E98F"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_52DCEC5806254D3F9246489B9C5DFC27"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -537,6 +525,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_7A6E7E035B654788B243F471A6CFF70F"
+        "OwnerKey" = "8:_819BD8650A494CC68BD064E23EF621BB"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_7A762E667CA348CAA05E4432DC354DE6"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -777,12 +771,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_9C95D4DFECBA4E6192EE9140A5B8C4BC"
-        "OwnerKey" = "8:_819BD8650A494CC68BD064E23EF621BB"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_9E62377AFDFB43ECA8B9DA0B6EA1678E"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -921,12 +909,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_B6272A5B57554740B2643F699C989B51"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_B7E9CC0A0B17444E94301D5CEC46BA76"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -2139,26 +2121,6 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3BB3996E3E4D4A64B574C39D8398AB69"
-            {
-            "SourcePath" = "8:share\\MonetDB\\lib\\jdbcclient.jar"
-            "TargetName" = "8:jdbcclient.jar"
-            "Tag" = "8:"
-            "Folder" = "8:_2E7A7A2A3AA7443EB1803999F76D6C26"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
-            "IsolateTo" = "8:"
-            }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3BC19487680D4FDABB2C736F2E431A70"
             {
             "SourcePath" = "8:Lib\\MonetDB5\\sql_bpm.mal"
@@ -2539,26 +2501,6 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4E67A17847DB460D885B52FAF4D3E98F"
-            {
-            "SourcePath" = "8:share\\MonetDB\\lib\\monetdb-1.7-jdbc.jar"
-            "TargetName" = "8:monetdb-1.7-jdbc.jar"
-            "Tag" = "8:"
-            "Folder" = "8:_2E7A7A2A3AA7443EB1803999F76D6C26"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
-            "IsolateTo" = "8:"
-            }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_52DCEC5806254D3F9246489B9C5DFC27"
             {
             "SourcePath" = "8:C:\\Program Files\\PCRE\\bin\\pcre.dll"
@@ -4359,26 +4301,6 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B6272A5B57554740B2643F699C989B51"
-            {
-            "SourcePath" = "8:share\\MonetDB\\lib\\monetdb-1.3-mcl.jar"
-            "TargetName" = "8:monetdb-1.3-mcl.jar"
-            "Tag" = "8:"
-            "Folder" = "8:_2E7A7A2A3AA7443EB1803999F76D6C26"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
-            "IsolateTo" = "8:"
-            }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B7E9CC0A0B17444E94301D5CEC46BA76"
             {
             "SourcePath" = "8:Lib\\MonetDB5\\batcolor.mal"
@@ -5752,17 +5674,6 @@
                                         {
                                         }
                                     }
-                                    
"{9EF0B969-E518-4E46-987F-47570745A589}:_2E7A7A2A3AA7443EB1803999F76D6C26"
-                                    {
-                                    "Name" = "8:lib"
-                                    "AlwaysCreate" = "11:FALSE"
-                                    "Condition" = "8:"
-                                    "Transitive" = "11:FALSE"
-                                    "Property" = 
"8:_71648C6794BF493D92B9E2F353CCED56"
-                                        "Folders"
-                                        {
-                                        }
-                                    }
                                     
"{9EF0B969-E518-4E46-987F-47570745A589}:_7FBFE910168F4B7C817DFA594E7BB44E"
                                     {
                                     "Name" = "8:python"
@@ -6481,11 +6392,11 @@
         }
         "MergeModule"
         {
-            
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_819BD8650A494CC68BD064E23EF621BB"
+            
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_7A6E7E035B654788B243F471A6CFF70F"
             {
             "UseDynamicProperties" = "11:TRUE"
-            "IsDependency" = "11:FALSE"
-            "SourcePath" = "8:C:\\Program Files (x86)\\Common Files\\Merge 
Modules\\Microsoft_VC80_CRT_x86_x64.msm"
+            "IsDependency" = "11:TRUE"
+            "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86_x64.msm"
                 "Properties"
                 {
                 }
@@ -6495,11 +6406,11 @@
             "Feature" = "8:"
             "IsolateTo" = "8:"
             }
-            
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_9C95D4DFECBA4E6192EE9140A5B8C4BC"
+            
"{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_819BD8650A494CC68BD064E23EF621BB"
             {
             "UseDynamicProperties" = "11:TRUE"
-            "IsDependency" = "11:TRUE"
-            "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86_x64.msm"
+            "IsDependency" = "11:FALSE"
+            "SourcePath" = "8:C:\\Program Files (x86)\\Common Files\\Merge 
Modules\\Microsoft_VC80_CRT_x86_x64.msm"
                 "Properties"
                 {
                 }


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to