Fix .desktop files, bug 147735

(Portage version: 2.1.2-r9)

10 files changed, 26 insertions, 23 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 2d75387460cd..de1ebe42d49c 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.251 2007/01/19 08:52:40 redhatter Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.252 2007/02/14 19:31:34 armin76 Exp $
+
+  14 Feb 2007; Raúl Porcel <armin76@gentoo.org>
+  +files/icon/mozilla-firefox-1.5-unbranded.desktop,
+  -files/icon/mozillafirefox-1.5-unbranded.desktop,
+  +files/icon/mozilla-firefox-1.5.desktop,
+  -files/icon/mozillafirefox-1.5.desktop,
+  -files/icon/mozillafirefox.desktop, mozilla-firefox-1.5.0.7.ebuild,
+  mozilla-firefox-1.5.0.8.ebuild, mozilla-firefox-1.5.0.9.ebuild,
+  mozilla-firefox-1.5.0.9-r1.ebuild, mozilla-firefox-2.0.0.1.ebuild,
+  mozilla-firefox-2.0.0.1-r2.ebuild:
+  Fix .desktop files, bug 147735
 
   19 Jan 2007; Stuart Longland <redhatter@gentoo.org>
   mozilla-firefox-2.0.0.1-r2.ebuild:
diff --git a/www-client/mozilla-firefox/files/icon/mozillafirefox-1.5-unbranded.desktop b/www-client/mozilla-firefox/files/icon/mozilla-firefox-1.5-unbranded.desktop
index c6d351b5cc6c..c6d351b5cc6c 100644
--- a/www-client/mozilla-firefox/files/icon/mozillafirefox-1.5-unbranded.desktop
+++ b/www-client/mozilla-firefox/files/icon/mozilla-firefox-1.5-unbranded.desktop
diff --git a/www-client/mozilla-firefox/files/icon/mozillafirefox-1.5.desktop b/www-client/mozilla-firefox/files/icon/mozilla-firefox-1.5.desktop
index c47769afb72c..c47769afb72c 100644
--- a/www-client/mozilla-firefox/files/icon/mozillafirefox-1.5.desktop
+++ b/www-client/mozilla-firefox/files/icon/mozilla-firefox-1.5.desktop
diff --git a/www-client/mozilla-firefox/files/icon/mozillafirefox.desktop b/www-client/mozilla-firefox/files/icon/mozillafirefox.desktop
deleted file mode 100644
index 4f6679ccfce2..000000000000
--- a/www-client/mozilla-firefox/files/icon/mozillafirefox.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Mozilla Firefox
-Comment=Mozilla Firefox Web Browser
-Exec=/usr/bin/firefox %U
-Icon=firefox-icon.png
-Terminal=false
-Type=Application
-Categories=Application;Network;
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.5.0.7.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.5.0.7.ebuild
index 88f31074a4d9..248fac017d18 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-1.5.0.7.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-1.5.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.5.0.7.ebuild,v 1.12 2007/01/11 15:27:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.5.0.7.ebuild,v 1.13 2007/02/14 19:31:34 armin76 Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 
@@ -228,7 +228,7 @@ src_install() {
 
 	# Install icon and .desktop for menu entry
 	doicon ${FILESDIR}/icon/firefox-icon.png
-	domenu ${FILESDIR}/icon/mozillafirefox-1.5.desktop
+	domenu ${FILESDIR}/icon/mozilla-firefox-1.5.desktop
 
 	# Fix icons to look the same everywhere
 	insinto ${MOZILLA_FIVE_HOME}/icons
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.5.0.8.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.5.0.8.ebuild
index 59b7b15aed9d..99cd4215698f 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-1.5.0.8.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-1.5.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.5.0.8.ebuild,v 1.11 2007/01/11 15:27:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.5.0.8.ebuild,v 1.12 2007/02/14 19:31:34 armin76 Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 
@@ -230,7 +230,7 @@ src_install() {
 
 	# Install icon and .desktop for menu entry
 	doicon ${FILESDIR}/icon/firefox-icon.png
-	domenu ${FILESDIR}/icon/mozillafirefox-1.5.desktop
+	domenu ${FILESDIR}/icon/mozilla-firefox-1.5.desktop
 
 	# Fix icons to look the same everywhere
 	insinto ${MOZILLA_FIVE_HOME}/icons
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.5.0.9-r1.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.5.0.9-r1.ebuild
index a36a4fefadc7..136763feceb7 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-1.5.0.9-r1.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-1.5.0.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.5.0.9-r1.ebuild,v 1.2 2007/01/11 15:27:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.5.0.9-r1.ebuild,v 1.3 2007/02/14 19:31:34 armin76 Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -227,7 +227,7 @@ src_install() {
 
 	# Install icon and .desktop for menu entry
 	doicon ${FILESDIR}/icon/firefox-icon.png
-	domenu ${FILESDIR}/icon/mozillafirefox-1.5.desktop
+	domenu ${FILESDIR}/icon/mozilla-firefox-1.5.desktop
 
 	# Fix icons to look the same everywhere
 	insinto ${MOZILLA_FIVE_HOME}/icons
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.5.0.9.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.5.0.9.ebuild
index 217ab245e2af..74e607271202 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-1.5.0.9.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-1.5.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.5.0.9.ebuild,v 1.7 2007/01/11 15:27:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.5.0.9.ebuild,v 1.8 2007/02/14 19:31:34 armin76 Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -226,7 +226,7 @@ src_install() {
 
 	# Install icon and .desktop for menu entry
 	doicon ${FILESDIR}/icon/firefox-icon.png
-	domenu ${FILESDIR}/icon/mozillafirefox-1.5.desktop
+	domenu ${FILESDIR}/icon/mozilla-firefox-1.5.desktop
 
 	# Fix icons to look the same everywhere
 	insinto ${MOZILLA_FIVE_HOME}/icons
diff --git a/www-client/mozilla-firefox/mozilla-firefox-2.0.0.1-r2.ebuild b/www-client/mozilla-firefox/mozilla-firefox-2.0.0.1-r2.ebuild
index 6055fa2e28c3..2b85b70af5ad 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-2.0.0.1-r2.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-2.0.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.1-r2.ebuild,v 1.3 2007/01/19 08:52:40 redhatter Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-2.0.0.1-r2.ebuild,v 1.4 2007/02/14 19:31:34 armin76 Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -224,11 +224,11 @@ src_install() {
 	# Install icon and .desktop for menu entry
 	if use mozbranding; then
 		doicon "${FILESDIR}"/icon/firefox-icon.png
-		newmenu "${FILESDIR}"/icon/mozillafirefox-1.5.desktop \
+		newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5.desktop \
 			mozillafirefox-2.0.desktop
 	else
 		doicon "${FILESDIR}"/icon/firefox-icon-unbranded.png
-		newmenu "${FILESDIR}"/icon/mozillafirefox-1.5-unbranded.desktop \
+		newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5-unbranded.desktop \
 			mozillafirefox-2.0.desktop
 	fi
 
diff --git a/www-client/mozilla-firefox/mozilla-firefox-2.0.0.1.ebuild b/www-client/mozilla-firefox/mozilla-firefox-2.0.0.1.ebuild
index 9089e4ad3d0f..3111ba36b158 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-2.0.0.1.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-2.0.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.1.ebuild,v 1.15 2007/01/15 15:33:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-2.0.0.1.ebuild,v 1.16 2007/02/14 19:31:34 armin76 Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -224,11 +224,11 @@ src_install() {
 	# Install icon and .desktop for menu entry
 	if use mozbranding; then
 		doicon "${FILESDIR}"/icon/firefox-icon.png
-		newmenu "${FILESDIR}"/icon/mozillafirefox-1.5.desktop \
+		newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5.desktop \
 			mozillafirefox-2.0.desktop
 	else
 		doicon "${FILESDIR}"/icon/firefox-icon-unbranded.png
-		newmenu "${FILESDIR}"/icon/mozillafirefox-1.5-unbranded.desktop \
+		newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5-unbranded.desktop \
 			mozillafirefox-2.0.desktop
 	fi