SOURCES: iceape-branding.patch, iceweasel-branding.patch, icedove-branding....

hawk hawk at pld-linux.org
Tue Jul 29 15:47:29 CEST 2008 

Author: hawk                         Date: Tue Jul 29 13:47:29 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use original application names in URLs to *.mozilla.{com,org}

---- Files affected:
SOURCES:
   iceape-branding.patch (1.2 -> 1.3) , iceweasel-branding.patch (1.3 -> 1.4) , icedove-branding.patch (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SOURCES/iceape-branding.patch
diff -u SOURCES/iceape-branding.patch:1.2 SOURCES/iceape-branding.patch:1.3
--- SOURCES/iceape-branding.patch:1.2	Thu Jun 26 10:10:26 2008
+++ SOURCES/iceape-branding.patch	Tue Jul 29 15:47:22 2008
@@ -1,6 +1,6 @@
 diff -urN mozilla.orig/configure mozilla/configure
---- mozilla.orig/configure	2008-06-24 12:57:29.000000000 +0200
-+++ mozilla/configure	2008-06-24 21:16:45.000000000 +0200
+--- mozilla.orig/configure	2008-07-29 13:31:43.000000000 +0200
++++ mozilla/configure	2008-07-29 13:34:10.000000000 +0200
 @@ -13071,8 +13071,8 @@
  
  case "$MOZ_BUILD_APP" in
@@ -13,8 +13,8 @@
    MOZ_LDAP_XPCOM=1
    MOZ_COMPOSER=1
 diff -urN mozilla.orig/configure.in mozilla/configure.in
---- mozilla.orig/configure.in	2008-06-24 12:57:20.000000000 +0200
-+++ mozilla/configure.in	2008-06-24 21:16:25.000000000 +0200
+--- mozilla.orig/configure.in	2008-07-29 13:31:06.000000000 +0200
++++ mozilla/configure.in	2008-07-29 13:34:10.000000000 +0200
 @@ -4303,8 +4303,8 @@
  
  case "$MOZ_BUILD_APP" in
@@ -27,8 +27,8 @@
    MOZ_LDAP_XPCOM=1
    MOZ_COMPOSER=1
 diff -urN mozilla.orig/extensions/help/resources/locale/en-US/cs_nav_prefs_advanced.xhtml mozilla/extensions/help/resources/locale/en-US/cs_nav_prefs_advanced.xhtml
---- mozilla.orig/extensions/help/resources/locale/en-US/cs_nav_prefs_advanced.xhtml	2008-06-24 12:57:29.000000000 +0200
-+++ mozilla/extensions/help/resources/locale/en-US/cs_nav_prefs_advanced.xhtml	2008-06-24 21:15:20.000000000 +0200
+--- mozilla.orig/extensions/help/resources/locale/en-US/cs_nav_prefs_advanced.xhtml	2008-07-29 13:31:51.000000000 +0200
++++ mozilla/extensions/help/resources/locale/en-US/cs_nav_prefs_advanced.xhtml	2008-07-29 13:34:10.000000000 +0200
 @@ -387,19 +387,6 @@
          web sites in the current list.</li>
      </ul>
@@ -50,8 +50,8 @@
  
  <p>[<a href="#advanced_preferences">Return to beginning of section</a>]</p>
 diff -urN mozilla.orig/mailnews/base/resources/content/start.xhtml mozilla/mailnews/base/resources/content/start.xhtml
---- mozilla.orig/mailnews/base/resources/content/start.xhtml	2008-06-24 12:57:24.000000000 +0200
-+++ mozilla/mailnews/base/resources/content/start.xhtml	2008-06-24 21:45:30.000000000 +0200
+--- mozilla.orig/mailnews/base/resources/content/start.xhtml	2008-07-29 13:31:33.000000000 +0200
++++ mozilla/mailnews/base/resources/content/start.xhtml	2008-07-29 13:34:10.000000000 +0200
 @@ -72,8 +72,6 @@
  <h2>&dict.title;</h2>
  <p>&dict_intro.label;</p>
@@ -62,8 +62,8 @@
  
  </body>
 diff -urN mozilla.orig/mailnews/base/resources/locale/en-US/start.dtd mozilla/mailnews/base/resources/locale/en-US/start.dtd
---- mozilla.orig/mailnews/base/resources/locale/en-US/start.dtd	2008-06-24 12:57:24.000000000 +0200
-+++ mozilla/mailnews/base/resources/locale/en-US/start.dtd	2008-06-24 21:44:27.000000000 +0200
+--- mozilla.orig/mailnews/base/resources/locale/en-US/start.dtd	2008-07-29 13:31:33.000000000 +0200
++++ mozilla/mailnews/base/resources/locale/en-US/start.dtd	2008-07-29 13:34:10.000000000 +0200
 @@ -37,7 +37,7 @@
  
  <!ENTITY startpage.title "Welcome to &brandShortName; Mail &amp; Newsgroups">
@@ -74,8 +74,8 @@
  "&brandShortName; Mail &amp; Newsgroups is a powerful open-source mail and news
  client, supporting advanced junk mail detection and other useful features.">
 diff -urN mozilla.orig/netwerk/protocol/about/src/nsAboutRedirector.cpp mozilla/netwerk/protocol/about/src/nsAboutRedirector.cpp
---- mozilla.orig/netwerk/protocol/about/src/nsAboutRedirector.cpp	2008-06-24 12:57:23.000000000 +0200
-+++ mozilla/netwerk/protocol/about/src/nsAboutRedirector.cpp	2008-06-24 20:58:51.000000000 +0200
+--- mozilla.orig/netwerk/protocol/about/src/nsAboutRedirector.cpp	2008-07-29 13:31:32.000000000 +0200
++++ mozilla/netwerk/protocol/about/src/nsAboutRedirector.cpp	2008-07-29 13:34:10.000000000 +0200
 @@ -64,7 +64,7 @@
      { "mozilla", "chrome://global/content/mozilla.xhtml", PR_TRUE },
      { "plugins", "chrome://global/content/plugins.html", PR_FALSE },
@@ -86,8 +86,8 @@
      { "license", "chrome://global/content/license.html", PR_TRUE },
      { "licence", "chrome://global/content/license.html", PR_TRUE },
 diff -urN mozilla.orig/suite/branding/Makefile.in mozilla/suite/branding/Makefile.in
---- mozilla.orig/suite/branding/Makefile.in	2008-06-24 12:57:28.000000000 +0200
-+++ mozilla/suite/branding/Makefile.in	2008-06-24 20:58:43.000000000 +0200
+--- mozilla.orig/suite/branding/Makefile.in	2008-07-29 13:31:43.000000000 +0200
++++ mozilla/suite/branding/Makefile.in	2008-07-29 13:34:10.000000000 +0200
 @@ -49,4 +49,11 @@
  	$(INSTALL) $(srcdir)/icons/gtk/seamonkey.png $(DIST)/bin/chrome/icons/default
  endif
@@ -101,8 +101,8 @@
 +
  include $(topsrcdir)/config/rules.mk
 diff -urN mozilla.orig/themes/classic/jar.mn mozilla/themes/classic/jar.mn
---- mozilla.orig/themes/classic/jar.mn	2008-06-24 12:57:19.000000000 +0200
-+++ mozilla/themes/classic/jar.mn	2008-06-24 20:58:47.000000000 +0200
+--- mozilla.orig/themes/classic/jar.mn	2008-07-29 13:31:02.000000000 +0200
++++ mozilla/themes/classic/jar.mn	2008-07-29 13:34:10.000000000 +0200
 @@ -65,7 +65,6 @@
    skin/classic/communicator/icons/lock-broken.gif                       (communicator/icons/lock-broken.gif)
    skin/classic/communicator/icons/lock-insecure.gif                     (communicator/icons/lock-insecure.gif)
@@ -112,8 +112,8 @@
    skin/classic/communicator/icons/smileys/smile_n.gif                   (communicator/icons/smileys/smile_n.gif)
    skin/classic/communicator/icons/smileys/frown_n.gif                   (communicator/icons/smileys/frown_n.gif)
 diff -urN mozilla.orig/themes/modern/jar.mn mozilla/themes/modern/jar.mn
---- mozilla.orig/themes/modern/jar.mn	2008-06-24 12:57:19.000000000 +0200
-+++ mozilla/themes/modern/jar.mn	2008-06-24 20:58:47.000000000 +0200
+--- mozilla.orig/themes/modern/jar.mn	2008-07-29 13:31:03.000000000 +0200
++++ mozilla/themes/modern/jar.mn	2008-07-29 13:34:10.000000000 +0200
 @@ -36,7 +36,6 @@
    skin/modern/communicator/icons/lock-secure.gif                   (communicator/icons/lock-secure.gif)
    skin/modern/communicator/icons/offline.gif                       (communicator/icons/offline.gif)
@@ -122,9 +122,23 @@
    skin/modern/communicator/icons/btn1.gif                          (communicator/icons/btn1.gif)
    skin/modern/communicator/icons/search.gif                        (communicator/icons/search.gif)
    skin/modern/communicator/icons/smileys/smile_n.gif               (communicator/icons/smileys/smile_n.gif)
+diff -urN mozilla.orig/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties mozilla/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
+--- mozilla.orig/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties	2008-07-29 13:32:00.000000000 +0200
++++ mozilla/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties	2008-07-29 14:10:57.000000000 +0200
+@@ -32,8 +32,8 @@
+ disableQueryMessage=Do you want to disable %S?
+ 
+ extensions.update.url=https://addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%
+-extensions.getMoreExtensionsURL=http://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/extensions/
+-extensions.getMoreThemesURL=http://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/themes/
++extensions.getMoreExtensionsURL=http://%LOCALE%.add-ons.mozilla.com/%LOCALE%/seamonkey/%VERSION%/extensions/
++extensions.getMoreThemesURL=http://%LOCALE%.add-ons.mozilla.com/%LOCALE%/seamonkey/%VERSION%/themes/
+ 
+ themesTitle=Themes
+ extensionsTitle=Extensions
 diff -urN mozilla.orig/toolkit/xre/nsAppRunner.cpp mozilla/toolkit/xre/nsAppRunner.cpp
---- mozilla.orig/toolkit/xre/nsAppRunner.cpp	2008-06-24 12:57:31.000000000 +0200
-+++ mozilla/toolkit/xre/nsAppRunner.cpp	2008-06-26 10:04:07.000000000 +0200
+--- mozilla.orig/toolkit/xre/nsAppRunner.cpp	2008-07-29 13:32:01.000000000 +0200
++++ mozilla/toolkit/xre/nsAppRunner.cpp	2008-07-29 13:34:10.000000000 +0200
 @@ -1121,7 +1121,7 @@
  static void
  DumpVersion()
@@ -135,8 +149,8 @@
  
  #ifdef MOZ_ENABLE_XREMOTE
 diff -urN mozilla.orig/xpfe/bootstrap/nsAppRunner.cpp mozilla/xpfe/bootstrap/nsAppRunner.cpp
---- mozilla.orig/xpfe/bootstrap/nsAppRunner.cpp	2008-06-24 12:57:41.000000000 +0200
-+++ mozilla/xpfe/bootstrap/nsAppRunner.cpp	2008-06-26 09:33:05.000000000 +0200
+--- mozilla.orig/xpfe/bootstrap/nsAppRunner.cpp	2008-07-29 13:32:15.000000000 +0200
++++ mozilla/xpfe/bootstrap/nsAppRunner.cpp	2008-07-29 13:34:10.000000000 +0200
 @@ -1510,7 +1510,7 @@
          || (PL_strcasecmp(argv[i], "/?") == 0)
  #endif /* XP_WIN || XP_OS2 */
@@ -147,8 +161,8 @@
      }
      if ((PL_strcasecmp(argv[i], "-v") == 0)
 diff -urN mozilla.orig/xpfe/browser/resources/locale/en-US/region.properties mozilla/xpfe/browser/resources/locale/en-US/region.properties
---- mozilla.orig/xpfe/browser/resources/locale/en-US/region.properties	2008-06-24 12:57:44.000000000 +0200
-+++ mozilla/xpfe/browser/resources/locale/en-US/region.properties	2008-06-25 15:51:49.000000000 +0200
+--- mozilla.orig/xpfe/browser/resources/locale/en-US/region.properties	2008-07-29 13:32:16.000000000 +0200
++++ mozilla/xpfe/browser/resources/locale/en-US/region.properties	2008-07-29 13:34:10.000000000 +0200
 @@ -1,5 +1,5 @@
  # navigator.properties
 -homePageDefault=http://www.mozilla.org/
@@ -172,8 +186,8 @@
 -startup.homepage_override_url=http://www.seamonkey-project.org/start/
 +startup.homepage_override_url=about:
 diff -urN mozilla.orig/xpfe/communicator/resources/content/utilityOverlay.xul mozilla/xpfe/communicator/resources/content/utilityOverlay.xul
---- mozilla.orig/xpfe/communicator/resources/content/utilityOverlay.xul	2008-06-24 12:57:42.000000000 +0200
-+++ mozilla/xpfe/communicator/resources/content/utilityOverlay.xul	2008-06-24 21:09:15.000000000 +0200
+--- mozilla.orig/xpfe/communicator/resources/content/utilityOverlay.xul	2008-07-29 13:32:16.000000000 +0200
++++ mozilla/xpfe/communicator/resources/content/utilityOverlay.xul	2008-07-29 13:34:10.000000000 +0200
 @@ -286,11 +286,6 @@
          label="&helpMenu.label;"
          accesskey="&helpMenu.accesskey;">
@@ -187,8 +201,8 @@
  
        <menuitem class="about"
 diff -urN mozilla.orig/xpfe/communicator/resources/locale/en-US/brand.dtd mozilla/xpfe/communicator/resources/locale/en-US/brand.dtd
---- mozilla.orig/xpfe/communicator/resources/locale/en-US/brand.dtd	2008-06-24 12:57:42.000000000 +0200
-+++ mozilla/xpfe/communicator/resources/locale/en-US/brand.dtd	2008-06-24 21:19:53.000000000 +0200
+--- mozilla.orig/xpfe/communicator/resources/locale/en-US/brand.dtd	2008-07-29 13:32:16.000000000 +0200
++++ mozilla/xpfe/communicator/resources/locale/en-US/brand.dtd	2008-07-29 13:34:10.000000000 +0200
 @@ -1,5 +1,5 @@
  #expand <!ENTITY  lang.version          "__MOZILLA_LOCALE_VERSION__">
 -<!ENTITY  brandFullName         "SeaMonkey">
@@ -199,8 +213,8 @@
 +<!ENTITY  vendorShortName       "Iceape">
  <!ENTITY  sidebarName           "Sidebar">
 diff -urN mozilla.orig/xpfe/communicator/resources/locale/en-US/brand.properties mozilla/xpfe/communicator/resources/locale/en-US/brand.properties
---- mozilla.orig/xpfe/communicator/resources/locale/en-US/brand.properties	2008-06-24 12:57:42.000000000 +0200
-+++ mozilla/xpfe/communicator/resources/locale/en-US/brand.properties	2008-06-24 21:19:32.000000000 +0200
+--- mozilla.orig/xpfe/communicator/resources/locale/en-US/brand.properties	2008-07-29 13:32:16.000000000 +0200
++++ mozilla/xpfe/communicator/resources/locale/en-US/brand.properties	2008-07-29 13:34:10.000000000 +0200
 @@ -1,4 +1,4 @@
 -brandFullName=SeaMonkey
 -brandShortName=SeaMonkey
@@ -210,8 +224,8 @@
 +vendorShortName=Iceape
  sidebarName=Sidebar
 diff -urN mozilla.orig/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul mozilla/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
---- mozilla.orig/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul	2008-06-24 12:57:42.000000000 +0200
-+++ mozilla/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul	2008-06-24 21:14:33.000000000 +0200
+--- mozilla.orig/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul	2008-07-29 13:32:16.000000000 +0200
++++ mozilla/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul	2008-07-29 13:34:10.000000000 +0200
 @@ -38,22 +38,6 @@
      </hbox>
    </groupbox>
@@ -236,8 +250,8 @@
    <groupbox align="start">
      <caption label="Installed Packages"/>
 diff -urN mozilla.orig/xpfe/components/search/resources/locale/en-US/default.htm mozilla/xpfe/components/search/resources/locale/en-US/default.htm
---- mozilla.orig/xpfe/components/search/resources/locale/en-US/default.htm	2008-06-24 12:57:43.000000000 +0200
-+++ mozilla/xpfe/components/search/resources/locale/en-US/default.htm	2008-06-24 21:18:20.000000000 +0200
+--- mozilla.orig/xpfe/components/search/resources/locale/en-US/default.htm	2008-07-29 13:32:16.000000000 +0200
++++ mozilla/xpfe/components/search/resources/locale/en-US/default.htm	2008-07-29 13:34:10.000000000 +0200
 @@ -6,7 +6,7 @@
  </HEAD>
  
@@ -248,8 +262,8 @@
  
  </HTML>
 diff -urN mozilla.orig/xpfe/global/jar.mn mozilla/xpfe/global/jar.mn
---- mozilla.orig/xpfe/global/jar.mn	2008-06-24 12:57:42.000000000 +0200
-+++ mozilla/xpfe/global/jar.mn	2008-06-24 20:58:51.000000000 +0200
+--- mozilla.orig/xpfe/global/jar.mn	2008-07-29 13:32:16.000000000 +0200
++++ mozilla/xpfe/global/jar.mn	2008-07-29 13:34:10.000000000 +0200
 @@ -13,9 +13,9 @@
          content/global/commonDialog.js              (resources/content/commonDialog.js) 
          content/global/strres.js                    (resources/content/strres.js) 
@@ -263,8 +277,8 @@
          content/global/aboutAbout.html              (resources/content/aboutAbout.html) 
          content/global/about.xul                    (resources/content/about.xul) 
 diff -urN mozilla.orig/xpfe/global/resources/content/about.xhtml mozilla/xpfe/global/resources/content/about.xhtml
---- mozilla.orig/xpfe/global/resources/content/about.xhtml	2008-06-24 12:57:42.000000000 +0200
-+++ mozilla/xpfe/global/resources/content/about.xhtml	2008-06-24 21:03:48.000000000 +0200
+--- mozilla.orig/xpfe/global/resources/content/about.xhtml	2008-07-29 13:32:16.000000000 +0200
++++ mozilla/xpfe/global/resources/content/about.xhtml	2008-07-29 13:34:10.000000000 +0200
 @@ -50,79 +50,79 @@
  <head>
  <title>About:</title>

================================================================
Index: SOURCES/iceweasel-branding.patch
diff -u SOURCES/iceweasel-branding.patch:1.3 SOURCES/iceweasel-branding.patch:1.4
--- SOURCES/iceweasel-branding.patch:1.3	Thu Jun 26 10:07:56 2008
+++ SOURCES/iceweasel-branding.patch	Tue Jul 29 15:47:23 2008
@@ -1,6 +1,6 @@
 diff -urN mozilla.orig/browser/app/application.ini mozilla/browser/app/application.ini
---- mozilla.orig/browser/app/application.ini	2008-06-22 22:54:03.000000000 +0200
-+++ mozilla/browser/app/application.ini	2008-06-26 08:31:00.000000000 +0200
+--- mozilla.orig/browser/app/application.ini	2008-07-29 13:24:18.000000000 +0200
++++ mozilla/browser/app/application.ini	2008-07-29 13:34:50.000000000 +0200
 @@ -37,8 +37,8 @@
  
  #filter substitution
@@ -13,9 +13,9 @@
  BuildID=@GRE_BUILDID@
  Copyright=Copyright (c) 1998 - 2008 mozilla.org
 diff -urN mozilla.orig/browser/app/firefox-branding.js mozilla/browser/app/firefox-branding.js
---- mozilla.orig/browser/app/firefox-branding.js	2008-06-22 22:54:03.000000000 +0200
-+++ mozilla/browser/app/firefox-branding.js	2008-06-23 10:52:40.000000000 +0200
-@@ -1,5 +1,6 @@
+--- mozilla.orig/browser/app/firefox-branding.js	2008-07-29 13:24:18.000000000 +0200
++++ mozilla/browser/app/firefox-branding.js	2008-07-29 13:46:30.000000000 +0200
+@@ -1,14 +1,15 @@
 -pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/");
 -pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/");
 +pref("browser.startup.homepage_override.mstone", "ignore");
@@ -23,9 +23,12 @@
 +pref("startup.homepage_welcome_url","");
  // URL user can browse to manually if for some reason all update installation
  // attempts fail.
- pref("app.update.url.manual", "http://www.mozilla.org/products/%APP%/");
-@@ -8,7 +9,7 @@
- pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/");
+-pref("app.update.url.manual", "http://www.mozilla.org/products/%APP%/");
++pref("app.update.url.manual", "http://www.mozilla.org/products/firefox/");
+ // A default value for the "More information about this update" link
+ // supplied in the "An update is available" page of the update wizard. 
+-pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/");
++pref("app.update.url.details", "http://www.mozilla.org/projects/firefox/");
  
  // Release notes URL
 -pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/");
@@ -34,8 +37,39 @@
  // Search codes belong only in builds with official branding
  pref("browser.search.param.yahoo-fr", "");
 diff -urN mozilla.orig/browser/app/profile/firefox.js mozilla/browser/app/profile/firefox.js
---- mozilla.orig/browser/app/profile/firefox.js	2008-06-22 22:54:03.000000000 +0200
-+++ mozilla/browser/app/profile/firefox.js	2008-06-25 22:30:43.000000000 +0200
+--- mozilla.orig/browser/app/profile/firefox.js	2008-07-29 13:24:18.000000000 +0200
++++ mozilla/browser/app/profile/firefox.js	2008-07-29 13:46:50.000000000 +0200
+@@ -70,12 +70,12 @@
+ 
+ // Preferences for the Get Add-ons pane
+ pref("extensions.getAddons.showPane", true);
+-pref("extensions.getAddons.browseAddons", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%");
++pref("extensions.getAddons.browseAddons", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/firefox");
+ pref("extensions.getAddons.maxResults", 5);
+-pref("extensions.getAddons.recommended.browseURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/recommended");
+-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%");
+-pref("extensions.getAddons.search.browseURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/search?q=%TERMS%");
+-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%");
++pref("extensions.getAddons.recommended.browseURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/firefox/recommended");
++pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%");
++pref("extensions.getAddons.search.browseURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/firefox/search?q=%TERMS%");
++pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%");
+ 
+ // Blocklist preferences
+ pref("extensions.blocklist.enabled", true);
+@@ -158,9 +158,9 @@
+ pref("extensions.update.interval", 86400);  // Check for updates to Extensions and 
+                                             // Themes every day
+ // Non-symmetric (not shared by extensions) extension-specific [update] preferences
+-pref("extensions.getMoreExtensionsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/extensions/");
+-pref("extensions.getMoreThemesURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/themes/");
+-pref("extensions.getMorePluginsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/plugins/");
++pref("extensions.getMoreExtensionsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/firefox/%VERSION%/extensions/");
++pref("extensions.getMoreThemesURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/firefox/%VERSION%/themes/");
++pref("extensions.getMorePluginsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/firefox/%VERSION%/plugins/");
+ pref("extensions.dss.enabled", false);          // Dynamic Skin Switching                                               
+ pref("extensions.dss.switchPending", false);    // Non-dynamic switch pending after next
+                                                 // restart.
 @@ -659,9 +659,7 @@
  // if we rev the EULA again, we should bump this so users agree to the new EULA
  pref("browser.EULA.version", 3);
@@ -46,9 +80,15 @@
  
  pref("browser.sessionstore.enabled", true);
  pref("browser.sessionstore.resume_from_crash", true);
+@@ -762,4 +760,4 @@
+ pref("breakpad.reportURL", "http://crash-stats.mozilla.com/report/index/");
+ 
+ // base URL for web-based support pages
+-pref("app.support.baseURL", "http://support.mozilla.com/1/%APP%/%VERSION%/%OS%/%LOCALE%/");
++pref("app.support.baseURL", "http://support.mozilla.com/1/firefox/%VERSION%/%OS%/%LOCALE%/");
 diff -urN mozilla.orig/browser/base/content/baseMenuOverlay.xul mozilla/browser/base/content/baseMenuOverlay.xul
---- mozilla.orig/browser/base/content/baseMenuOverlay.xul	2008-06-22 22:54:02.000000000 +0200
-+++ mozilla/browser/base/content/baseMenuOverlay.xul	2008-06-23 11:04:45.000000000 +0200
+--- mozilla.orig/browser/base/content/baseMenuOverlay.xul	2008-07-29 13:24:17.000000000 +0200
++++ mozilla/browser/base/content/baseMenuOverlay.xul	2008-07-29 13:34:50.000000000 +0200
 @@ -92,17 +92,6 @@
                    accesskey="&helpForIEUsers.accesskey;"
                    oncommand="openHelpLink('ieusers');"/>
@@ -68,8 +108,8 @@
          <menuitem id="aboutName"
                    accesskey="&aboutCmd.accesskey;"
 diff -urN mozilla.orig/browser/base/content/credits.xhtml mozilla/browser/base/content/credits.xhtml
---- mozilla.orig/browser/base/content/credits.xhtml	2008-06-22 22:54:02.000000000 +0200
-+++ mozilla/browser/base/content/credits.xhtml	2008-06-23 10:50:19.000000000 +0200
+--- mozilla.orig/browser/base/content/credits.xhtml	2008-07-29 13:24:17.000000000 +0200
++++ mozilla/browser/base/content/credits.xhtml	2008-07-29 13:34:50.000000000 +0200
 @@ -206,7 +206,7 @@
      </div>
  
@@ -101,10 +141,33 @@
            U.S. GOVERNMENT END USERS. The Software is a &ldquo;commercial item,&rdquo;
            as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of
            &ldquo;commercial computer software&rdquo; and &ldquo;commercial computer software
+diff -urN mozilla.orig/browser/branding/unofficial/pref/firefox-branding.js mozilla/browser/branding/unofficial/pref/firefox-branding.js
+--- mozilla.orig/browser/branding/unofficial/pref/firefox-branding.js	2008-07-29 13:24:19.000000000 +0200
++++ mozilla/browser/branding/unofficial/pref/firefox-branding.js	2008-07-29 13:46:22.000000000 +0200
+@@ -1,14 +1,14 @@
+-pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/");
+-pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/");
++pref("startup.homepage_override_url","http://www.mozilla.org/projects/firefox/%VERSION%/whatsnew/");
++pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/firefox/%VERSION%/firstrun/");
+ // URL user can browse to manually if for some reason all update installation
+ // attempts fail.
+-pref("app.update.url.manual", "http://www.mozilla.org/products/%APP%/");
++pref("app.update.url.manual", "http://www.mozilla.org/products/firefox/");
+ // A default value for the "More information about this update" link
+ // supplied in the "An update is available" page of the update wizard. 
+-pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/");
++pref("app.update.url.details", "http://www.mozilla.org/projects/firefox/");
+ 
+ // Release notes URL
+-pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/");
++pref("app.releaseNotesURL", "http://www.mozilla.org/projects/firefox/%VERSION%/releasenotes/");
+ 
+ // Search codes belong only in builds with official branding
+ pref("browser.search.param.yahoo-fr", "");
 diff -urN mozilla.orig/browser/components/nsBrowserContentHandler.js mozilla/browser/components/nsBrowserContentHandler.js
---- mozilla.orig/browser/components/nsBrowserContentHandler.js	2008-06-22 22:54:03.000000000 +0200
-+++ mozilla/browser/components/nsBrowserContentHandler.js	2008-06-25 19:25:33.000000000 +0200
-@@ -795,7 +795,7 @@
+--- mozilla.orig/browser/components/nsBrowserContentHandler.js	2008-07-29 13:24:18.000000000 +0200
++++ mozilla/browser/components/nsBrowserContentHandler.js	2008-07-29 13:34:50.000000000 +0200
+@@ -836,7 +836,7 @@
    },
  
    // XXX localize me... how?
@@ -114,8 +177,8 @@
    /* nsIFactory */
    createInstance: function dch_CI(outer, iid) {
 diff -urN mozilla.orig/browser/components/nsBrowserGlue.js mozilla/browser/components/nsBrowserGlue.js
---- mozilla.orig/browser/components/nsBrowserGlue.js	2008-06-22 22:54:03.000000000 +0200
-+++ mozilla/browser/components/nsBrowserGlue.js	2008-06-23 10:50:19.000000000 +0200
+--- mozilla.orig/browser/components/nsBrowserGlue.js	2008-07-29 13:24:18.000000000 +0200
++++ mozilla/browser/components/nsBrowserGlue.js	2008-07-29 13:34:50.000000000 +0200
 @@ -759,7 +759,7 @@
    },
  
@@ -126,8 +189,8 @@
    contractID:       "@mozilla.org/browser/browserglue;1",
  
 diff -urN mozilla.orig/browser/components/preferences/advanced.xul mozilla/browser/components/preferences/advanced.xul
---- mozilla.orig/browser/components/preferences/advanced.xul	2008-06-22 22:54:03.000000000 +0200
-+++ mozilla/browser/components/preferences/advanced.xul	2008-06-23 10:52:44.000000000 +0200
+--- mozilla.orig/browser/components/preferences/advanced.xul	2008-07-29 13:24:18.000000000 +0200
++++ mozilla/browser/components/preferences/advanced.xul	2008-07-29 13:34:50.000000000 +0200
 @@ -267,10 +267,6 @@
          <tabpanel id="updatePanel" orient="vertical" align="start">
            <label control="autoUpdateGroup">&autoCheck.label;</label>
@@ -140,8 +203,8 @@
                        label="&enableAddonsUpdate.label;"
                        accesskey="&enableAddonsUpdate.accesskey;"
 diff -urN mozilla.orig/browser/components/preferences/applications.js mozilla/browser/components/preferences/applications.js
---- mozilla.orig/browser/components/preferences/applications.js	2008-06-22 22:54:03.000000000 +0200
-+++ mozilla/browser/components/preferences/applications.js	2008-06-23 10:50:19.000000000 +0200
+--- mozilla.orig/browser/components/preferences/applications.js	2008-07-29 13:24:18.000000000 +0200
++++ mozilla/browser/components/preferences/applications.js	2008-07-29 13:34:50.000000000 +0200
 @@ -538,8 +538,7 @@
  
    _shellSvc:
@@ -153,8 +216,8 @@
      null,
  #endif
 diff -urN mozilla.orig/browser/components/safebrowsing/content/report-phishing-overlay.xul mozilla/browser/components/safebrowsing/content/report-phishing-overlay.xul
---- mozilla.orig/browser/components/safebrowsing/content/report-phishing-overlay.xul	2008-06-22 22:54:03.000000000 +0200
-+++ mozilla/browser/components/safebrowsing/content/report-phishing-overlay.xul	2008-06-23 10:50:19.000000000 +0200
+--- mozilla.orig/browser/components/safebrowsing/content/report-phishing-overlay.xul	2008-07-29 13:24:18.000000000 +0200
++++ mozilla/browser/components/safebrowsing/content/report-phishing-overlay.xul	2008-07-29 13:34:50.000000000 +0200
 @@ -50,7 +50,7 @@
      <menuitem id="menu_HelpPopup_reportPhishingtoolmenu"
                label="&reportPhishSiteMenu.title2;"
@@ -165,8 +228,8 @@
                oncommand="openUILink(safebrowsing.getReportURL('Phish'), event);"
                onclick="checkForMiddleClick(this, event);"/>
 diff -urN mozilla.orig/browser/components/shell/src/nsWindowsShellService.cpp mozilla/browser/components/shell/src/nsWindowsShellService.cpp
---- mozilla.orig/browser/components/shell/src/nsWindowsShellService.cpp	2008-06-22 22:54:03.000000000 +0200
-+++ mozilla/browser/components/shell/src/nsWindowsShellService.cpp	2008-06-25 23:24:46.000000000 +0200
+--- mozilla.orig/browser/components/shell/src/nsWindowsShellService.cpp	2008-07-29 13:24:18.000000000 +0200
++++ mozilla/browser/components/shell/src/nsWindowsShellService.cpp	2008-07-29 13:34:50.000000000 +0200
 @@ -189,7 +189,7 @@
    PRInt32 flags;
  } SETTING;
@@ -177,8 +240,8 @@
  #define SOP "\\shell\\open\\command"
  
 diff -urN mozilla.orig/browser/confvars.sh mozilla/browser/confvars.sh
---- mozilla.orig/browser/confvars.sh	2008-06-22 22:54:03.000000000 +0200
-+++ mozilla/browser/confvars.sh	2008-06-23 09:29:51.000000000 +0200
+--- mozilla.orig/browser/confvars.sh	2008-07-29 13:24:18.000000000 +0200
++++ mozilla/browser/confvars.sh	2008-07-29 13:34:50.000000000 +0200
 @@ -36,7 +36,7 @@
  #
  # ***** END LICENSE BLOCK *****
@@ -189,8 +252,8 @@
  MOZ_PHOENIX=1
  
 diff -urN mozilla.orig/browser/locales/en-US/chrome/browser/aboutDialog.dtd mozilla/browser/locales/en-US/chrome/browser/aboutDialog.dtd
---- mozilla.orig/browser/locales/en-US/chrome/browser/aboutDialog.dtd	2008-06-22 22:54:03.000000000 +0200
-+++ mozilla/browser/locales/en-US/chrome/browser/aboutDialog.dtd	2008-06-23 11:20:59.000000000 +0200
+--- mozilla.orig/browser/locales/en-US/chrome/browser/aboutDialog.dtd	2008-07-29 13:24:18.000000000 +0200
++++ mozilla/browser/locales/en-US/chrome/browser/aboutDialog.dtd	2008-07-29 13:34:50.000000000 +0200
 @@ -4,6 +4,4 @@
  <!ENTITY aboutLink              "&lt; About &brandFullName;">
  <!ENTITY aboutLink.accesskey    "A">
@@ -200,8 +263,8 @@
 -                                 reserved.">
 +<!ENTITY copyrightInfo          "&#169;1998-2008 Contributors. All Rights Reserved.">
 diff -urN mozilla.orig/browser/locales/en-US/chrome/overrides/appstrings.properties mozilla/browser/locales/en-US/chrome/overrides/appstrings.properties
---- mozilla.orig/browser/locales/en-US/chrome/overrides/appstrings.properties	2008-06-22 22:54:03.000000000 +0200
-+++ mozilla/browser/locales/en-US/chrome/overrides/appstrings.properties	2008-06-23 10:50:29.000000000 +0200
+--- mozilla.orig/browser/locales/en-US/chrome/overrides/appstrings.properties	2008-07-29 13:24:18.000000000 +0200
++++ mozilla/browser/locales/en-US/chrome/overrides/appstrings.properties	2008-07-29 13:34:50.000000000 +0200
 @@ -35,23 +35,23 @@
  # ***** END LICENSE BLOCK *****
  
@@ -237,8 +300,8 @@
  unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem.
  externalProtocolTitle=External Protocol Request
 diff -urN mozilla.orig/browser/locales/en-US/searchplugins/answers.xml mozilla/browser/locales/en-US/searchplugins/answers.xml
---- mozilla.orig/browser/locales/en-US/searchplugins/answers.xml	2008-06-22 22:54:03.000000000 +0200
-+++ mozilla/browser/locales/en-US/searchplugins/answers.xml	2008-06-23 10:50:29.000000000 +0200
+--- mozilla.orig/browser/locales/en-US/searchplugins/answers.xml	2008-07-29 13:24:18.000000000 +0200
++++ mozilla/browser/locales/en-US/searchplugins/answers.xml	2008-07-29 13:34:50.000000000 +0200
 @@ -8,6 +8,6 @@
    <Param name="gwp" value="13"/>
  </Url>
@@ -248,8 +311,8 @@
  <SearchForm>http://www.answers.com/</SearchForm>
  </SearchPlugin>
 diff -urN mozilla.orig/browser/locales/en-US/searchplugins/google.xml mozilla/browser/locales/en-US/searchplugins/google.xml
---- mozilla.orig/browser/locales/en-US/searchplugins/google.xml	2008-06-22 22:54:03.000000000 +0200
-+++ mozilla/browser/locales/en-US/searchplugins/google.xml	2008-06-23 10:50:29.000000000 +0200
+--- mozilla.orig/browser/locales/en-US/searchplugins/google.xml	2008-07-29 13:24:18.000000000 +0200
++++ mozilla/browser/locales/en-US/searchplugins/google.xml	2008-07-29 13:34:51.000000000 +0200
 @@ -3,7 +3,7 @@
  <Description>Google Search</Description>
  <InputEncoding>UTF-8</InputEncoding>
@@ -270,8 +333,8 @@
 +<SearchForm>http://www.google.com/</SearchForm>
  </SearchPlugin>
 diff -urN mozilla.orig/browser/locales/en-US/updater/updater.ini mozilla/browser/locales/en-US/updater/updater.ini
---- mozilla.orig/browser/locales/en-US/updater/updater.ini	2008-06-22 22:54:03.000000000 +0200
-+++ mozilla/browser/locales/en-US/updater/updater.ini	2008-06-26 08:31:30.000000000 +0200
+--- mozilla.orig/browser/locales/en-US/updater/updater.ini	2008-07-29 13:24:18.000000000 +0200
++++ mozilla/browser/locales/en-US/updater/updater.ini	2008-07-29 13:34:51.000000000 +0200
 @@ -1,4 +1,4 @@
  ; This file is in the UTF-8 encoding
  [Strings]
@@ -279,8 +342,8 @@
 -Info=Firefox is installing your updates and will start in a few moments…
 +Info=Iceweasel is installing your updates and will start in a few moments…
 diff -urN mozilla.orig/extensions/reporter/resources/content/reporter/reporterOverlay.xul mozilla/extensions/reporter/resources/content/reporter/reporterOverlay.xul
---- mozilla.orig/extensions/reporter/resources/content/reporter/reporterOverlay.xul	2008-06-22 22:54:07.000000000 +0200
-+++ mozilla/extensions/reporter/resources/content/reporter/reporterOverlay.xul	2008-06-23 10:50:29.000000000 +0200
+--- mozilla.orig/extensions/reporter/resources/content/reporter/reporterOverlay.xul	2008-07-29 13:24:30.000000000 +0200
++++ mozilla/extensions/reporter/resources/content/reporter/reporterOverlay.xul	2008-07-29 13:34:51.000000000 +0200
 @@ -53,7 +53,7 @@
      <menuitem id="menu_HelpPopup_reportertoolmenu" 
                label="&reporterMenu2.title;" 
@@ -290,9 +353,32 @@
                observes="reporterItemsBroadcaster"
                oncommand="loadReporterWizard()"/>
    </menupopup>
+diff -urN mozilla.orig/other-licenses/branding/firefox/pref/firefox-branding.js mozilla/other-licenses/branding/firefox/pref/firefox-branding.js
+--- mozilla.orig/other-licenses/branding/firefox/pref/firefox-branding.js	2008-07-29 13:23:55.000000000 +0200
++++ mozilla/other-licenses/branding/firefox/pref/firefox-branding.js	2008-07-29 13:47:01.000000000 +0200
+@@ -1,14 +1,14 @@
+-pref("startup.homepage_override_url","http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/%VERSION%/whatsnew/");
+-pref("startup.homepage_welcome_url","http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/%VERSION%/firstrun/");
++pref("startup.homepage_override_url","http://%LOCALE%.www.mozilla.com/%LOCALE%/firefox/%VERSION%/whatsnew/");
++pref("startup.homepage_welcome_url","http://%LOCALE%.www.mozilla.com/%LOCALE%/firefox/%VERSION%/firstrun/");
+ // URL user can browse to manually if for some reason all update installation
+ // attempts fail.
+-pref("app.update.url.manual", "http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/");
++pref("app.update.url.manual", "http://%LOCALE%.www.mozilla.com/%LOCALE%/firefox/");
+ // A default value for the "More information about this update" link
+ // supplied in the "An update is available" page of the update wizard. 
+-pref("app.update.url.details", "http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/releases/");
++pref("app.update.url.details", "http://%LOCALE%.www.mozilla.com/%LOCALE%/firefox/releases/");
+ 
+ // Release notes URL
+-pref("app.releaseNotesURL", "http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/%VERSION%/releasenotes/");
++pref("app.releaseNotesURL", "http://%LOCALE%.www.mozilla.com/%LOCALE%/firefox/%VERSION%/releasenotes/");
+ 
+ pref("browser.search.param.yahoo-fr", "moz2");
+ pref("browser.search.param.yahoo-fr-cjkt", "moz2");
 diff -urN mozilla.orig/toolkit/xre/nsAppRunner.cpp mozilla/toolkit/xre/nsAppRunner.cpp
---- mozilla.orig/toolkit/xre/nsAppRunner.cpp	2008-06-22 22:54:10.000000000 +0200
-+++ mozilla/toolkit/xre/nsAppRunner.cpp	2008-06-26 09:56:45.000000000 +0200
+--- mozilla.orig/toolkit/xre/nsAppRunner.cpp	2008-07-29 13:25:13.000000000 +0200
++++ mozilla/toolkit/xre/nsAppRunner.cpp	2008-07-29 13:34:51.000000000 +0200
 @@ -1184,8 +1184,7 @@
  static inline void
  DumpVersion()

================================================================
Index: SOURCES/icedove-branding.patch
diff -u SOURCES/icedove-branding.patch:1.6 SOURCES/icedove-branding.patch:1.7
--- SOURCES/icedove-branding.patch:1.6	Thu Jul 24 10:20:31 2008
+++ SOURCES/icedove-branding.patch	Tue Jul 29 15:47:23 2008
@@ -1,6 +1,6 @@
 diff -urN mozilla.orig/configure mozilla/configure
---- mozilla.orig/configure	2008-06-23 14:04:11.000000000 +0200
-+++ mozilla/configure	2008-06-23 20:44:56.000000000 +0200
+--- mozilla.orig/configure	2008-07-29 13:28:47.000000000 +0200
++++ mozilla/configure	2008-07-29 13:34:31.000000000 +0200
 @@ -13155,8 +13155,8 @@
    ;;
  
@@ -13,8 +13,8 @@
    MOZ_THUNDERBIRD=1
    MOZ_MATHML=
 diff -urN mozilla.orig/configure.in mozilla/configure.in
---- mozilla.orig/configure.in	2008-06-23 14:04:04.000000000 +0200
-+++ mozilla/configure.in	2008-06-23 19:50:01.000000000 +0200
+--- mozilla.orig/configure.in	2008-07-29 13:28:20.000000000 +0200
++++ mozilla/configure.in	2008-07-29 13:34:31.000000000 +0200
 @@ -4378,8 +4378,8 @@
    ;;
  
@@ -27,8 +27,8 @@
    MOZ_THUNDERBIRD=1
    MOZ_MATHML=
 diff -urN mozilla.orig/mail/app/nsMailApp.cpp mozilla/mail/app/nsMailApp.cpp
---- mozilla.orig/mail/app/nsMailApp.cpp	2008-06-23 14:04:11.000000000 +0200
-+++ mozilla/mail/app/nsMailApp.cpp	2008-06-25 23:00:43.000000000 +0200
+--- mozilla.orig/mail/app/nsMailApp.cpp	2008-07-29 13:28:46.000000000 +0200
++++ mozilla/mail/app/nsMailApp.cpp	2008-07-29 13:34:31.000000000 +0200
 @@ -48,7 +48,7 @@
    sizeof(nsXREAppData),
    nsnull,
@@ -39,8 +39,8 @@
    NS_STRINGIFY(BUILD_ID),
    "{3550f703-e582-4d05-9a08-453d09bdfdc6}",
 diff -urN mozilla.orig/mail/app/profile/all-thunderbird.js mozilla/mail/app/profile/all-thunderbird.js
---- mozilla.orig/mail/app/profile/all-thunderbird.js	2008-06-23 14:04:11.000000000 +0200
-+++ mozilla/mail/app/profile/all-thunderbird.js	2008-06-25 23:09:51.000000000 +0200
+--- mozilla.orig/mail/app/profile/all-thunderbird.js	2008-07-29 13:28:46.000000000 +0200
++++ mozilla/mail/app/profile/all-thunderbird.js	2008-07-29 14:02:08.000000000 +0200
 @@ -35,7 +35,7 @@
   *
   * ***** END LICENSE BLOCK ***** */
@@ -50,9 +50,42 @@
  
  #expand pref("general.useragent.locale", "__AB_CD__");
  pref("general.skins.selectedSkin", "classic/1.0");
+@@ -74,10 +74,10 @@
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/iceape-branding.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/iceweasel-branding.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/icedove-branding.patch?r1=1.6&r2=1.7&f=u

More information about the pld-cvs-commit mailing list