packages: iceweasel/iceweasel-branding.patch - re-created for 3.0.11
hawk
hawk at pld-linux.org
Sun Jun 28 13:25:46 CEST 2009
Author: hawk Date: Sun Jun 28 11:25:46 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- re-created for 3.0.11
---- Files affected:
packages/iceweasel:
iceweasel-branding.patch (1.8 -> 1.9)
---- Diffs:
================================================================
Index: packages/iceweasel/iceweasel-branding.patch
diff -u packages/iceweasel/iceweasel-branding.patch:1.8 packages/iceweasel/iceweasel-branding.patch:1.9
--- packages/iceweasel/iceweasel-branding.patch:1.8 Thu Feb 5 00:24:03 2009
+++ packages/iceweasel/iceweasel-branding.patch Sun Jun 28 13:25:41 2009
@@ -1,6 +1,6 @@
diff -urN mozilla.orig/browser/app/application.ini mozilla/browser/app/application.ini
---- 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
+--- mozilla.orig/browser/app/application.ini 2009-01-01 05:03:00.000000000 +0100
++++ mozilla/browser/app/application.ini 2009-06-28 13:16:06.000000000 +0200
@@ -37,8 +37,8 @@
#filter substitution
@@ -11,10 +11,10 @@
+Name=Iceweasel
Version=@APP_VERSION@
BuildID=@GRE_BUILDID@
- Copyright=Copyright (c) 1998 - 2008 mozilla.org
+ #ifdef MOZ_SOURCE_STAMP
diff -urN mozilla.orig/browser/app/firefox-branding.js mozilla/browser/app/firefox-branding.js
---- 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
+--- mozilla.orig/browser/app/firefox-branding.js 2006-09-12 16:08:31.000000000 +0200
++++ mozilla/browser/app/firefox-branding.js 2009-06-28 13:16:06.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/");
@@ -37,8 +37,8 @@
// 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-07-29 13:24:18.000000000 +0200
-+++ mozilla/browser/app/profile/firefox.js 2008-07-29 13:46:50.000000000 +0200
+--- mozilla.orig/browser/app/profile/firefox.js 2009-01-01 18:57:29.000000000 +0100
++++ mozilla/browser/app/profile/firefox.js 2009-06-28 13:16:06.000000000 +0200
@@ -70,12 +70,12 @@
// Preferences for the Get Add-ons pane
@@ -88,8 +88,8 @@
-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-07-29 13:24:17.000000000 +0200
-+++ mozilla/browser/base/content/baseMenuOverlay.xul 2008-07-29 13:34:50.000000000 +0200
+--- mozilla.orig/browser/base/content/baseMenuOverlay.xul 2008-05-06 06:07:24.000000000 +0200
++++ mozilla/browser/base/content/baseMenuOverlay.xul 2009-06-28 13:16:06.000000000 +0200
@@ -92,17 +92,6 @@
accesskey="&helpForIEUsers.accesskey;"
oncommand="openHelpLink('ieusers');"/>
@@ -109,8 +109,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-07-29 13:24:17.000000000 +0200
-+++ mozilla/browser/base/content/credits.xhtml 2008-07-29 13:34:50.000000000 +0200
+--- mozilla.orig/browser/base/content/credits.xhtml 2009-01-01 05:03:01.000000000 +0100
++++ mozilla/browser/base/content/credits.xhtml 2009-06-28 13:16:06.000000000 +0200
@@ -206,7 +206,7 @@
</div>
@@ -143,8 +143,8 @@
as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of
“commercial computer software” and “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
+--- mozilla.orig/browser/branding/unofficial/pref/firefox-branding.js 2006-11-22 03:21:20.000000000 +0100
++++ mozilla/browser/branding/unofficial/pref/firefox-branding.js 2009-06-28 13:16:06.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/");
@@ -166,9 +166,9 @@
// 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-07-29 13:24:18.000000000 +0200
-+++ mozilla/browser/components/nsBrowserContentHandler.js 2008-07-29 13:34:50.000000000 +0200
-@@ -836,7 +836,7 @@
+--- mozilla.orig/browser/components/nsBrowserContentHandler.js 2008-11-18 22:36:21.000000000 +0100
++++ mozilla/browser/components/nsBrowserContentHandler.js 2009-06-28 13:16:06.000000000 +0200
+@@ -843,7 +843,7 @@
},
// XXX localize me... how?
@@ -178,9 +178,9 @@
/* 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-07-29 13:24:18.000000000 +0200
-+++ mozilla/browser/components/nsBrowserGlue.js 2008-07-29 13:34:50.000000000 +0200
-@@ -759,7 +759,7 @@
+--- mozilla.orig/browser/components/nsBrowserGlue.js 2008-11-20 22:47:58.000000000 +0100
++++ mozilla/browser/components/nsBrowserGlue.js 2009-06-28 13:16:06.000000000 +0200
+@@ -884,7 +884,7 @@
},
// for XPCOM
@@ -190,8 +190,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-07-29 13:24:18.000000000 +0200
-+++ mozilla/browser/components/preferences/advanced.xul 2008-07-29 13:34:50.000000000 +0200
+--- mozilla.orig/browser/components/preferences/advanced.xul 2008-05-09 22:59:09.000000000 +0200
++++ mozilla/browser/components/preferences/advanced.xul 2009-06-28 13:16:06.000000000 +0200
@@ -267,10 +267,6 @@
<tabpanel id="updatePanel" orient="vertical" align="start">
<label control="autoUpdateGroup">&autoCheck.label;</label>
@@ -204,9 +204,9 @@
label="&enableAddonsUpdate.label;"
accesskey="&enableAddonsUpdate.accesskey;"
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-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 @@
+--- mozilla.orig/browser/components/safebrowsing/content/report-phishing-overlay.xul 2008-08-15 21:36:20.000000000 +0200
++++ mozilla/browser/components/safebrowsing/content/report-phishing-overlay.xul 2009-06-28 13:16:06.000000000 +0200
+@@ -52,7 +52,7 @@
<menuitem id="menu_HelpPopup_reportPhishingtoolmenu"
label="&reportPhishSiteMenu.title2;"
accesskey="&reportPhishSiteMenu.accesskey;"
@@ -216,8 +216,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-07-29 13:24:18.000000000 +0200
-+++ mozilla/browser/components/shell/src/nsWindowsShellService.cpp 2008-07-29 13:34:50.000000000 +0200
+--- mozilla.orig/browser/components/shell/src/nsWindowsShellService.cpp 2008-08-12 03:21:27.000000000 +0200
++++ mozilla/browser/components/shell/src/nsWindowsShellService.cpp 2009-06-28 13:16:06.000000000 +0200
@@ -189,7 +189,7 @@
PRInt32 flags;
} SETTING;
@@ -228,8 +228,8 @@
#define SOP "\\shell\\open\\command"
diff -urN mozilla.orig/browser/confvars.sh mozilla/browser/confvars.sh
---- 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
+--- mozilla.orig/browser/confvars.sh 2009-04-20 20:15:50.000000000 +0200
++++ mozilla/browser/confvars.sh 2009-06-28 13:16:06.000000000 +0200
@@ -36,7 +36,7 @@
#
# ***** END LICENSE BLOCK *****
@@ -240,8 +240,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-07-29 13:24:18.000000000 +0200
-+++ mozilla/browser/locales/en-US/chrome/browser/aboutDialog.dtd 2008-07-29 13:34:50.000000000 +0200
+--- mozilla.orig/browser/locales/en-US/chrome/browser/aboutDialog.dtd 2009-01-01 05:03:01.000000000 +0100
++++ mozilla/browser/locales/en-US/chrome/browser/aboutDialog.dtd 2009-06-28 13:16:06.000000000 +0200
@@ -4,6 +4,4 @@
<!ENTITY aboutLink "< About &brandFullName;">
<!ENTITY aboutLink.accesskey "A">
@@ -251,8 +251,8 @@
- reserved.">
+<!ENTITY copyrightInfo "©1998-2009 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-07-29 13:24:18.000000000 +0200
-+++ mozilla/browser/locales/en-US/chrome/overrides/appstrings.properties 2008-07-29 13:34:50.000000000 +0200
+--- mozilla.orig/browser/locales/en-US/chrome/overrides/appstrings.properties 2008-01-17 17:07:11.000000000 +0100
++++ mozilla/browser/locales/en-US/chrome/overrides/appstrings.properties 2009-06-28 13:16:06.000000000 +0200
@@ -35,23 +35,23 @@
# ***** END LICENSE BLOCK *****
@@ -288,8 +288,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-07-29 13:24:18.000000000 +0200
-+++ mozilla/browser/locales/en-US/searchplugins/answers.xml 2008-07-29 13:34:50.000000000 +0200
+--- mozilla.orig/browser/locales/en-US/searchplugins/answers.xml 2006-07-05 20:47:38.000000000 +0200
++++ mozilla/browser/locales/en-US/searchplugins/answers.xml 2009-06-28 13:16:06.000000000 +0200
@@ -8,6 +8,6 @@
<Param name="gwp" value="13"/>
</Url>
@@ -299,8 +299,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-07-29 13:24:18.000000000 +0200
-+++ mozilla/browser/locales/en-US/searchplugins/google.xml 2008-07-29 13:34:51.000000000 +0200
+--- mozilla.orig/browser/locales/en-US/searchplugins/google.xml 2008-04-16 06:08:20.000000000 +0200
++++ mozilla/browser/locales/en-US/searchplugins/google.xml 2009-06-28 13:16:06.000000000 +0200
@@ -3,7 +3,7 @@
<Description>Google Search</Description>
<InputEncoding>UTF-8</InputEncoding>
@@ -321,8 +321,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-07-29 13:24:18.000000000 +0200
-+++ mozilla/browser/locales/en-US/updater/updater.ini 2008-07-29 13:34:51.000000000 +0200
+--- mozilla.orig/browser/locales/en-US/updater/updater.ini 2007-11-27 03:44:45.000000000 +0100
++++ mozilla/browser/locales/en-US/updater/updater.ini 2009-06-28 13:16:06.000000000 +0200
@@ -1,4 +1,4 @@
; This file is in the UTF-8 encoding
[Strings]
@@ -330,8 +330,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-07-29 13:24:30.000000000 +0200
-+++ mozilla/extensions/reporter/resources/content/reporter/reporterOverlay.xul 2008-07-29 13:34:51.000000000 +0200
+--- mozilla.orig/extensions/reporter/resources/content/reporter/reporterOverlay.xul 2008-04-24 00:39:30.000000000 +0200
++++ mozilla/extensions/reporter/resources/content/reporter/reporterOverlay.xul 2009-06-28 13:16:06.000000000 +0200
@@ -53,7 +53,7 @@
<menuitem id="menu_HelpPopup_reportertoolmenu"
label="&reporterMenu2.title;"
@@ -342,9 +342,9 @@
oncommand="loadReporterWizard()"/>
</menupopup>
diff -urN mozilla.orig/toolkit/xre/nsAppRunner.cpp mozilla/toolkit/xre/nsAppRunner.cpp
---- 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 @@
+--- mozilla.orig/toolkit/xre/nsAppRunner.cpp 2009-04-14 09:55:49.000000000 +0200
++++ mozilla/toolkit/xre/nsAppRunner.cpp 2009-06-28 13:18:04.000000000 +0200
+@@ -1206,8 +1206,7 @@
static inline void
DumpVersion()
{
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel-branding.patch?r1=1.8&r2=1.9&f=u
More information about the pld-cvs-commit
mailing list