packages: iceape/iceape-branding.patch, iceape/iceape-pld-branding.patch, i...

baggins baggins at pld-linux.org
Tue Jun 5 15:08:44 CEST 2012 

Author: baggins                      Date: Tue Jun  5 13:08:44 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated iceape branding, from debian

---- Files affected:
packages/iceape:
   iceape-branding.patch (1.7 -> 1.8) , iceape-pld-branding.patch (1.1 -> 1.2) , iceape.spec (1.40 -> 1.41) 

---- Diffs:

================================================================
Index: packages/iceape/iceape-branding.patch
diff -u packages/iceape/iceape-branding.patch:1.7 packages/iceape/iceape-branding.patch:1.8
--- packages/iceape/iceape-branding.patch:1.7	Wed Mar 25 01:12:30 2009
+++ packages/iceape/iceape-branding.patch	Tue Jun  5 15:08:39 2012
@@ -1,425 +1,124 @@
-diff -urN mozilla.orig/configure mozilla/configure
---- 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
- suite)
--  MOZ_APP_NAME=seamonkey
--  MOZ_APP_DISPLAYNAME=SeaMonkey
-+  MOZ_APP_NAME=iceape
-+  MOZ_APP_DISPLAYNAME=Iceape
-   MOZ_MAIL_NEWS=1
-   MOZ_LDAP_XPCOM=1
-   MOZ_COMPOSER=1
-diff -urN mozilla.orig/configure.in mozilla/configure.in
---- 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
- suite)
--  MOZ_APP_NAME=seamonkey
--  MOZ_APP_DISPLAYNAME=SeaMonkey
-+  MOZ_APP_NAME=iceape
-+  MOZ_APP_DISPLAYNAME=Iceape
-   MOZ_MAIL_NEWS=1
-   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-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>
-   </li>
--  <li><strong>Check for updates</strong>: Select this to be notified when new
--    versions of &brandShortName; are available. Your personal information is
--    not shared with &brandShortName; when verifying your version of
--    &brandShortName;.
--    <ul>
--      <li><strong>weekly</strong>: Choose this if you want &brandShortName; to
--        check once a week to see if a new version of &brandShortName; is
--        available.</li>
--      <li><strong>monthly</strong>: Choose this if you want &brandShortName; to
--        check once a month to see if a new version of &brandShortName; is
--        available.</li>
--    </ul>
--  </li>
- </ul>
- 
- <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-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>
- <p>&dict_info.label;</p>
--<h2>&info.title;</h2>
--<p>&info_bugs.label;</p>
- </div>
- 
- </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-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 & Newsgroups">
- <!ENTITY headline.label
--'Welcome to <a href="&vendorURL;">&brandShortName;</a> Mail & Newsgroups!'>
-+'Welcome to &brandShortName; Mail & Newsgroups!'>
- <!ENTITY description.label
- "&brandShortName; Mail & 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-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 },
-     { "config", "chrome://global/content/config.xul", PR_FALSE },
--    { "logo", "chrome://global/content/logo.gif", PR_TRUE },
-+    { "logo", "chrome://global/content/logo.png", PR_TRUE },
-     { "buildconfig", "chrome://global/content/buildconfig.html", PR_TRUE },
-     { "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-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
- 
-+install::
-+ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
-+	$(SYSINSTALL) $(IFLAGS1) $(srcdir)/icons/gtk/default.xpm $(DESTDIR)$(mozappdir)/chrome/icons/default
-+	$(SYSINSTALL) $(IFLAGS1) $(srcdir)/icons/gtk/default16.xpm $(DESTDIR)$(mozappdir)/chrome/icons/default
-+	$(SYSINSTALL) $(IFLAGS1) $(srcdir)/icons/gtk/seamonkey.png $(DESTDIR)$(mozappdir)/chrome/icons/default
-+endif
-+
- 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-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)
-   skin/classic/communicator/icons/loading.gif                           (communicator/icons/loading.gif)
--  skin/classic/communicator/icons/turbo-systray.gif                     (communicator/icons/turbo-systray.gif)
-   skin/classic/communicator/icons/btn1.gif                              (communicator/icons/btn1.gif)
-   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-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)
-   skin/modern/communicator/icons/online.gif                        (communicator/icons/online.gif)
--  skin/modern/communicator/icons/turbo-systray.gif                 (communicator/icons/turbo-systray.gif)
-   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-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()
- {
--  printf("%s %s %s, %s\n", gAppData->vendor ? gAppData->vendor : "", gAppData->name, gAppData->version, gAppData->copyright);
-+  printf("%s %s, %s\n", gAppData->name, gAppData->version, gAppData->copyright);
- }
- 
- #ifdef MOZ_ENABLE_XREMOTE
-diff -urN mozilla.orig/xpfe/bootstrap/nsAppRunner.cpp mozilla/xpfe/bootstrap/nsAppRunner.cpp
---- 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 */
-       ) {
--      DumpHelp(argv[0]);
-+      DumpHelp(NS_STRINGIFY(MOZ_APP_DISPLAYNAME));
-       return PR_TRUE;
-     }
-     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-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/
-+homePageDefault=about:
- keywordList=http://home.netscape.com/escapes/keywords
- webmailKeyword=http://webmail.netscape.com
- fallbackDefaultSearchURL=http://www.google.com/search?q=
-@@ -7,8 +7,8 @@
+diff --git a/suite/browser/browser-prefs.js b/suite/browser/browser-prefs.js
+index 1e3799e..ae4cb1f 100644
+--- a/suite/browser/browser-prefs.js
++++ b/suite/browser/browser-prefs.js
+@@ -41,7 +41,7 @@
+  * modules/libpref/src/init/all.js
+  */
+ 
+-pref("startup.homepage_override_url","chrome://navigator-region/locale/region.properties");
++pref("startup.homepage_override_url","");
+ pref("general.skins.selectedSkin", "classic/1.0");
+ 
+ pref("browser.chromeURL","chrome://navigator/content/navigator.xul");
+@@ -110,7 +110,7 @@ pref("browser.findbar.enabled", true);
+ pref("browser.doorhanger.enabled", true);
+ 
+ // search engines URL
+-pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search-engines/");
++pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/seamonkey/search-engines/");
+ 
+ // pointer to the default engine name
+ pref("browser.search.defaultenginename", "chrome://communicator-region/locale/region.properties");
+@@ -563,7 +563,7 @@ pref("extensions.blocklist.interval", 86400);
+ pref("extensions.blocklist.level", 2);
+ pref("extensions.blocklist.url", "https://addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/");
+ pref("extensions.blocklist.detailsURL", "https://www.mozilla.com/%LOCALE%/blocklist/");
+-pref("extensions.blocklist.itemURL", "https://addons.mozilla.org/%LOCALE%/%APP%/blocked/%blockID%");
++pref("extensions.blocklist.itemURL", "https://addons.mozilla.org/%LOCALE%/seamonkey/blocked/%blockID%");
+ 
+ // Update preferences for installed Extensions and Themes.
+ // Symmetric (can be overridden by individual extensions),
+@@ -587,11 +587,11 @@ pref("extensions.autoDisableScopes", 15);
+ // Preferences for AMO integration
+ pref("extensions.getAddons.cache.enabled", true);  // also toggles personalized recommendations
+ pref("extensions.getAddons.maxResults", 15);
+-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%");
+-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
+-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%");
+-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=seamonkey");
+-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%");
++pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/seamonkey/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%");
++pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/seamonkey/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
++pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/seamonkey/search?q=%TERMS%");
++pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/seamonkey/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=seamonkey");
++pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/seamonkey/discovery/pane/%VERSION%/%OS%");
+ 
+ // getMoreThemes is used by our UI under our switch theme menu
+ pref("extensions.getMoreThemesURL", "chrome://branding/locale/brand.properties");
+diff --git a/suite/locales/en-US/chrome/browser/region.properties b/suite/locales/en-US/chrome/browser/region.properties
+index f56a77e..56e49f2 100644
+--- a/suite/locales/en-US/chrome/browser/region.properties
++++ b/suite/locales/en-US/chrome/browser/region.properties
+@@ -2,8 +2,8 @@
  #
  # all.js
  #
 -browser.startup.homepage=http://www.seamonkey-project.org/start/
-+browser.startup.homepage=about:
 -browser.throbber.url=http://www.seamonkey-project.org/
++browser.startup.homepage=about:
 +browser.throbber.url=http://www.pld-linux.org/Packages/Iceape
  browser.search.defaulturl=http://www.google.com/search?q=
- general.useragent.contentlocale=US
  
-@@ -17,4 +17,4 @@
+ browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u=
+@@ -11,7 +11,7 @@ browser.translation.serviceDomain=translate.google.com
  
  #config.js
  #
--startup.homepage_override_url=http://www.seamonkey-project.org/start/
+-startup.homepage_override_url=http://www.seamonkey-project.org/releases/seamonkey%VERSION%/
 +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-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;">
-     <menupopup id="helpPopup">
--      <menuitem accesskey="&releaseCmd.accesskey;"
--                label="&releaseCmd.label;"
--                id="releaseUrl"
--                oncommand="openTopWin('&releaseURL;');"/>
--
-       <menuseparator id="menu_HelpAboutSeparator"/>
- 
-       <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-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__">
+ 
+ # This is the default set of web based feed handlers shown in the reader
+ # selection UI
+diff --git a/suite/locales/en-US/chrome/branding/brand.dtd b/suite/locales/en-US/chrome/branding/brand.dtd
+index 6459fba..946fab4 100644
+--- a/suite/locales/en-US/chrome/branding/brand.dtd
++++ b/suite/locales/en-US/chrome/branding/brand.dtd
+@@ -1,4 +1,4 @@
 -<!ENTITY  brandFullName         "SeaMonkey">
 -<!ENTITY  brandShortName        "SeaMonkey">
 -<!ENTITY  vendorShortName       "SeaMonkey">
 +<!ENTITY  brandFullName         "Iceape">
 +<!ENTITY  brandShortName        "Iceape">
-+<!ENTITY  vendorShortName       "Iceape">
++<!ENTITY  vendorShortName       "PLD">
  <!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-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 @@
+diff --git a/suite/locales/en-US/chrome/branding/brand.properties b/suite/locales/en-US/chrome/branding/brand.properties
+index f068049..f4a29a9 100644
+--- a/suite/locales/en-US/chrome/branding/brand.properties
++++ b/suite/locales/en-US/chrome/branding/brand.properties
+@@ -1,6 +1,6 @@
 -brandFullName=SeaMonkey
 -brandShortName=SeaMonkey
 -vendorShortName=SeaMonkey
 +brandFullName=Iceape
 +brandShortName=Iceape
-+vendorShortName=Iceape
++vendorShortName=PLD
  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-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>
- 
--  <groupbox align="start">
--    <caption label="&updateNotifications.label;"/>
--    <description>&updateNotifications.desc;</description>
--    <checkbox id="updateNotificationsEnabled" label="&enableUN.label;"
--              accesskey="&enableUN.accesskey;" oncommand="toggleFrequency();"
--              prefstring="update_notifications.enabled"/>
--    <radiogroup id="updateFrequency" orient="horizontal" 
--                prefstring="update_notifications.provider.0.frequency"
--                prefdefval="7">
--      <radio id="freqWeekly" label="&weekly.label;" 
--             accesskey="&weekly.accesskey;" value="7"/>
--      <radio id="freqMonthly" label="&monthly.label;" 
--             accesskey="&monthly.accesskey;" value="30"/>
--    </radiogroup>
--  </groupbox>
--
- <!--
-   <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-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>
- 
- <BODY>
--	<CENTER>SeaMonkey Search</CENTER>
-+	<CENTER>Iceape Search</CENTER>
- </BODY>
- 
- </HTML>
-diff -urN mozilla.orig/xpfe/global/jar.mn mozilla/xpfe/global/jar.mn
---- 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) 
- #ifdef MOZ_SUITE
--        content/global/logo.gif                     (/suite/branding/content/logo.gif) 
-+        content/global/logo.png                     (/suite/branding/content/logo.png) 
- #else
--        content/global/logo.gif                     (resources/content/logo.gif) 
-+        content/global/logo.png                     (resources/content/logo.png) 
- #endif
-         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-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>
- <style type="text/css">
--table {
--  margin: auto;
--  text-align: center;
-+html {
-+  background: -moz-Dialog;
- }
-+
-+body {
-+  margin: 0;
-+  padding: 0 1em;
-+  color: -moz-FieldText;
-+  font: message-box;
-+}
-+
-+ #aboutPageContainer {
-+  position: relative;
-+  min-width: 330px;
-+  max-width: 50em;
-+  margin: 4em auto;
-+  border: 1px solid ThreeDShadow;
-+  -moz-border-radius: 10px;
-+  padding: 3em;
-+  -moz-padding-start: 30px;
-+  background: -moz-Field;
-+}
-+
-+ #aboutLogoContainer {
-+  border: 1px solid ThreeDLightShadow;
-+  width: 300px;
-+  margin-bottom: 2em;
-+}
-+
- img {
-   border: 0;
- }
--p {
--  font-size: smaller;
-+
-+ #version {
-+  font-weight: bold;
-+  color: #909090;
-+  margin: -24px 0 9px 17px;
- }
--h1 {
-+
-+ul {
-   margin: 0;
-+  -moz-margin-start: 1.5em;
-+  padding: 0;
-+  list-style: square;
- }
--:link {
--  color: #00e;
--}
--:visited {
--  color: #551a8b;
--}
--:link:active, :visited:active {
--  color: #f00;
-+
-+ul > li {
-+  margin-top: .5em;
- }
- </style>
- </head>
- <body>
-+<div id="aboutPageContainer">
-+  <div id="aboutLogoContainer">
-+    <img src="about:logo" alt="&brandShortName;" />
-+#expand <p id="version">&brandShortName; __MOZ_APP_VERSION__</p>
-+  </div>
-+
-+  <ul id="aboutPageList">
-+    <li>Copyright © 1998-2009 by <a href="about:credits">contributors</a> to the Mozilla Project.</li>
-+    <li>Read the <a href="about:license">licensing information</a> for this product.</li>
-+    <li>See the <a href="about:buildconfig">build configuration</a> used for this version.</li>
-+    <script type="application/x-javascript">
-+      // add build identifier
-+      var ua = navigator.userAgent;
-+      if (ua) {
-+        var list = document.getElementById("aboutPageList");
-+        var listItem = list.appendChild(document.createElement("li"));
-+        listItem.appendChild(document.createTextNode("Build identifier: " + ua));
-+      }
-+    </script>
-+  </ul>
- 
--<table>
--<tbody>
--<tr>
--
--<td>
--<a href="&vendorURL;">
--<img src="about:logo" alt="&brandShortName;" width="200" height="200" /></a>
--</td>
--
--<td id="mozver">
--<h1>
--#expand <a id="mozlink" href="&releaseURL;">&brandShortName; __MOZ_APP_VERSION__</a>
--</h1>
--<script type="application/x-javascript">
--  document.getElementById("mozver").appendChild(document.createTextNode(navigator.userAgent));
--</script>
--</td>
--
--</tr>
--</tbody>
--</table>
--
--<hr />
--
--<ul>
--<li>Copyright © 1998–2009 by <a href="about:credits">Contributors</a> to 
--the Mozilla codebase under the <a href="about:license">Mozilla Public License
--and other licenses</a>.  All Rights Reserved.</li>
--
--<li>Portions of this software are copyright © 1994 The Regents of the 
--University of California.  All Rights Reserved.</li>
--<li>Portions of this software are copyright © 2000–2002 Japan Network Information
--Center. All Rights Reserved.</li>
--<li>This software may contain portions that are copyright © 1998–2002 
--<a href="http://www.supportsoft.com/">SupportSoft, Inc.</a>  All Rights Reserved.
--</li>
--</ul>
--
--<p>
--U.S. GOVERNMENT END USERS. The Software is a "commercial
--item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting
--of "commercial computer software" and "commercial computer software 
--documentation," as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). 
--Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4
--(June 1995), all U.S. Government End Users acquire the Software with only 
--those rights set forth herein.
--</p>
--
-+</div>
- </body>
- </html>
+ extensions.getMoreThemesURL=https://addons.mozilla.org/%LOCALE%/%APP%/themes
+ extensions.getPersonasURL=https://addons.mozilla.org/%LOCALE%/%APP%/personas
+diff --git a/suite/themes/classic/install.rdf b/suite/themes/classic/install.rdf
+index 8b77d5d..2ea4fb9 100644
+--- a/suite/themes/classic/install.rdf
++++ b/suite/themes/classic/install.rdf
+@@ -21,7 +21,7 @@
+     </em:targetApplication>
+ 
+     <!-- Front End MetaData -->
+-    <em:name>SeaMonkey Default Theme</em:name>
++    <em:name>Iceape Default Theme</em:name>
+     <em:description>This theme uses styles and colors from the system to fit in with other applications.</em:description>
+ 
+     <!-- EXTENSION AUTHORS!
+diff --git a/suite/themes/modern/install.rdf b/suite/themes/modern/install.rdf
+index d20cb5b..4fa63af 100644
+--- a/suite/themes/modern/install.rdf
++++ b/suite/themes/modern/install.rdf
+@@ -20,7 +20,7 @@
+     </em:targetApplication>
+ 
+     <!-- Front End MetaData -->
+-    <em:name>SeaMonkey Modern</em:name>
++    <em:name>Iceape Modern</em:name>
+     <em:description>A contemporary theme for all components.</em:description>
+ 
+     <!-- EXTENSION AUTHORS!

================================================================
Index: packages/iceape/iceape-pld-branding.patch
diff -u packages/iceape/iceape-pld-branding.patch:1.1 packages/iceape/iceape-pld-branding.patch:1.2
--- packages/iceape/iceape-pld-branding.patch:1.1	Tue Jul 29 17:05:57 2008
+++ packages/iceape/iceape-pld-branding.patch	Tue Jun  5 15:08:39 2012
@@ -1,16 +1,15 @@
---- mozilla/profile/defaults/bookmarks.html.orig	2008-01-29 20:30:47.000000000 +0100
-+++ mozilla/profile/defaults/bookmarks.html	2008-06-25 16:04:19.000000000 +0200
-@@ -37,5 +37,13 @@
-         <DT><A HREF="http://groups.google.com/">Google Groups</A>
-         <DT><A HREF="http://news.google.com/">Google News</A>
+--- a/mozilla/browser/locales/generic/profile/bookmarks.html.in	2009-06-24 10:20:29.000000000 +0200
++++ b.mozilla/browser/locales/generic/profile/bookmarks.html.in	2009-06-28 15:29:30.000000000 +0200
+@@ -24,4 +24,12 @@
+         <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A>
+         <DT><A HREF="http://www.mozilla.com/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A>
      </DL><p>
 +    <DT><H3>PLD Linux Distribution</H3>
 +    <DL><p>
-+        <DT><A HREF="http://www.pld-linux.org/">PLD Home Page</A>
-+        <DT><A HREF="http://www.pld-users.org/">PLD Users Wiki</A>
-+        <DT><A HREF="http://docs.pld-linux.org/">PLD Documentation in english</A>
-+        <DT><A HREF="http://pl.docs.pld-linux.org">PLD Documentation in polish</A>
-+        <DT><A HREF="http://planet.pld-linux.org/">Planet PLD</A>
++        <DT><A HREF="http://www.pld-linux.org/" ICON_URI="http://www.pld-linux.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHUlEQVQ4jc1SwWqDQBB91pyFpsWLSGklRVHw7CnJLyTpzaMf4Dck5Feay4bc96T4BQkevCTiXc0nTA9lxbIJ2FP7YFh2Zt+bN8MCfw1lyKPmWhNjDACwWq3w9Pjc8UZDBBhj4JxjPB5j97n7UXu4RTjlR2quNYk75xwA0LYtJu8T9GsSNts1KSrIcW3aHxg115oM0yDHtUlRQcuPxX2ywGw+JUUFGaZBaZaQoqKLQQKiq3DSF0iz5L7AKT92RTFKPxzXlsjdEtMsId/3ISzqui41iONYyo2E5eViiSiKEIYhLMui8/l802VZXUjTNOR5Ds/zvhOb7ZrK6iLZ2x8YzeZTMkxDOsWSlbK60OvL26Af2R+3KAoEQfAb2n/FF3KJkR/xf7tGAAAAAElFTkSuQmCC">PLD Home Page</A>
++        <DT><A HREF="http://www.pld-users.org/" ICON_URI="http://www.pld-linux.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHUlEQVQ4jc1SwWqDQBB91pyFpsWLSGklRVHw7CnJLyTpzaMf4Dck5Feay4bc96T4BQkevCTiXc0nTA9lxbIJ2FP7YFh2Zt+bN8MCfw1lyKPmWhNjDACwWq3w9Pjc8UZDBBhj4JxjPB5j97n7UXu4RTjlR2quNYk75xwA0LYtJu8T9GsSNts1KSrIcW3aHxg115oM0yDHtUlRQcuPxX2ywGw+JUUFGaZBaZaQoqKLQQKiq3DSF0iz5L7AKT92RTFKPxzXlsjdEtMsId/3ISzqui41iONYyo2E5eViiSiKEIYhLMui8/l802VZXUjTNOR5Ds/zvhOb7ZrK6iLZ2x8YzeZTMkxDOsWSlbK60OvL26Af2R+3KAoEQfAb2n/FF3KJkR/xf7tGAAAAAElFTkSuQmCC">PLD Users Wiki</A>
++        <DT><A HREF="http://docs.pld-linux.org/" ICON_URI="http://www.pld-linux.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHUlEQVQ4jc1SwWqDQBB91pyFpsWLSGklRVHw7CnJLyTpzaMf4Dck5Feay4bc96T4BQkevCTiXc0nTA9lxbIJ2FP7YFh2Zt+bN8MCfw1lyKPmWhNjDACwWq3w9Pjc8UZDBBhj4JxjPB5j97n7UXu4RTjlR2quNYk75xwA0LYtJu8T9GsSNts1KSrIcW3aHxg115oM0yDHtUlRQcuPxX2ywGw+JUUFGaZBaZaQoqKLQQKiq3DSF0iz5L7AKT92RTFKPxzXlsjdEtMsId/3ISzqui41iONYyo2E5eViiSiKEIYhLMui8/l802VZXUjTNOR5Ds/zvhOb7ZrK6iLZ2x8YzeZTMkxDOsWSlbK60OvL26Af2R+3KAoEQfAb2n/FF3KJkR/xf7tGAAAAAElFTkSuQmCC">PLD Documentation in english</A>
++        <DT><A HREF="http://pl.docs.pld-linux.org/" ICON_URI="http://www.pld-linux.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHUlEQVQ4jc1SwWqDQBB91pyFpsWLSGklRVHw7CnJLyTpzaMf4Dck5Feay4bc96T4BQkevCTiXc0nTA9lxbIJ2FP7YFh2Zt+bN8MCfw1lyKPmWhNjDACwWq3w9Pjc8UZDBBhj4JxjPB5j97n7UXu4RTjlR2quNYk75xwA0LYtJu8T9GsSNts1KSrIcW3aHxg115oM0yDHtUlRQcuPxX2ywGw+JUUFGaZBaZaQoqKLQQKiq3DSF0iz5L7AKT92RTFKPxzXlsjdEtMsId/3ISzqui41iONYyo2E5eViiSiKEIYhLMui8/l802VZXUjTNOR5Ds/zvhOb7ZrK6iLZ2x8YzeZTMkxDOsWSlbK60OvL26Af2R+3KAoEQfAb2n/FF3KJkR/xf7tGAAAAAElFTkSuQmCC">PLD Documentation in polish</A>
++        <DT><A HREF="http://planet.pld-linux.org/" ICON_URI="http://www.pld-linux.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHUlEQVQ4jc1SwWqDQBB91pyFpsWLSGklRVHw7CnJLyTpzaMf4Dck5Feay4bc96T4BQkevCTiXc0nTA9lxbIJ2FP7YFh2Zt+bN8MCfw1lyKPmWhNjDACwWq3w9Pjc8UZDBBhj4JxjPB5j97n7UXu4RTjlR2quNYk75xwA0LYtJu8T9GsSNts1KSrIcW3aHxg115oM0yDHtUlRQcuPxX2ywGw+JUUFGaZBaZaQoqKLQQKiq3DSF0iz5L7AKT92RTFKPxzXlsjdEtMsId/3ISzqui41iONYyo2E5eViiSiKEIYhLMui8/l802VZXUjTNOR5Ds/zvhOb7ZrK6iLZ2x8YzeZTMkxDOsWSlbK60OvL26Af2R+3KAoEQfAb2n/FF3KJkR/xf7tGAAAAAElFTkSuQmCC">Planet PLD</A>
 +    </DL><p>
-     <HR>
  </DL><p>

================================================================
Index: packages/iceape/iceape.spec
diff -u packages/iceape/iceape.spec:1.40 packages/iceape/iceape.spec:1.41
--- packages/iceape/iceape.spec:1.40	Mon Jun  4 19:24:09 2012
+++ packages/iceape/iceape.spec	Tue Jun  5 15:08:39 2012
@@ -38,13 +38,14 @@
 Source1:	http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz
 # Source1-md5:	0eba75fbcf8f0bb32d538df102fbb8e9
 Source2:	%{name}-branding.tar.bz2
-# Source2-md5:	841caa8235c5350737c09fbbc681e9d3
+# Source2-md5:	6cbf2f0e62c042946bf351f1e2d1b256
 Source3:	%{name}-rm_nonfree.sh
 Source4:	%{name}.desktop
 Source5:	%{name}-composer.desktop
 Source6:	%{name}-chat.desktop
 Source7:	%{name}-mail.desktop
 Source8:	%{name}-venkman.desktop
+Source9:	%{name}.sh
 Patch0:		%{name}-branding.patch
 Patch1:		%{name}-pld-branding.patch
 Patch2:		%{name}-agent.patch
@@ -78,8 +79,10 @@
 BuildRequires:	libnotify-devel >= 0.4
 BuildRequires:	libpng(APNG)-devel >= 0.10
 BuildRequires:	libpng-devel >= 1.4.1
+# rsvg-convert for iceape/branding
+BuildRequires:	librsvg
 BuildRequires:	libstdc++-devel
-BuildRequires:	libvpx-devel
+BuildRequires:	libvpx-devel >= 1.0.0
 BuildRequires:	nspr-devel >= 1:%{nspr_ver}
 BuildRequires:	nss-devel >= 1:%{nss_ver}
 BuildRequires:	pango-devel >= 1:1.14.0
@@ -253,6 +256,7 @@
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/packages/iceape/iceape-branding.patch?r1=1.7&r2=1.8
    http://cvs.pld-linux.org/packages/iceape/iceape-pld-branding.patch?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/iceape/iceape.spec?r1=1.40&r2=1.41

More information about the pld-cvs-commit mailing list