From caf615ca06a8be1a819ddc84b5507ad9b73db900 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ra=C3=BAl=20Porcel?= Date: Fri, 29 Feb 2008 15:02:59 +0000 Subject: [PATCH] Use icons in the tarball instead, bug #204312, and report correct browser name when iceweasel is enabled, bug #210308 Package-Manager: portage-2.1.4.4 --- www-client/mozilla-firefox/ChangeLog | 8 +++++++- www-client/mozilla-firefox/Manifest | 8 +++----- .../files/icon/firefox-icon-unbranded.png | Bin 2963 -> 0 bytes .../mozilla-firefox/files/icon/firefox-icon.png | Bin 3979 -> 0 bytes .../mozilla-firefox-2.0.0.11.ebuild | 6 +++--- .../mozilla-firefox-2.0.0.12.ebuild | 7 ++++--- 6 files changed, 17 insertions(+), 12 deletions(-) delete mode 100644 www-client/mozilla-firefox/files/icon/firefox-icon-unbranded.png delete mode 100644 www-client/mozilla-firefox/files/icon/firefox-icon.png diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog index 4c24d7b41023..c6df50114c55 100644 --- a/www-client/mozilla-firefox/ChangeLog +++ b/www-client/mozilla-firefox/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-client/mozilla-firefox # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.377 2008/02/14 14:18:09 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.378 2008/02/29 15:02:58 armin76 Exp $ + + 29 Feb 2008; Raúl Porcel + -files/icon/firefox-icon.png, -files/icon/firefox-icon-unbranded.png, + mozilla-firefox-2.0.0.11.ebuild, mozilla-firefox-2.0.0.12.ebuild: + Use icons in the tarball instead, bug #204312, and report correct browser + name when iceweasel is enabled, bug #210308 14 Feb 2008; Raúl Porcel files/icon/mozilla-firefox-1.5-unbranded.desktop, diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest index 9bb5c3ef94ad..da5b352a2257 100644 --- a/www-client/mozilla-firefox/Manifest +++ b/www-client/mozilla-firefox/Manifest @@ -1,7 +1,5 @@ AUX firefox.1 2538 RMD160 4564007d7d5345e9ab09c941015e3cdb78913835 SHA1 8be1987451117820744ecc67fa411facdc653a12 SHA256 3483439a73c74b818bdde98c15223b6d3fcfe78e3ad974fb35f197cf3ad614e7 AUX gentoo-default-prefs.js 565 RMD160 2cc248e9375e75d86d90cf4f5b4634b384df9aa6 SHA1 3adfdb6763fa340b87a0b0ddeb23c6aeca025d4c SHA256 12deb91fe8d41eaa27b45eec7b9a431025b262ea0a29f08f66253fb85dec6916 -AUX icon/firefox-icon-unbranded.png 2963 RMD160 4244d088d65b03d34ee7a66ed9145064d930013a SHA1 0b4ed3d1bb9be7ba8278eac49f465afb39b89b6e SHA256 a3413e62d6d7088f5ca5be575cb1af933187d828a8dfb4e49552a2441958d6a8 -AUX icon/firefox-icon.png 3979 RMD160 7d8f39974e9853dcdd4af05142c9b57ae187ab45 SHA1 4f009c0be2fb48bb2d95422bbde96d8e10e6dd9d SHA256 064ddf97649424540df1d4a4727ee4c08d6b2b7389621855601aec58241ac67e AUX icon/iceweasel.desktop 251 RMD160 56a1e32c06c3bd460d15f5fc56d23293cffd62bd SHA1 51f9c9e098e2ce565569b220987b714ebed27e38 SHA256 04b952df4b80af25ea9cfb93fc992f921120c491f52640680e2b70b96ebc7dd7 AUX icon/mozilla-firefox-1.5-unbranded.desktop 258 RMD160 32ebb016d6a4d3d2728c031f3b3762796e02f5d3 SHA1 69820d445d06b90d7ac35ffd39dad5926caa0862 SHA256 f2bf5c237a5c56b443c20fd16d3da429bf3b99e9fe27b661a1a462aa46ed25d3 AUX icon/mozilla-firefox-1.5.desktop 255 RMD160 4ef1cf548f11057274620b82f0728958a3424bea SHA1 6a440f817072fb60516c1a1d999dffb6d3fa1583 SHA256 9bf6e1264d986c68d64831d166ed6b506bff6df8b56d21bfc166aee09cbc753f @@ -98,7 +96,7 @@ DIST mozilla-firefox-2.0.0.12-tr.xpi 148658 RMD160 7f1290b74bb98f5d73f86c2d79883 DIST mozilla-firefox-2.0.0.12-uk.xpi 158420 RMD160 40c8a3026049918b47798de4a309d3cdf2bffe3c SHA1 2ddec772ee74d0471ed1920fc5c910000c28d705 SHA256 a2faecb10ee6511a6f55201b8feee2d630ad51a544badbed205b2b2f283832f0 DIST mozilla-firefox-2.0.0.12-zh-CN.xpi 139266 RMD160 f7cb9f25e0e494fd8aa011ecd974b100fdf0500a SHA1 aa7f6c6a65624b8ac5d07cab2ab9c62f31d9a736 SHA256 320f43ee5f4ce297cf99307fc9fea33ae7b7f300e55cd44592d1932047818d29 DIST mozilla-firefox-2.0.0.12-zh-TW.xpi 141996 RMD160 585278ad480ef28c40f780a24810960fa6d14d25 SHA1 b19e38a768ba159ea31a099a658cf0d1f3668da3 SHA256 8ce68fc2f8681ddd798048385ecf85548f235a359bd6ee6ed7738cf9d55c07db -EBUILD mozilla-firefox-2.0.0.11.ebuild 9872 RMD160 8d11504b554bb7d704f94173e1d78019e270e068 SHA1 99eef3f6f86557de49599a7e79dfedcd8767a599 SHA256 835c91ee2974a233a4ae046070940fa03003298fd090a0a78429ec41c4363b2c -EBUILD mozilla-firefox-2.0.0.12.ebuild 9882 RMD160 1974c588f43719016c7bc49474acf56b8b6d63d9 SHA1 eb3f3fa0f4a7eaae7a3e286d3847a04df9e1a4c9 SHA256 1a8e0d52f4ca8b0b4f66d5086bad5404ad39e22c4d4300e3ac403d13c56a0f3c -MISC ChangeLog 78584 RMD160 3192737aa59eb87a98df48d8972c521cb121a0dc SHA1 f06e75dfdadb00455ca40dcc02d8e40868f34796 SHA256 79a9b6894ec2605e03280503df59d0c10740e1f82eab8d69a34683edc8465841 +EBUILD mozilla-firefox-2.0.0.11.ebuild 9934 RMD160 6e0f12ef429254fa9d8435ad712011e5685b9fa2 SHA1 f2da9909534bbcba5e5bae617fafbba0025e4580 SHA256 734e54f15ecff9e4367203f49aca4c9eaefce6c705f6d5cccf29bdff8beb8027 +EBUILD mozilla-firefox-2.0.0.12.ebuild 9993 RMD160 86c358d9037707b2c3b7dcc4cf63ffc066f0501e SHA1 f3875c2c95465acc0cc3977033f65cb6fc845801 SHA256 d3d721d5faea984c0845a52069142a6c3bf01bd7408d2a9ee25c6370466f2a7d +MISC ChangeLog 78896 RMD160 2c2c910c97d17bbe5f67237978125eee894657f1 SHA1 24e2b9dcf18705c201b526b9890405da0fc8ce2c SHA256 6f20ea0a63ab0def007592fed9c3a66cb7eb35033cedfe4b6b3de09eb2ce6133 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b diff --git a/www-client/mozilla-firefox/files/icon/firefox-icon-unbranded.png b/www-client/mozilla-firefox/files/icon/firefox-icon-unbranded.png deleted file mode 100644 index 22aac8114adc6b7f36d1a041ea34a1dd802ee032..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2963 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 JPDHLkV1l4*i9!GX diff --git a/www-client/mozilla-firefox/files/icon/firefox-icon.png b/www-client/mozilla-firefox/files/icon/firefox-icon.png deleted file mode 100644 index b7ff7197cad1909b78e93b11ff3e072765ac0c4b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3979 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 diff --git a/www-client/mozilla-firefox/mozilla-firefox-2.0.0.11.ebuild b/www-client/mozilla-firefox/mozilla-firefox-2.0.0.11.ebuild index b11e2124d6c0..a0e80320b1c8 100644 --- a/www-client/mozilla-firefox/mozilla-firefox-2.0.0.11.ebuild +++ b/www-client/mozilla-firefox/mozilla-firefox-2.0.0.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-2.0.0.11.ebuild,v 1.15 2008/02/02 17:11:22 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-2.0.0.11.ebuild,v 1.16 2008/02/29 15:02:58 armin76 Exp $ WANT_AUTOCONF="2.1" @@ -247,11 +247,11 @@ src_install() { newmenu "${FILESDIR}"/icon/iceweasel.desktop \ mozilla-firefox-2.0.desktop elif ! use bindist; then - doicon "${FILESDIR}"/icon/firefox-icon.png + newicon "${S}"/other-licenses/branding/firefox/content/icon48.png firefox-icon.png newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5.desktop \ mozilla-firefox-2.0.desktop else - doicon "${FILESDIR}"/icon/firefox-icon-unbranded.png + newicon "${S}"/browser/base/branding/icon48.png firefox-icon-unbranded.png newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5-unbranded.desktop \ mozilla-firefox-2.0.desktop fi diff --git a/www-client/mozilla-firefox/mozilla-firefox-2.0.0.12.ebuild b/www-client/mozilla-firefox/mozilla-firefox-2.0.0.12.ebuild index a5c88b20ee66..e97b1ed88684 100644 --- a/www-client/mozilla-firefox/mozilla-firefox-2.0.0.12.ebuild +++ b/www-client/mozilla-firefox/mozilla-firefox-2.0.0.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-2.0.0.12.ebuild,v 1.6 2008/02/11 00:17:30 tester Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-2.0.0.12.ebuild,v 1.7 2008/02/29 15:02:58 armin76 Exp $ WANT_AUTOCONF="2.1" @@ -129,6 +129,7 @@ src_unpack() { if use iceweasel; then sed -i -e "s|Bon Echo|Iceweasel|" browser/locales/en-US/chrome/branding/brand.* + sed -i -e "s|BonEcho|Iceweasel|" configure.in fi eautoreconf @@ -247,11 +248,11 @@ src_install() { newmenu "${FILESDIR}"/icon/iceweasel.desktop \ mozilla-firefox-2.0.desktop elif ! use bindist; then - doicon "${FILESDIR}"/icon/firefox-icon.png + newicon "${S}"/other-licenses/branding/firefox/content/icon48.png firefox-icon.png newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5.desktop \ mozilla-firefox-2.0.desktop else - doicon "${FILESDIR}"/icon/firefox-icon-unbranded.png + newicon "${S}"/browser/base/branding/icon48.png firefox-icon-unbranded.png newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5-unbranded.desktop \ mozilla-firefox-2.0.desktop fi -- 2.26.2