calculate
/
calculate-overlay
6
1
Fork 2
Code Issues Pull Requests Releases Wiki Activity

Fix mozilla-firefox renaming for calcualte-client-2.1.18-r1

Browse Source
atratsevskiy
Mike Hiretsky 14 years ago
parent b2712a2fe7
commit 9434b85037
4 changed files with 528 additions and 1 deletions
Show Stats Download Patch File Download Diff File

7
sys-apps/calculate-client/ChangeLog
Unescape View File

@ -2,6 +2,13 @@
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-client-2.1.18-r1 (27 Jul 2010)
27 Jul 2010; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-client-2.1.18-r1.ebuild,
+files/calculate-client-2.1.18-r1.patch:
Add fix for package rename from mozilla-firefox to firefox.
*calculate-client-2.2.0.0_rc1 (21 Jun 2010)
21 Jun 2010; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

4
sys-apps/calculate-client/Manifest
Unescape View File

@ -1,13 +1,15 @@
AUX calculate-client-2.1.17-r1.patch 1735 RMD160 3492a7c6b2637e176872dd18f38390bf57188c1f SHA1 6c75f89ab8f5536916f424cc65954e4a669e6f1b SHA256 802e443315542c132662c652183b7fcb1f946184930c2f47f519f7b4f023fa93
AUX calculate-client-2.1.17-r2.patch 3716 RMD160 bc5d39cff353c4dd00344c04fcf65336d560f687 SHA1 524aeb6b686359f470874b78f99fcc4029348329 SHA256 a88fd06c53b67072fdea891891b9da3df81021ada576edfca89d83283517baa6
AUX calculate-client-2.1.18-r1.patch 22859 RMD160 8e80707b7e946296150501254e9ed410780f6a86 SHA1 d948290f5ec8c7f8f44f931144e6e86f4d823c89 SHA256 53551df08166af56588240708a35c8626b6d9c9604908415cc246b6f55d25888
DIST calculate-client-2.1.11.tar.bz2 76735 RMD160 a31fff0135103bd32aee1c903eeae2b059e31c0b SHA1 1a1f05ab8bcc0aeb04bbf10371bec9aaad09cf18 SHA256 3f3410b697e9ebf4965bf0886b3ad8c40815c2ee464fdaaa90e220fb5b51f723
DIST calculate-client-2.1.17.tar.bz2 91859 RMD160 376702b4535debc328276cbbd3bb5006a2dfff89 SHA1 9b3d5a5992d96b0104c17f062fcc62f671baf1d5 SHA256 f17c948f852a6d69736f7080a74d203c5720a12517f65265868d8b40ef9d83a8
DIST calculate-client-2.1.18.tar.bz2 180377 RMD160 70355a6092715c46e57a68bdd10592ac8e2a3ba7 SHA1 5f754d7d707e57d83b121370026c62c75f5b0615 SHA256 4f1c05128c4b2aac6b93857c3c466ecbed0236146b53caed2916bccab437806a
EBUILD calculate-client-2.1.11.ebuild 1666 RMD160 1b9daee165695618b7404e51e58436b04310f744 SHA1 63b0908f95087157bd20f340b9c85aea13f46adf SHA256 a1c36d830d38872afaa8c2d691af7a9453008d2448a4f8dda5000e2880b2f57c
EBUILD calculate-client-2.1.17-r1.ebuild 1809 RMD160 9b2e60c8b48807d86273fc9b78b1c8db4c79cea5 SHA1 4862fd10526862f7baa047d790f117787dcedc9a SHA256 b53f9a16678d4be95a23afef2cf0997f6567b38e936ec9590e3feeda66df45fc
EBUILD calculate-client-2.1.17-r2.ebuild 1896 RMD160 01fb62dab724750b7514cb57353214a2d4f75337 SHA1 a43f4873532be1ca1edae47828fc22b0f164b88c SHA256 3da7be8962541bb447e667de5e3e2c67f06beda528b3282af4741a97265f6312
EBUILD calculate-client-2.1.18-r1.ebuild 1861 RMD160 992316f3ecb7cc6474fbec4ba9a96dbcdb632838 SHA1 2e641d8f867124c1be1ab11850e135084994c568 SHA256 12f2bb6d5270a57c40db901a5f3ccec05729949ad85d83f586732ebd24c66a4d
EBUILD calculate-client-2.1.18.ebuild 1695 RMD160 91c6a5f07302640ad649824ed10d6495a724df58 SHA1 6e7c10b192a02f0daeb705d93585cd5db9fbff0d SHA256 ebc7776a3c62d3d37c6d36e02d78b1ceffea826229a213047371a6fde645f84f
EBUILD calculate-client-2.2.0.0_rc1.ebuild 1748 RMD160 75258b9558fa8fbd5c66a2b5b07015850ebaad2a SHA1 3423c7a40071eec43440e41d610bdfa5f374f55a SHA256 0bb187615945326d25ba19a139b71a7130b26fc321e526b614d95bd4c15b573d
EBUILD calculate-client-2.2.9999.ebuild 1712 RMD160 122d6998eaf7a79ebefc7d9b163a78fd0c05fdd8 SHA1 e19444479c97d3c21064c09f731c67d80382ab66 SHA256 591e33e91632d9ef7d96c5c7bcecf82ef57af5e16b1ac61ee5eba3c9641522ee
MISC ChangeLog 4280 RMD160 2fbb92f64e741a09b76538db16bf5df18746910c SHA1 963d5953969505a351ca71a5aee1121601bdca07 SHA256 8d568cff7457ddd13849c776db939829b67115d13f210544d0c6bbec1f00a4a8
MISC ChangeLog 4527 RMD160 f2a34cf6f2befefd9ae0641956d3efbee16e5fb9 SHA1 474466c7a06dc4dc001736e5146d0f1f3e0fc7bd SHA256 bb20b59ef176c2168c7f2700dc7473e3baf4ccb1b564a175341710ba4ceca2f0
MISC metadata.xml 310 RMD160 ed986dbc43c958bd57e0fb73749ee09167ee0221 SHA1 4007f716df1aa85ec65d926f246663effc382384 SHA256 5023605d36dcbb5d5fe1b1ac54f7125a4087479b5168601075a8050ed51c38c2

75
sys-apps/calculate-client/calculate-client-2.1.18-r1.ebuild
Unescape View File

@ -0,0 +1,75 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of setting and storing the user account in the domain"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="kde xfce gnome"
DEPEND=">=sys-apps/calculate-lib-2.1.10
dev-python/py-smbpasswd
>=dev-python/python-ldap-2.0[ssl]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
>=sys-apps/keyexec-0.1.2
>=sys-apps/hal-0.5.9
sys-apps/keyutils
sys-auth/pam_keystore
xfce? ( x11-misc/slim )
gnome? ( gnome-base/gdm )
kde? ( kde-base/kdm )"
RDEPEND="${DEPEND}"
ISUPDATE=/tmp/${PN}.ebuild.update
# for fixing bug of ebuild calculate-client-2.0.17
OLDISUPDATEPATH="${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PN}-2.0.17/temp/"
OLDISUPDATE="${OLDISUPDATEPATH}/${PN}.update"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix pkg(www-client/mozilla-firefox) to pkg(www-client/firefox)
epatch "${FILESDIR}/calculate-client-2.1.18-r1.patch"
}
pkg_preinst() {
touch ${ISUPDATE}
rm -f /etc/init.d/client
# for fixing bug of ebuild calculate-client-2.0.17
mkdir -p ${OLDISUPDATEPATH}
touch ${OLDISUPDATE}
}
pkg_postinst() {
if use kde || use xfce || use gnome;
then
cl-client --install
ewarn "Please restart xdm for refreshing configuration files."
fi
rm ${ISUPDATE}
# for fixing bug of ebuild calculate-client-2.0.17
rm -rf ${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PN}-2.0.17
rmdir ${PORTAGE_TMPDIR}/portage/${CATEGORY} &>/dev/null
}
pkg_prerm() {
# for fixing bug of ebuild calculate-client-2.0.17 (|| -e ${OLDISUPDATE} )
if ! [[ -e ${ISUPDATE} || -e ${OLDISUPDATE} ]];
then
cl-client --uninstall
fi
}

443
sys-apps/calculate-client/files/calculate-client-2.1.18-r1.patch
Unescape View File

@ -0,0 +1,443 @@
diff --git a/client-profiles/20-kde-4.3-4.4/.kde4/share/config/kdeglobals b/client-profiles/20-kde-4.3-4.4/.kde4/share/config/kdeglobals
index 4d40d3b..5ada5bf 100644
--- a/client-profiles/20-kde-4.3-4.4/.kde4/share/config/kdeglobals
+++ b/client-profiles/20-kde-4.3-4.4/.kde4/share/config/kdeglobals
@@ -6,9 +6,9 @@
BrowserApplication[$e]=file:///usr/share/applications/chromium-chromium.desktop
#pkg#
# сделать mozilla firefox браузером по умолчанию, если он установлен
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
BrowserApplication[$e]=file:///home/#-ur_login-#/.local/share/applications/mozilla-firefox.desktop
#pkg#
-#?pkg(www-client/mozilla-firefox)==&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)==&pkg(www-client/chromium)==#
BrowserApplication[$e]=file:///usr/share/applications/kde4/konqbrowser.desktop
#pkg#
diff --git a/client-profiles/20-kde-4.3-4.4/.kde4/share/config/plasma-desktop-appletsrc b/client-profiles/20-kde-4.3-4.4/.kde4/share/config/plasma-desktop-appletsrc
index 1727120..c76e1bb 100644
--- a/client-profiles/20-kde-4.3-4.4/.kde4/share/config/plasma-desktop-appletsrc
+++ b/client-profiles/20-kde-4.3-4.4/.kde4/share/config/plasma-desktop-appletsrc
@@ -220,10 +220,10 @@ geometry=0,0,#-sum(width,width)-#,#-sum(height,height)-#
#?pkg(www-client/chromium)!=#
Url=file:///usr/share/applications/chromium-chromium.desktop
#pkg#
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
Url=file:///home/#-ur_login-#/.local/share/applications/mozilla-firefox.desktop
#pkg#
-#?pkg(www-client/mozilla-firefox)==&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)==&pkg(www-client/chromium)==#
Url=file:///usr/share/applications/kde4/konqbrowser.desktop
#pkg#
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
diff --git a/client-profiles/20-kde-4.3/.kde4/share/config/kdeglobals b/client-profiles/20-kde-4.3/.kde4/share/config/kdeglobals
index dcecda0..0ab2e76 100644
--- a/client-profiles/20-kde-4.3/.kde4/share/config/kdeglobals
+++ b/client-profiles/20-kde-4.3/.kde4/share/config/kdeglobals
@@ -8,10 +8,10 @@ emoticonsTheme=KMess-Cartoon
#?pkg(www-client/chromium)!=#
BrowserApplication[$e]=file:///usr/share/applications/chromium-chromium.desktop
#pkg#
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
BrowserApplication[$e]=file:///home/#-ur_login-#/.local/share/applications/mozilla-firefox.desktop
#pkg#
-#?pkg(www-client/mozilla-firefox)==&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)==&pkg(www-client/chromium)==#
BrowserApplication[$e]=file:///usr/share/applications/kde4/konqbrowser.desktop
#pkg#
XftHintStyle=hintmedium
diff --git a/client-profiles/20-kde-4.3/.kde4/share/config/plasma-desktop-appletsrc b/client-profiles/20-kde-4.3/.kde4/share/config/plasma-desktop-appletsrc
index 5b87458..040b218 100644
--- a/client-profiles/20-kde-4.3/.kde4/share/config/plasma-desktop-appletsrc
+++ b/client-profiles/20-kde-4.3/.kde4/share/config/plasma-desktop-appletsrc
@@ -308,10 +308,10 @@ zvalue=0
#?pkg(www-client/chromium)!=#
Url=file:///usr/share/applications/chromium-chromium.desktop
#pkg#
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
Url=file:///home/#-ur_login-#/.local/share/applications/mozilla-firefox.desktop
#pkg#
-#?pkg(www-client/mozilla-firefox)==&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)==&pkg(www-client/chromium)==#
Url=file:///usr/share/applications/kde4/konqbrowser.desktop
#pkg#
diff --git a/client-profiles/20-kde-4.4/.kde4/share/config/kdeglobals b/client-profiles/20-kde-4.4/.kde4/share/config/kdeglobals
index dcecda0..0ab2e76 100644
--- a/client-profiles/20-kde-4.4/.kde4/share/config/kdeglobals
+++ b/client-profiles/20-kde-4.4/.kde4/share/config/kdeglobals
@@ -8,10 +8,10 @@ emoticonsTheme=KMess-Cartoon
#?pkg(www-client/chromium)!=#
BrowserApplication[$e]=file:///usr/share/applications/chromium-chromium.desktop
#pkg#
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
BrowserApplication[$e]=file:///home/#-ur_login-#/.local/share/applications/mozilla-firefox.desktop
#pkg#
-#?pkg(www-client/mozilla-firefox)==&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)==&pkg(www-client/chromium)==#
BrowserApplication[$e]=file:///usr/share/applications/kde4/konqbrowser.desktop
#pkg#
XftHintStyle=hintmedium
diff --git a/client-profiles/20-kde-4.4/.kde4/share/config/plasma-desktop-appletsrc b/client-profiles/20-kde-4.4/.kde4/share/config/plasma-desktop-appletsrc
index b8a0903..984dac6 100644
--- a/client-profiles/20-kde-4.4/.kde4/share/config/plasma-desktop-appletsrc
+++ b/client-profiles/20-kde-4.4/.kde4/share/config/plasma-desktop-appletsrc
@@ -228,10 +228,10 @@ zvalue=0
#?pkg(www-client/chromium)!=#
Url=file:///usr/share/applications/chromium-chromium.desktop
#pkg#
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
Url=file:///home/#-ur_login-#/.local/share/applications/mozilla-firefox.desktop
#pkg#
-#?pkg(www-client/mozilla-firefox)==&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)==&pkg(www-client/chromium)==#
Url=file:///usr/share/applications/kde4/konqbrowser.desktop
#pkg#
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/panel/300_bottom_objects/300_webbrowser/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/apps/panel/300_bottom_objects/300_webbrowser/%gconf.xml
index be7501f..2a54b7d 100644
--- a/client-profiles/30-gnome-2.6/.gconf/apps/panel/300_bottom_objects/300_webbrowser/%gconf.xml
+++ b/client-profiles/30-gnome-2.6/.gconf/apps/panel/300_bottom_objects/300_webbrowser/%gconf.xml
@@ -23,7 +23,7 @@
#?pkg(www-client/chromium)!=#
<stringvalue>chromium-chromium.desktop</stringvalue>
#pkg#
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
<stringvalue>mozilla-firefox.desktop</stringvalue>
#pkg#
</entry>
diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/applications/browser/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/applications/browser/%gconf.xml
index 6605ad6..dd51d2b 100644
--- a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/applications/browser/%gconf.xml
+++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/applications/browser/%gconf.xml
@@ -5,7 +5,7 @@
#?pkg(www-client/chromium)!=#
<stringvalue>chromium</stringvalue>
#pkg#
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
<stringvalue>firefox</stringvalue>
#pkg#
</entry>
diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/about/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/about/%gconf.xml
index 1d95e4c..8336a58 100644
--- a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/about/%gconf.xml
+++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/about/%gconf.xml
@@ -5,7 +5,7 @@
#?pkg(www-client/chromium)!=#
<stringvalue>chromium %s</stringvalue>
#pkg#
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
<stringvalue>firefox %s</stringvalue>
#pkg#
</entry>
diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml
index d83de6f..9c41194 100644
--- a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml
+++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml
@@ -7,7 +7,7 @@
#?pkg(www-client/chromium)!=#
<stringvalue>chromium %s</stringvalue>
#pkg#
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
<stringvalue>firefox %s</stringvalue>
#pkg#
</entry>
diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml
index d83de6f..9c41194 100644
--- a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml
+++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml
@@ -7,7 +7,7 @@
#?pkg(www-client/chromium)!=#
<stringvalue>chromium %s</stringvalue>
#pkg#
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
<stringvalue>firefox %s</stringvalue>
#pkg#
</entry>
diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/http/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/http/%gconf.xml
index 1d95e4c..8336a58 100644
--- a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/http/%gconf.xml
+++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/http/%gconf.xml
@@ -5,7 +5,7 @@
#?pkg(www-client/chromium)!=#
<stringvalue>chromium %s</stringvalue>
#pkg#
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
<stringvalue>firefox %s</stringvalue>
#pkg#
</entry>
diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/https/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/https/%gconf.xml
index 1d95e4c..8336a58 100644
--- a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/https/%gconf.xml
+++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/https/%gconf.xml
@@ -5,7 +5,7 @@
#?pkg(www-client/chromium)!=#
<stringvalue>chromium %s</stringvalue>
#pkg#
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
<stringvalue>firefox %s</stringvalue>
#pkg#
</entry>
diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml
index 1d95e4c..8336a58 100644
--- a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml
+++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml
@@ -5,7 +5,7 @@
#?pkg(www-client/chromium)!=#
<stringvalue>chromium %s</stringvalue>
#pkg#
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
<stringvalue>firefox %s</stringvalue>
#pkg#
</entry>
diff --git a/client-profiles/40-cldx-10.2-10.4/.config/xfce4/panel/launcher-30.rc b/client-profiles/40-cldx-10.2-10.4/.config/xfce4/panel/launcher-30.rc
index 9418716..3cdbde2 100644
--- a/client-profiles/40-cldx-10.2-10.4/.config/xfce4/panel/launcher-30.rc
+++ b/client-profiles/40-cldx-10.2-10.4/.config/xfce4/panel/launcher-30.rc
@@ -10,11 +10,11 @@ Comment=Surf the internet
Icon=chromium-browser
Exec=chromium
#pkg#
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
Icon=browser
Exec=firefox
#pkg#
-#?pkg(www-client/mozilla-firefox)==&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)==&pkg(www-client/chromium)==#
Icon=browser
Exec=exo-open --launch WebBrowser
#pkg#
diff --git a/client-profiles/40-xfce-4.6/.config/xfce4/helpers.rc b/client-profiles/40-xfce-4.6/.config/xfce4/helpers.rc
index 0571fa7..3a3f95a 100644
--- a/client-profiles/40-xfce-4.6/.config/xfce4/helpers.rc
+++ b/client-profiles/40-xfce-4.6/.config/xfce4/helpers.rc
@@ -1,7 +1,7 @@
#?pkg(www-client/chromium)!=#
WebBrowser=chromium
#pkg#
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
WebBrowser=firefox
#pkg#
MailReader=sylpheed-claws
diff --git a/client-profiles/40-xfce-4.6/.config/xfce4/panel/launcher-30.rc b/client-profiles/40-xfce-4.6/.config/xfce4/panel/launcher-30.rc
index 9418716..3cdbde2 100644
--- a/client-profiles/40-xfce-4.6/.config/xfce4/panel/launcher-30.rc
+++ b/client-profiles/40-xfce-4.6/.config/xfce4/panel/launcher-30.rc
@@ -10,11 +10,11 @@ Comment=Surf the internet
Icon=chromium-browser
Exec=chromium
#pkg#
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
Icon=browser
Exec=firefox
#pkg#
-#?pkg(www-client/mozilla-firefox)==&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)==&pkg(www-client/chromium)==#
Icon=browser
Exec=exo-open --launch WebBrowser
#pkg#
diff --git a/client-profiles/80-firefox-3.5/.calculate_directory b/client-profiles/80-firefox-3.5/.calculate_directory
index 91e7aaf..1058025 100644
--- a/client-profiles/80-firefox-3.5/.calculate_directory
+++ b/client-profiles/80-firefox-3.5/.calculate_directory
@@ -1 +1 @@
-# Calculate ini(main.update)!=off&ini(update.firefox)!=off&ini(ver.firefox)==&pkg(www-client/mozilla-firefox)>=3.5
+# Calculate ini(main.update)!=off&ini(update.firefox)!=off&ini(ver.firefox)==&pkg(www-client/firefox)>=3.5
diff --git a/client-profiles/80-firefox-always/.calculate_directory b/client-profiles/80-firefox-always/.calculate_directory
index 0548580..d59d5d2 100644
--- a/client-profiles/80-firefox-always/.calculate_directory
+++ b/client-profiles/80-firefox-always/.calculate_directory
@@ -1 +1 @@
-# Calculate ini(main.update)!=off&ini(update.firefox)!=off&pkg(www-client/mozilla-firefox)>=3.5&ini(newsystem)==on
+# Calculate ini(main.update)!=off&ini(update.firefox)!=off&pkg(www-client/firefox)>=3.5&ini(newsystem)==on
diff --git a/client-profiles/90-patch-2.1.16/.mozilla/firefox/.calculate_directory b/client-profiles/90-patch-2.1.16/.mozilla/firefox/.calculate_directory
index ae19c3c..8c95e03 100644
--- a/client-profiles/90-patch-2.1.16/.mozilla/firefox/.calculate_directory
+++ b/client-profiles/90-patch-2.1.16/.mozilla/firefox/.calculate_directory
@@ -1,2 +1,2 @@
-# Calculate pkg(www-client/mozilla-firefox)>=3.5
+# Calculate pkg(www-client/firefox)>=3.5
diff --git a/client-profiles/90-patch-2.1.18/.config/xfce4/helpers.rc b/client-profiles/90-patch-2.1.18/.config/xfce4/helpers.rc
index c60f227..1fab883 100644
--- a/client-profiles/90-patch-2.1.18/.config/xfce4/helpers.rc
+++ b/client-profiles/90-patch-2.1.18/.config/xfce4/helpers.rc
@@ -2,7 +2,7 @@
#?pkg(www-client/chromium)!=#
WebBrowser=chromium
#pkg#
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
WebBrowser=firefox
#pkg#
diff --git a/client-profiles/90-patch-2.1.18/.config/xfce4/panel/launcher-30.rc b/client-profiles/90-patch-2.1.18/.config/xfce4/panel/launcher-30.rc
index 2b8b82a..8f36fba 100644
--- a/client-profiles/90-patch-2.1.18/.config/xfce4/panel/launcher-30.rc
+++ b/client-profiles/90-patch-2.1.18/.config/xfce4/panel/launcher-30.rc
@@ -4,11 +4,11 @@
Icon=chromium-browser
Exec=chromium
#pkg#
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
Icon=browser
Exec=firefox
#pkg#
-#?pkg(www-client/mozilla-firefox)==&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)==&pkg(www-client/chromium)==#
Icon=browser
Exec=exo-open --launch WebBrowser
#pkg#
diff --git a/client-profiles/90-patch-2.1.18/.gconf/apps/panel/objects/300_webbrowser/%gconf.xml b/client-profiles/90-patch-2.1.18/.gconf/apps/panel/objects/300_webbrowser/%gconf.xml
index 9d86083..53c8f8b 100644
--- a/client-profiles/90-patch-2.1.18/.gconf/apps/panel/objects/300_webbrowser/%gconf.xml
+++ b/client-profiles/90-patch-2.1.18/.gconf/apps/panel/objects/300_webbrowser/%gconf.xml
@@ -5,7 +5,7 @@
#?pkg(www-client/chromium)!=#
<stringvalue>chromium-chromium.desktop</stringvalue>
#pkg#
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
<stringvalue>mozilla-firefox.desktop</stringvalue>
#pkg#
</entry>
diff --git a/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/applications/browser/%gconf.xml b/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/applications/browser/%gconf.xml
index 501600c..4028e7a 100644
--- a/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/applications/browser/%gconf.xml
+++ b/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/applications/browser/%gconf.xml
@@ -5,7 +5,7 @@
#?pkg(www-client/chromium)!=#
<stringvalue>chromium</stringvalue>
#pkg#
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
<stringvalue>firefox</stringvalue>
#pkg#
</entry>
diff --git a/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/about/%gconf.xml b/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/about/%gconf.xml
index 1d95e4c..8336a58 100644
--- a/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/about/%gconf.xml
+++ b/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/about/%gconf.xml
@@ -5,7 +5,7 @@
#?pkg(www-client/chromium)!=#
<stringvalue>chromium %s</stringvalue>
#pkg#
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
<stringvalue>firefox %s</stringvalue>
#pkg#
</entry>
diff --git a/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml b/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml
index d83de6f..9c41194 100644
--- a/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml
+++ b/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml
@@ -7,7 +7,7 @@
#?pkg(www-client/chromium)!=#
<stringvalue>chromium %s</stringvalue>
#pkg#
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
<stringvalue>firefox %s</stringvalue>
#pkg#
</entry>
diff --git a/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml b/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml
index 1d95e4c..8336a58 100644
--- a/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml
+++ b/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml
@@ -5,7 +5,7 @@
#?pkg(www-client/chromium)!=#
<stringvalue>chromium %s</stringvalue>
#pkg#
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
<stringvalue>firefox %s</stringvalue>
#pkg#
</entry>
diff --git a/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/http/%gconf.xml b/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/http/%gconf.xml
index 1d95e4c..8336a58 100644
--- a/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/http/%gconf.xml
+++ b/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/http/%gconf.xml
@@ -5,7 +5,7 @@
#?pkg(www-client/chromium)!=#
<stringvalue>chromium %s</stringvalue>
#pkg#
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
<stringvalue>firefox %s</stringvalue>
#pkg#
</entry>
diff --git a/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/https/%gconf.xml b/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/https/%gconf.xml
index 1d95e4c..8336a58 100644
--- a/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/https/%gconf.xml
+++ b/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/https/%gconf.xml
@@ -5,7 +5,7 @@
#?pkg(www-client/chromium)!=#
<stringvalue>chromium %s</stringvalue>
#pkg#
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
<stringvalue>firefox %s</stringvalue>
#pkg#
</entry>
diff --git a/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml b/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml
index 1d95e4c..8336a58 100644
--- a/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml
+++ b/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml
@@ -5,7 +5,7 @@
#?pkg(www-client/chromium)!=#
<stringvalue>chromium %s</stringvalue>
#pkg#
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
<stringvalue>firefox %s</stringvalue>
#pkg#
</entry>
diff --git a/client-profiles/90-patch-2.1.18/.kde4/share/config/kdeglobals b/client-profiles/90-patch-2.1.18/.kde4/share/config/kdeglobals
index 4d40d3b..5ada5bf 100644
--- a/client-profiles/90-patch-2.1.18/.kde4/share/config/kdeglobals
+++ b/client-profiles/90-patch-2.1.18/.kde4/share/config/kdeglobals
@@ -6,9 +6,9 @@
BrowserApplication[$e]=file:///usr/share/applications/chromium-chromium.desktop
#pkg#
# сделать mozilla firefox браузером по умолчанию, если он установлен
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
BrowserApplication[$e]=file:///home/#-ur_login-#/.local/share/applications/mozilla-firefox.desktop
#pkg#
-#?pkg(www-client/mozilla-firefox)==&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)==&pkg(www-client/chromium)==#
BrowserApplication[$e]=file:///usr/share/applications/kde4/konqbrowser.desktop
#pkg#
diff --git a/client-profiles/90-patch-2.1.18/.kde4/share/config/plasma-desktop-appletsrc b/client-profiles/90-patch-2.1.18/.kde4/share/config/plasma-desktop-appletsrc
index 0933353..58fed8d 100644
--- a/client-profiles/90-patch-2.1.18/.kde4/share/config/plasma-desktop-appletsrc
+++ b/client-profiles/90-patch-2.1.18/.kde4/share/config/plasma-desktop-appletsrc
@@ -28,9 +28,9 @@ zvalue=0
#?pkg(www-client/chromium)!=#
Url=file:///usr/share/applications/chromium-chromium.desktop
#pkg#
-#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)!=&pkg(www-client/chromium)==#
Url=file:///home/#-ur_login-#/.local/share/applications/mozilla-firefox.desktop
#pkg#
-#?pkg(www-client/mozilla-firefox)==&pkg(www-client/chromium)==#
+#?pkg(www-client/firefox)==&pkg(www-client/chromium)==#
Url=file:///usr/share/applications/kde4/konqbrowser.desktop
#pkg#
Write Preview
Loading…
Cancel
Save