[ros-diffs] [dreimer] 31671: Revert Manifest Commits due to popular demand. They will be Autogenerated by RBuild in the Future.

Author: dreimer
Date: Tue Jan  8 19:12:49 2008
New Revision: 31671

URL: http://svn.reactos.org/svn/reactos?rev=31671&view=rev
Log:
Revert Manifest Commits due to popular demand. They will be Autogenerated by RBuild in the
Future.

Removed:
    trunk/rosapps/applications/screensavers/butterflies/manifest.xml
    trunk/rosapps/applications/screensavers/matrix/manifest.xml
    trunk/rosapps/magnify/manifest.xml
Modified:
    trunk/rosapps/applications/screensavers/butterflies/butterflies.rc
    trunk/rosapps/applications/screensavers/matrix/rsrc.rc
    trunk/rosapps/imagesoft/manifest.xml
    trunk/rosapps/magnify/magnify.rc
    trunk/rosapps/old_wordpad/manifest.xml
    trunk/rosapps/roscalc/manifest.xml

Modified: trunk/rosapps/applications/screensavers/butterflies/butterflies.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/…
==============================================================================
--- trunk/rosapps/applications/screensavers/butterflies/butterflies.rc (original)
+++ trunk/rosapps/applications/screensavers/butterflies/butterflies.rc Tue Jan  8 19:12:49
2008
@@ -7,9 +7,6 @@
 #define REACTOS_STR_FILE_DESCRIPTION    "Butterflies ScreenSaver\0"
 #define REACTOS_STR_INTERNAL_NAME       "butterflies\0"
 #define REACTOS_STR_ORIGINAL_FILENAME   "butterflies.scr\0"
-
-1 24 DISCARDABLE "manifest.xml"
-
 #include <reactos/version.rc>
 
 IDB_BUTTERFLY1   BITMAP   "res/butterfly1.bmp"

Removed: trunk/rosapps/applications/screensavers/butterflies/manifest.xml
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/…
==============================================================================
--- trunk/rosapps/applications/screensavers/butterflies/manifest.xml (original)
+++ trunk/rosapps/applications/screensavers/butterflies/manifest.xml (removed)
@@ -1,24 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"
standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1"
manifestVersion="1.0">
- <assemblyIdentity
-  version="1.0.0.0"
-  processorArchitecture="X86"
-  name="ReactOS.Application.Butterflies"
-  type="win32"
- />
- <description>ReactOS Butterflies Screensaver</description>
- <dependency>
-  <dependentAssembly>
-   <assemblyIdentity
-    type="win32"
-    name="Microsoft.Windows.Common-Controls"
-    version="6.0.0.0"
-    processorArchitecture="X86"
-    publicKeyToken="6595b64144ccf1df"
-    language="*"
-   />
-  </dependentAssembly>
- </dependency>
-</assembly>
-
-<!-- EOF -->

Removed: trunk/rosapps/applications/screensavers/matrix/manifest.xml
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/…
==============================================================================
--- trunk/rosapps/applications/screensavers/matrix/manifest.xml (original)
+++ trunk/rosapps/applications/screensavers/matrix/manifest.xml (removed)
@@ -1,24 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"
standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1"
manifestVersion="1.0">
- <assemblyIdentity
-  version="1.0.0.0"
-  processorArchitecture="X86"
-  name="ReactOS.Application.Matrix"
-  type="win32"
- />
- <description>ReactOS Matrix Screensaver</description>
- <dependency>
-  <dependentAssembly>
-   <assemblyIdentity
-    type="win32"
-    name="Microsoft.Windows.Common-Controls"
-    version="6.0.0.0"
-    processorArchitecture="X86"
-    publicKeyToken="6595b64144ccf1df"
-    language="*"
-   />
-  </dependentAssembly>
- </dependency>
-</assembly>
-
-<!-- EOF -->

Modified: trunk/rosapps/applications/screensavers/matrix/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/…
==============================================================================
--- trunk/rosapps/applications/screensavers/matrix/rsrc.rc (original)
+++ trunk/rosapps/applications/screensavers/matrix/rsrc.rc Tue Jan  8 19:12:49 2008
@@ -6,8 +6,6 @@
 IDB_BITMAP1      BITMAP  DISCARDABLE  "matrix.bmp"
 IDC_BLANKCURSOR  CURSOR  DISCARDABLE  "cursor1.cur"
 IDI_ICON1        ICON    DISCARDABLE  "icon1.ico"
-
-1 24 DISCARDABLE "manifest.xml"
 
 #include "lang/bg-BG.rc"
 #include "lang/de-DE.rc"

Modified: trunk/rosapps/imagesoft/manifest.xml
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/imagesoft/manifest.xml?rev…
==============================================================================
--- trunk/rosapps/imagesoft/manifest.xml (original)
+++ trunk/rosapps/imagesoft/manifest.xml Tue Jan  8 19:12:49 2008
@@ -3,10 +3,10 @@
  <assemblyIdentity
   version="1.0.0.0"
   processorArchitecture="X86"
-  name="ReactOS.Application.ImageSoft"
+  name="ReactOS.VMware.SVGA.Installer"
   type="win32"
  />
- <description>ReactOS ImageSoft</description>
+ <description>ReactOS VMware(r) SVGA driver Installer</description>
  <dependency>
   <dependentAssembly>
    <assemblyIdentity

Modified: trunk/rosapps/magnify/magnify.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/magnify.rc?rev=316…
==============================================================================
--- trunk/rosapps/magnify/magnify.rc (original)
+++ trunk/rosapps/magnify/magnify.rc Tue Jan  8 19:12:49 2008
@@ -10,8 +10,6 @@
 
 #include <reactos/version.rc>
 
-1 24 DISCARDABLE "manifest.xml"
-
 IDI_ICON ICON "res/magnify.ico"
 
 #include "rsrc.rc"

Removed: trunk/rosapps/magnify/manifest.xml
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/manifest.xml?rev=3…
==============================================================================
--- trunk/rosapps/magnify/manifest.xml (original)
+++ trunk/rosapps/magnify/manifest.xml (removed)
@@ -1,24 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"
standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1"
manifestVersion="1.0">
- <assemblyIdentity
-  version="1.0.0.0"
-  processorArchitecture="X86"
-  name="ReactOS.Application.Magnify"
-  type="win32"
- />
- <description>ReactOS Magnifier</description>
- <dependency>
-  <dependentAssembly>
-   <assemblyIdentity
-    type="win32"
-    name="Microsoft.Windows.Common-Controls"
-    version="6.0.0.0"
-    processorArchitecture="X86"
-    publicKeyToken="6595b64144ccf1df"
-    language="*"
-   />
-  </dependentAssembly>
- </dependency>
-</assembly>
-
-<!-- EOF -->

Modified: trunk/rosapps/old_wordpad/manifest.xml
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/old_wordpad/manifest.xml?r…
==============================================================================
--- trunk/rosapps/old_wordpad/manifest.xml (original)
+++ trunk/rosapps/old_wordpad/manifest.xml Tue Jan  8 19:12:49 2008
@@ -3,10 +3,10 @@
  <assemblyIdentity
   version="1.0.0.0"
   processorArchitecture="X86"
-  name="ReactOS.Application.WordPad"
+  name="ReactOS.VMware.SVGA.Installer"
   type="win32"
  />
- <description>ReactOS Word Pad</description>
+ <description>ReactOS VMware(r) SVGA driver Installer</description>
  <dependency>
   <dependentAssembly>
    <assemblyIdentity

Modified: trunk/rosapps/roscalc/manifest.xml
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/roscalc/manifest.xml?rev=3…
==============================================================================
--- trunk/rosapps/roscalc/manifest.xml (original)
+++ trunk/rosapps/roscalc/manifest.xml Tue Jan  8 19:12:49 2008
@@ -3,7 +3,7 @@
   xmlns="urn:schemas-microsoft-com:asm.v1"
   manifestVersion="1.0">
 <assemblyIdentity
-    name="ReactOS.Application.Calculator"
+    name="Win32 Application.default.App"
     processorArchitecture="x86"
     version="1.0.0.0"
     type="win32"/>