Bug 295235 part firefox-windows : remove remaining contents.rdf r=mconnor a=shaver

browser/extensions/package-fixup/jar.mn

@@ -1,11 +0,0 @@
-classic.jar:
-        skin/classic/communicator/profile/migrate.gif                         (../../../themes/classic/communicator/profile/migrate.gif)
-        skin/classic/communicator/profile/profile.css                         (../../../themes/classic/communicator/profile/profile.css)
-        skin/classic/communicator/profile/profileManager.css                  (../../../themes/classic/communicator/profile/profileManager.css)
-        skin/classic/communicator/profile/profileicon-large.gif               (../../../themes/classic/communicator/profile/profileicon-large.gif)
-        skin/classic/communicator/communicator.css
-*       skin/classic/communicator/contents.rdf                                (../../../themes/classic/communicator/contents.rdf)
-        skin/classic/global/plugins.css                                       (../../../themes/classic/global/plugins.css)
-
-toolkit.jar:
-        content/global/plugins.html                                           (../../../xpfe/global/resources/content/plugins.html)

browser/installer/windows/browser.jst

@@ -526,19 +526,10 @@ if(verifyDiskSpace(fProgram, srDest))
 
     // register chrome. Most chrome is in .manifest files now, as we migrate
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome", "classic.jar"), "skin/classic/browser/");
-    registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome", "classic.jar"), "skin/classic/mozapps/");
     
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/autoconfig/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/wallet/");
 
-    registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"),"skin/classic/global/");
-    registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"),"skin/classic/help/");
-
-    // XXXben Stuff that will become obsolete
-    registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"),"skin/classic/navigator/");
-
-    registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"),"skin/classic/communicator/");
-
     // Create the uninstall folder. 
     err = File.dirCreate(getFolder("Program", "uninstall"));
     logComment("dirCreate() of Program/uninstall returned: " + err);

browser/installer/windows/packages-static

@@ -197,6 +197,7 @@ bin\components\update.xpt
 bin\chrome\browser.jar
 bin\chrome\browser.manifest
 bin\chrome\classic.jar
+bin\chrome\classic.manifest
 bin\extensions\{972ce4c6-7e08-4474-a285-3208198ce6fd}\install.rdf
 bin\chrome\comm.jar
 bin\chrome\comm.manifest

toolkit/themes/winstripe/communicator/jar.mn

@@ -1,3 +0,0 @@
-classic.jar:
-        skin/classic/communicator/communicator.css
-        skin/classic/communicator/contents.rdf

toolkit/themes/winstripe/global/jar.mn

@@ -1,4 +1,5 @@
 classic.jar:
+% skin global classic/1.0 %skin/classic/global/
         skin/classic/global/arrow.css
         skin/classic/global/autocomplete.css
         skin/classic/global/browser.css
@@ -6,7 +7,6 @@ classic.jar:
         skin/classic/global/checkbox.css
         skin/classic/global/colorpicker.css
         skin/classic/global/config.css
-        skin/classic/global/contents.rdf
         skin/classic/global/customizeToolbar.css
         skin/classic/global/dialog.css
         skin/classic/global/expander.css

toolkit/themes/winstripe/help/jar.mn

@@ -1,5 +1,5 @@
 classic.jar:
-* skin/classic/help/contents.rdf
+% skin help classic/1.0 %skin/classic/help/
   skin/classic/help/help.css
   skin/classic/help/Toolbar.png
 * skin/classic/help/helpFileLayout.css

toolkit/themes/winstripe/mozapps/jar.mn

@@ -1,5 +1,5 @@
 classic.jar:
-        skin/classic/mozapps/contents.rdf
+% skin mozapps classic/1.0 %skin/classic/mozapps/
         skin/classic/mozapps/downloads/downloadIcon.png               (downloads/downloadIcon.png)
         skin/classic/mozapps/downloads/downloadCleanup.png            (downloads/downloadCleanup.png)
         skin/classic/mozapps/downloads/downloadCleanupDisabled.png            (downloads/downloadCleanupDisabled.png)