SOURCES: iceweasel-branding.patch, icedove-branding.patch - don't patch non...

[hawk]

Author: hawk                         Date: Tue Jul 29 16:26:58 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- don't patch non-free stuff, it gets removed before applying

---- Files affected:
SOURCES:
   iceweasel-branding.patch (1.4 -> 1.5) , icedove-branding.patch (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SOURCES/iceweasel-branding.patch
diff -u SOURCES/iceweasel-branding.patch:1.4 SOURCES/iceweasel-branding.patch:1.5
--- SOURCES/iceweasel-branding.patch:1.4	Tue Jul 29 15:47:23 2008
+++ SOURCES/iceweasel-branding.patch	Tue Jul 29 18:26:52 2008
@@ -353,29 +353,6 @@
                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-07-29 13:25:13.000000000 +0200
 +++ mozilla/toolkit/xre/nsAppRunner.cpp	2008-07-29 13:34:51.000000000 +0200

================================================================
Index: SOURCES/icedove-branding.patch
diff -u SOURCES/icedove-branding.patch:1.7 SOURCES/icedove-branding.patch:1.8
--- SOURCES/icedove-branding.patch:1.7	Tue Jul 29 15:47:23 2008
+++ SOURCES/icedove-branding.patch	Tue Jul 29 18:26:52 2008
@@ -261,21 +261,6 @@
  Title=Software Update
 -Info=Thunderbird is installing your updates and will start in a few moments...
 +Info=Icedove is installing your updates and will start in a few moments...
-diff -urN mozilla.orig/other-licenses/branding/thunderbird/thunderbird-branding.js mozilla/other-licenses/branding/thunderbird/thunderbird-branding.js
---- mozilla.orig/other-licenses/branding/thunderbird/thunderbird-branding.js	2008-07-29 13:28:22.000000000 +0200
-+++ mozilla/other-licenses/branding/thunderbird/thunderbird-branding.js	2008-07-29 14:02:15.000000000 +0200
-@@ -1,8 +1,8 @@
- // Default start page
--pref("mailnews.start_page.url", "http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/%VERSION%/start/");
-+pref("mailnews.start_page.url", "http://%LOCALE%.www.mozilla.com/%LOCALE%/thunderbird/%VERSION%/start/");
- 
- // first launch welcome page
--pref("mailnews.start_page.welcome_url", "http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/%VERSION%/start/");
-+pref("mailnews.start_page.welcome_url", "http://%LOCALE%.www.mozilla.com/%LOCALE%/thunderbird/%VERSION%/start/");
- 
- // start page override to load after an update
--pref("mailnews.start_page.override_url", "http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/%VERSION%/start/");
-+pref("mailnews.start_page.override_url", "http://%LOCALE%.www.mozilla.com/%LOCALE%/thunderbird/%VERSION%/start/");
 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:29:02.000000000 +0200
 +++ mozilla/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties	2008-07-29 14:01:58.000000000 +0200
================================================================

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