diff --git a/sys-apps/calculate-templates/ChangeLog b/sys-apps/calculate-templates/ChangeLog index b04c33040..74aeb7038 100644 --- a/sys-apps/calculate-templates/ChangeLog +++ b/sys-apps/calculate-templates/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-templates-2.2.21-r2 (23 Aug 2011) + + 23 Aug 2011; Mike Hiretsky (mhiretskiy) + +calculate-templates-2.2.21-r2.ebuild, + +files/calculate-templates-2.2.21-r2.patch: + Update xautologin + *calculate-templates-2.2.21-r1 (22 Aug 2011) 22 Aug 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-templates/Manifest b/sys-apps/calculate-templates/Manifest index 52612e2d9..091ac32de 100644 --- a/sys-apps/calculate-templates/Manifest +++ b/sys-apps/calculate-templates/Manifest @@ -6,6 +6,7 @@ AUX calculate-templates-2.2.19_scandelay.patch 8416 RMD160 815420f40999284d111df AUX calculate-templates-2.2.20-fix_cpufreq.patch 2333 RMD160 9b30c305e53000435b644ddd83a7726953433898 SHA1 5ac7f06fb7355d93af3b1d9ab02b5aac55592081 SHA256 c30bbb7d107f899c1fac8a6defcc7951d59fe5d5523df7bcbf1394bf617125bb AUX calculate-templates-2.2.20-fix_mplayer.patch 2537 RMD160 97d2a54996d96065eea9078d95bad24a11c5ddbe SHA1 89dd1da77ee7e40f5b468aba8db97bdf5eff7f9d SHA256 777c3797ebc8b29f30fa2572fb0047037dbc8c50422764d5e1ad6d4d2f665bc9 AUX calculate-templates-2.2.21-r1.patch 4162 RMD160 4c8e5e8e2162ff9a58f09ed3646350587dec5f80 SHA1 c94b55a767251723799fa81c25373f9cca4c2279 SHA256 7cfcabcd241625f05f9a477ce8024732f47e2c7b44448d2466f18bf34ddd39ff +AUX calculate-templates-2.2.21-r2.patch 61748 RMD160 18e68d3bb226eed91e5a61ddd11415db2cba9f89 SHA1 3764195fcab6a2bcb2b64027c9665036f2334488 SHA256 cfc7addf84d05ecabd7a3fffede935574a143ffdb0472b864084c94fd92edb01 DIST calculate-templates-2.2.18.tar.bz2 233661 RMD160 c8e42c3ed8860193286ff8eaeddcd1c75bb1ef0b SHA1 f197621e5777c16aca9b892d30ede172eee50522 SHA256 d3d236c7e0760db3ad9ea79f0fed9d9e5f97d69acabbae3bbc9c9d2e62a50984 DIST calculate-templates-2.2.19.tar.bz2 233495 RMD160 bd6ec2efa456b838c15664e7779d01cd760cb124 SHA1 c0f79506fb676a8c37efbdff4a0514a3a8ddb29e SHA256 f5124a64393a3c6d4a03bd3c0065cc7f5a3586f6d5de5362d1b373048b2303ab DIST calculate-templates-2.2.20.tar.bz2 234266 RMD160 7368253076289f8e255ae325e629ffe73da060ec SHA1 b39b75801f8361a36eb6e8ce92da63dfef5230ca SHA256 b907b4630aca4942af66ffe24144959723879d25f4ce72e344639f86223b828a @@ -22,7 +23,8 @@ EBUILD calculate-templates-2.2.20-r1.ebuild 708 RMD160 964788ae0547fc380504ef115 EBUILD calculate-templates-2.2.20-r2.ebuild 843 RMD160 12e3ca9a026072e3272746252033d81a3f1a0be4 SHA1 c5388c0eb20481a5c03239dbb5932f0188a14721 SHA256 b2b373aba91266c3773ed66a90b6970bbda267009add802d730578f8221bc1f4 EBUILD calculate-templates-2.2.20.ebuild 581 RMD160 58415efe9da270f3cbac7be53099e3b3f2d0e9a1 SHA1 4cbf60bac722618b31285280de2279e809c2499f SHA256 e2045f5b13588448a0ab90b751fa4ba76ef85725af4401f34da4499f55053d9c EBUILD calculate-templates-2.2.21-r1.ebuild 695 RMD160 2a38bb7a5c1dc424ce9c9d95fbef8e70a6e485c0 SHA1 ff937d7663857debdacb52fbc8e9c0dc0f0e3f58 SHA256 b4092bab5c9ce7ec500cac4b32b6ea8a9ed706a3688e7ea68257b9664d4bd96e +EBUILD calculate-templates-2.2.21-r2.ebuild 715 RMD160 85c7db6494ec112d4b2a381cd231255a8fe772b1 SHA1 b7ddcbbd9ddf8b86c5da68b44dc4ab78810a9469 SHA256 d1f60914a90a0600fddd48f577d5193436ad37f2ea0d4b367ceca9695f4b30ec EBUILD calculate-templates-2.2.21.ebuild 581 RMD160 3e8c0e9fd308c52caa861955c86a390a96127202 SHA1 9541b46b0bcf618c33285fd6e5f7167a72e92b31 SHA256 002834f9b50c2641a462562c68ad6715ab32c1c86723af664a833bc3be85eaec EBUILD calculate-templates-2.2.9999.ebuild 572 RMD160 14e53f7c05efbb563b793b1025669cbe79d0838c SHA1 226d287ce0a00609ed6c871321abf5000565227e SHA256 5df16332077472571e2d4aae47e958d1e6efe3a8d694b61053778f75a537142f -MISC ChangeLog 28169 RMD160 bca1b00a85562a44fdc8bcd345dea3e820cdd00a SHA1 4961cfc861a2fb573e295833897f4b5a1036ebeb SHA256 a369af8f40b33e2368b0f926844e8d009c5cfd81aab12c7428a5f2ec8e3ba77c +MISC ChangeLog 28383 RMD160 97676e237cc5858bc530642194f2a8535b69de1e SHA1 b7feab81883ce88942103e56f837d69ce75d7340 SHA256 2bdded5e62d3255aa50b909dbcb26875f852c8f8687b5d08aa4b4a9c6f7ed777 MISC metadata.xml 338 RMD160 4a1a51881bdf09b961217d2056114ca4ccb8b4d2 SHA1 5fcb2724427f9ac5dda07abb5c829c24e6db9ae6 SHA256 175d9ae86b71b291a519414e816b05290d0e4be74726cc8d5449a500c51a3b2d diff --git a/sys-apps/calculate-templates/calculate-templates-2.2.21-r2.ebuild b/sys-apps/calculate-templates/calculate-templates-2.2.21-r2.ebuild new file mode 100644 index 000000000..aa9833e40 --- /dev/null +++ b/sys-apps/calculate-templates/calculate-templates-2.2.21-r2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" + +inherit eutils + +SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2" + +DESCRIPTION="Templates for calculate utilities 2.2" +HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 x86" + +DEPEND="~sys-apps/calculate-lib-2.2.21" + +RDEPEND="${DEPEND}" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # bugfixes, update xautologin + epatch "${FILESDIR}/calculate-templates-2.2.21-r2.patch" +} + +src_compile() { +: +} + +src_install() { + dodir /usr/share/calculate/templates + insinto /usr/share/calculate/templates + doins -r * +} diff --git a/sys-apps/calculate-templates/files/calculate-templates-2.2.21-r2.patch b/sys-apps/calculate-templates/files/calculate-templates-2.2.21-r2.patch new file mode 100644 index 000000000..925cf4e26 --- /dev/null +++ b/sys-apps/calculate-templates/files/calculate-templates-2.2.21-r2.patch @@ -0,0 +1,1764 @@ +diff --git desktop/desktop/00-patch-2.2.0.16/.calculate_directory desktop/desktop/00-patch-2.2.0.16/.calculate_directory +deleted file mode 100644 +index f6d18e2..0000000 +--- desktop/desktop/00-patch-2.2.0.16/.calculate_directory ++++ /dev/null +@@ -1 +0,0 @@ +-# Calculate append=skip belong(calculate-desktop)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.0.16 +diff --git desktop/desktop/00-patch-2.2.0.16/1ini_res_def.env desktop/desktop/00-patch-2.2.0.16/1ini_res_def.env +deleted file mode 100644 +index 023f00c..0000000 +--- desktop/desktop/00-patch-2.2.0.16/1ini_res_def.env ++++ /dev/null +@@ -1,12 +0,0 @@ +-# Calculate format=samba path=~/.calculate name=ini.env +- +-[resource] +-desktop = /home/#-ur_login-#/Desktop +-documents = #-ini(resource.path)-#/Documents +-downloads = #-ini(resource.path)-#/Downloads +-music = #-ini(resource.path)-#/Music +-pictures = #-ini(resource.path)-#/Pictures +-public = #-ini(resource.path)-#/Public +-templates = #-ini(resource.path)-#/Templates +-videos = #-ini(resource.path)-#/Videos +- +diff --git desktop/desktop/00-patch-2.2.0.16/2ini_res.env desktop/desktop/00-patch-2.2.0.16/2ini_res.env +deleted file mode 100644 +index ec7ae86..0000000 +--- desktop/desktop/00-patch-2.2.0.16/2ini_res.env ++++ /dev/null +@@ -1,146 +0,0 @@ +-# Calculate format=samba path=~/.calculate name=ini.env +- +-[resource] +-#?os_locale_lang==bg_BG# +-documents = #-ini(resource.path)-#/Документи +-downloads = #-ini(resource.path)-#/Свалени +-music = #-ini(resource.path)-#/Музика +-pictures = #-ini(resource.path)-#/Изображения +-public = #-ini(resource.path)-#/Публични +-templates = #-ini(resource.path)-#/Шаблони +-videos = #-ini(resource.path)-#/Видео +-#os_locale_lang# +-#?os_locale_lang==bg_BG&&ur_domain_set==off# +-desktop = /home/#-ur_login-#/Работен плот +-#os_locale_lang# +- +-#?os_locale_lang==de_DE# +-documents = #-ini(resource.path)-#/Dokumente +-downloads = #-ini(resource.path)-#/Downloads +-music = #-ini(resource.path)-#/Musik +-pictures = #-ini(resource.path)-#/Bilder +-public = #-ini(resource.path)-#/Öffentlich +-templates = #-ini(resource.path)-#/Vorlagen +-videos = #-ini(resource.path)-#/Videos +-#os_locale_lang# +-#?os_locale_lang==de_DE&&ur_domain_set==off# +-desktop = /home/#-ur_login-#/Arbeitsfläche +-#os_locale_lang# +- +-#?os_locale_lang==es_ES# +-documents = #-ini(resource.path)-#/Documentos +-downloads = #-ini(resource.path)-#/Descargas +-music = #-ini(resource.path)-#/Música +-pictures = #-ini(resource.path)-#/Imágenes +-public = #-ini(resource.path)-#/Público +-templates = #-ini(resource.path)-#/Plantillas +-videos = #-ini(resource.path)-#/Vídeos +-#os_locale_lang# +-#?os_locale_lang==es_ES&&ur_domain_set==off# +-desktop = /home/#-ur_login-#/Escritorio +-#os_locale_lang# +- +-#?os_locale_lang==fr_FR# +-documents = #-ini(resource.path)-#/Documents +-downloads = #-ini(resource.path)-#/Téléchargements +-music = #-ini(resource.path)-#/Musique +-pictures = #-ini(resource.path)-#/Images +-public = #-ini(resource.path)-#/Public +-templates = #-ini(resource.path)-#/Modèles +-videos = #-ini(resource.path)-#/Vidéos +-#os_locale_lang# +-#?os_locale_lang==fr_FR&&ur_domain_set==off# +-desktop = /home/#-ur_login-#/Bureau +-#os_locale_lang# +- +-#?os_locale_lang==it_IT# +-documents = #-ini(resource.path)-#/Documenti +-downloads = #-ini(resource.path)-#/Scaricati +-music = #-ini(resource.path)-#/Musica +-pictures = #-ini(resource.path)-#/Immagini +-public = #-ini(resource.path)-#/Pubblici +-templates = #-ini(resource.path)-#/Modelli +-videos = #-ini(resource.path)-#/Video +-#os_locale_lang# +-#?os_locale_lang==it_IT&&ur_domain_set==off# +-desktop = /home/#-ur_login-#/Ambiente grafico +-#os_locale_lang# +- +-#?os_locale_lang==pl_PL# +-documents = #-ini(resource.path)-#/Dokumenty +-downloads = #-ini(resource.path)-#/Pobrane +-music = #-ini(resource.path)-#/Muzyka +-pictures = #-ini(resource.path)-#/Obrazy +-public = #-ini(resource.path)-#/Publiczny +-templates = #-ini(resource.path)-#/Szablony +-videos = #-ini(resource.path)-#/Wideo +-#os_locale_lang# +-#?os_locale_lang==pl_PL&&ur_domain_set==off# +-desktop = /home/#-ur_login-#/Pulpit +-#os_locale_lang# +- +-#?os_locale_lang==pt_BR# +-documents = #-ini(resource.path)-#/Documentos +-downloads = #-ini(resource.path)-#/Download +-music = #-ini(resource.path)-#/Música +-pictures = #-ini(resource.path)-#/Imagens +-public = #-ini(resource.path)-#/Público +-templates = #-ini(resource.path)-#/Modelos +-videos = #-ini(resource.path)-#/Vídeos +-#os_locale_lang# +-#?os_locale_lang==pt_BR&&ur_domain_set==off# +-desktop = /home/#-ur_login-#/Área de trabalho +-#os_locale_lang# +- +-#?os_locale_lang==pt_PT# +-documents = #-ini(resource.path)-#/Documentos +-downloads = #-ini(resource.path)-#/Transferências +-music = #-ini(resource.path)-#/Música +-pictures = #-ini(resource.path)-#/Imagens +-public = #-ini(resource.path)-#/Público +-templates = #-ini(resource.path)-#/Modelos +-videos = #-ini(resource.path)-#/Vídeos +-#os_locale_lang# +-#?os_locale_lang==pt_PT&&ur_domain_set==off# +-desktop = /home/#-ur_login-#/Desktop +-#os_locale_lang# +- +-#?os_locale_lang==ro_RO# +-documents = #-ini(resource.path)-#/Documente +-downloads = #-ini(resource.path)-#/Descărcări +-music = #-ini(resource.path)-#/Muzică +-pictures = #-ini(resource.path)-#/Poze +-public = #-ini(resource.path)-#/Public +-templates = #-ini(resource.path)-#/Templates +-videos = #-ini(resource.path)-#/Video +-#os_locale_lang# +-#?os_locale_lang==ro_RO&&ur_domain_set==off# +-desktop = /home/#-ur_login-#/Desktop +-#os_locale_lang# +- +-#?os_locale_lang==ru_RU# +-documents = #-ini(resource.path)-#/Документы +-downloads = #-ini(resource.path)-#/Загрузки +-music = #-ini(resource.path)-#/Музыка +-pictures = #-ini(resource.path)-#/Картинки +-public = #-ini(resource.path)-#/Общедоступные +-templates = #-ini(resource.path)-#/Шаблоны +-videos = #-ini(resource.path)-#/Видео +-#os_locale_lang# +-#?os_locale_lang==ru_RU&&ur_domain_set==off# +-desktop = /home/#-ur_login-#/Рабочий стол +-#os_locale_lang# +- +-#?os_locale_lang==uk_UA# +-documents = #-ini(resource.path)-#/Документи +-downloads = #-ini(resource.path)-#/Завантаження +-music = #-ini(resource.path)-#/Музика +-pictures = #-ini(resource.path)-#/Картинки +-public = #-ini(resource.path)-#/Загальнодоступні +-templates = #-ini(resource.path)-#/Шаблони +-videos = #-ini(resource.path)-#/Відео +-#os_locale_lang# +-#?os_locale_lang==uk_UA&&ur_domain_set==off# +-desktop = /home/#-ur_login-#/Робочий стіл +-#os_locale_lang# +- +diff --git desktop/desktop/00-patch-2.2.0.16/ini.env desktop/desktop/00-patch-2.2.0.16/ini.env +deleted file mode 100644 +index cccccca..0000000 +--- desktop/desktop/00-patch-2.2.0.16/ini.env ++++ /dev/null +@@ -1,7 +0,0 @@ +-# Calculate format=samba path=~/.calculate +- +-[ver] +-patch = 2.2.0.16 +- +-[update] +-patch = on +diff --git desktop/desktop/00-patch-2.2.10/.calculate_directory desktop/desktop/00-patch-2.2.10/.calculate_directory +index d44b259..9ea3814 100644 +--- desktop/desktop/00-patch-2.2.10/.calculate_directory ++++ desktop/desktop/00-patch-2.2.10/.calculate_directory +@@ -1 +1 @@ +-# Calculate append=skip belong(calculate-desktop)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.10 ++# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.10 +diff --git desktop/desktop/00-patch-2.2.12/.calculate_directory desktop/desktop/00-patch-2.2.12/.calculate_directory +index 92513a1..3f135e2 100644 +--- desktop/desktop/00-patch-2.2.12/.calculate_directory ++++ desktop/desktop/00-patch-2.2.12/.calculate_directory +@@ -1 +1 @@ +-# Calculate append=skip belong(calculate-desktop)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.12 ++# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.12 +diff --git desktop/desktop/00-patch-2.2.13/.calculate_directory desktop/desktop/00-patch-2.2.13/.calculate_directory +index ea391de..81943f4 100644 +--- desktop/desktop/00-patch-2.2.13/.calculate_directory ++++ desktop/desktop/00-patch-2.2.13/.calculate_directory +@@ -1 +1 @@ +-# Calculate append=skip belong(calculate-desktop)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.13 ++# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.13 +diff --git desktop/desktop/00-patch-2.2.22/.calculate_directory desktop/desktop/00-patch-2.2.22/.calculate_directory +new file mode 100644 +index 0000000..9259f63 +--- /dev/null ++++ desktop/desktop/00-patch-2.2.22/.calculate_directory +@@ -0,0 +1 @@ ++# Calculate append=skip belong(calculate-templates)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.22 +diff --git desktop/desktop/00-patch-2.2.22/ini-patch.env desktop/desktop/00-patch-2.2.22/ini-patch.env +new file mode 100644 +index 0000000..6b18c0f +--- /dev/null ++++ desktop/desktop/00-patch-2.2.22/ini-patch.env +@@ -0,0 +1,11 @@ ++# Calculate format=samba path=~/.calculate name=ini.env ini(ver.kde)!= ++ ++[ver] ++kopete = 4.6 ++kwallet = 4.6 ++plasma = 4.6 ++ ++[update] ++kopete = on ++kwallet = on ++plasma = on +diff --git desktop/desktop/00-patch-2.2.22/ini.env desktop/desktop/00-patch-2.2.22/ini.env +new file mode 100644 +index 0000000..7f8174a +--- /dev/null ++++ desktop/desktop/00-patch-2.2.22/ini.env +@@ -0,0 +1,7 @@ ++# Calculate format=samba path=~/.calculate ++ ++[ver] ++patch = 2.2.22 ++ ++[update] ++patch = on +diff --git desktop/desktop/00-patch-2.2.6/.calculate_directory desktop/desktop/00-patch-2.2.6/.calculate_directory +deleted file mode 100644 +index f1b5891..0000000 +--- desktop/desktop/00-patch-2.2.6/.calculate_directory ++++ /dev/null +@@ -1 +0,0 @@ +-# Calculate append=skip belong(calculate-desktop)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.6 +diff --git desktop/desktop/00-patch-2.2.6/audacious2-gtkui.desktop desktop/desktop/00-patch-2.2.6/audacious2-gtkui.desktop +deleted file mode 100644 +index 241f475..0000000 +--- desktop/desktop/00-patch-2.2.6/audacious2-gtkui.desktop ++++ /dev/null +@@ -1 +0,0 @@ +-# Calculate append=remove path=~/.local/share/applications +diff --git desktop/desktop/00-patch-2.2.6/audacious2.desktop desktop/desktop/00-patch-2.2.6/audacious2.desktop +deleted file mode 100644 +index 241f475..0000000 +--- desktop/desktop/00-patch-2.2.6/audacious2.desktop ++++ /dev/null +@@ -1 +0,0 @@ +-# Calculate append=remove path=~/.local/share/applications +diff --git desktop/desktop/00-patch-2.2.6/ini.env desktop/desktop/00-patch-2.2.6/ini.env +deleted file mode 100644 +index c166855..0000000 +--- desktop/desktop/00-patch-2.2.6/ini.env ++++ /dev/null +@@ -1,7 +0,0 @@ +-# Calculate format=samba path=~/.calculate +- +-[ver] +-patch = 2.2.6 +- +-[update] +-patch = on +diff --git desktop/desktop/00-patch-2.2.7/.calculate_directory desktop/desktop/00-patch-2.2.7/.calculate_directory +deleted file mode 100644 +index f06ef76..0000000 +--- desktop/desktop/00-patch-2.2.7/.calculate_directory ++++ /dev/null +@@ -1 +0,0 @@ +-# Calculate append=skip belong(calculate-desktop)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.7 +diff --git desktop/desktop/00-patch-2.2.7/Xcursor.xrdb desktop/desktop/00-patch-2.2.7/Xcursor.xrdb +deleted file mode 100644 +index b3c8ab0..0000000 +--- desktop/desktop/00-patch-2.2.7/Xcursor.xrdb ++++ /dev/null +@@ -1,2 +0,0 @@ +-# Calculate append=replace path=~/.config/xfce4 ini(ver.xfce)!= +-Xcursor.theme: neutral +diff --git desktop/desktop/00-patch-2.2.7/ini.env desktop/desktop/00-patch-2.2.7/ini.env +deleted file mode 100644 +index 5cf6df3..0000000 +--- desktop/desktop/00-patch-2.2.7/ini.env ++++ /dev/null +@@ -1,7 +0,0 @@ +-# Calculate format=samba path=~/.calculate +- +-[ver] +-patch = 2.2.7 +- +-[update] +-patch = on +diff --git desktop/desktop/00-patch-2.2.7/xsettings.xml desktop/desktop/00-patch-2.2.7/xsettings.xml +deleted file mode 100644 +index 54ae4a0..0000000 +--- desktop/desktop/00-patch-2.2.7/xsettings.xml ++++ /dev/null +@@ -1,8 +0,0 @@ +-# Calculate path=~/.config/xfce4/xfconf/xfce-perchannel-xml format=xml_xfce ini(ver.xfce)!= +- +- +- +- +- +- +- +diff --git desktop/desktop/00-patch-2.2.8/.calculate_directory desktop/desktop/00-patch-2.2.8/.calculate_directory +deleted file mode 100644 +index ef8044f..0000000 +--- desktop/desktop/00-patch-2.2.8/.calculate_directory ++++ /dev/null +@@ -1 +0,0 @@ +-# Calculate append=skip belong(calculate-desktop)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.8 +diff --git desktop/desktop/00-patch-2.2.8/10000000043.desktop desktop/desktop/00-patch-2.2.8/10000000043.desktop +deleted file mode 100644 +index 4e116f5..0000000 +--- desktop/desktop/00-patch-2.2.8/10000000043.desktop ++++ /dev/null +@@ -1,3 +0,0 @@ +-# Calculate format=kde ini(ver.xfce)!= link=/usr/share/applications/leafpad.desktop path=~/.config/xfce4/panel/launcher-43 +-[Desktop Entry] +-X-XFCE-Source=file:///usr/share/applications/leafpad.desktop +diff --git desktop/desktop/00-patch-2.2.8/ini.env desktop/desktop/00-patch-2.2.8/ini.env +deleted file mode 100644 +index 35b0f29..0000000 +--- desktop/desktop/00-patch-2.2.8/ini.env ++++ /dev/null +@@ -1,7 +0,0 @@ +-# Calculate format=samba path=~/.calculate +- +-[ver] +-patch = 2.2.8 +- +-[update] +-patch = on +diff --git desktop/desktop/00-patch-2.2.8/kcminputrc desktop/desktop/00-patch-2.2.8/kcminputrc +deleted file mode 100644 +index 059b0d8..0000000 +--- desktop/desktop/00-patch-2.2.8/kcminputrc ++++ /dev/null +@@ -1,8 +0,0 @@ +-# Calculate format=kde ini(ver.kde)!= path=~/.kde4/share/config +-[$Version] +-#для отмены сброса настройки cursorTheme +-update_info=mouse_cursor_theme.upd:kde3.4.99 +- +-[Mouse] +-#тема курсоров мыши +-cursorTheme=neutral +diff --git desktop/desktop/00-patch-2.2.8/kcminputrc-bad desktop/desktop/00-patch-2.2.8/kcminputrc-bad +deleted file mode 100644 +index b9e0ea2..0000000 +--- desktop/desktop/00-patch-2.2.8/kcminputrc-bad ++++ /dev/null +@@ -1,2 +0,0 @@ +-# Calculate ini(ver.kde)!= append=remove name=kcminputrc +- +diff --git desktop/desktop/00-patch-2.2.8/leafpadrc desktop/desktop/00-patch-2.2.8/leafpadrc +deleted file mode 100644 +index 62d9e78..0000000 +--- desktop/desktop/00-patch-2.2.8/leafpadrc ++++ /dev/null +@@ -1,8 +0,0 @@ +-# Calculate ini(ver.xfce)!= path=~/.config/leafpad +-0.8.17 +-600 +-400 +-Droid Sans Mono 10 +-1 +-0 +-0 +diff --git desktop/desktop/00-patch-2.2.8/xfce4-panel.xml desktop/desktop/00-patch-2.2.8/xfce4-panel.xml +deleted file mode 100644 +index 8eeac10..0000000 +--- desktop/desktop/00-patch-2.2.8/xfce4-panel.xml ++++ /dev/null +@@ -1,12 +0,0 @@ +-# Calculate format=xml_xfce ini(ver.xfce)!= path=~/.config/xfce4/xfconf/xfce-perchannel-xml +- +- +- +- +- +- +- +- +- +- +- +diff --git desktop/desktop/00-patch-2.2.9/.calculate_directory desktop/desktop/00-patch-2.2.9/.calculate_directory +deleted file mode 100644 +index 4a1be37..0000000 +--- desktop/desktop/00-patch-2.2.9/.calculate_directory ++++ /dev/null +@@ -1 +0,0 @@ +-# Calculate append=skip belong(calculate-desktop)!=&&ini(update.patch)!=off&&ini(ver.patch)<2.2.9 +diff --git desktop/desktop/00-patch-2.2.9/dolphinrc desktop/desktop/00-patch-2.2.9/dolphinrc +deleted file mode 100644 +index 875c51e..0000000 +--- desktop/desktop/00-patch-2.2.9/dolphinrc ++++ /dev/null +@@ -1,4 +0,0 @@ +-# Calculate format=kde ini(ver.kde)!= path=~/.kde4/share/config +-[MainWindow] +-ToolBarsMovable=Disabled +- +diff --git desktop/desktop/00-patch-2.2.9/ini.env desktop/desktop/00-patch-2.2.9/ini.env +deleted file mode 100644 +index 3f00b77..0000000 +--- desktop/desktop/00-patch-2.2.9/ini.env ++++ /dev/null +@@ -1,7 +0,0 @@ +-# Calculate format=samba path=~/.calculate +- +-[ver] +-patch = 2.2.9 +- +-[update] +-patch = on +diff --git desktop/desktop/00-patch-2.2.9/plasmarc desktop/desktop/00-patch-2.2.9/plasmarc +deleted file mode 100644 +index b9a1272..0000000 +--- desktop/desktop/00-patch-2.2.9/plasmarc ++++ /dev/null +@@ -1,4 +0,0 @@ +-# Calculate format=plasma ini(ver.kde)!= path=~/.kde4/share/config +-[Theme] +-name=slim-glow +- +diff --git desktop/desktop/00-patch-2.2.9/send-attach.desktop desktop/desktop/00-patch-2.2.9/send-attach.desktop +deleted file mode 100644 +index 9590ed5..0000000 +--- desktop/desktop/00-patch-2.2.9/send-attach.desktop ++++ /dev/null +@@ -1,21 +0,0 @@ +-# Calculate format=kde ini(ver.kde)!= path=~/.kde4/share/kde4/services/ServiceMenu +-[Desktop Entry] +-Type=Service +-X-KDE-ServiceTypes=KonqPopupMenu/Plugin,all/allfiles +-Actions=openKmailAttachment +-Encoding=UTF-8 +-MimeType=application/octet-stream +-ExcludeServiceTypes=application/x-iso,kdedevice/*,inode/directory +- +-[Desktop Action openKmailAttachment] +-Name=Send File As Attachment +-Name[de]=Datei als Anhang versenden +-Name[en]=Send File As Attachment +-Name[fr]=Envoyer le fichier en pièce jointe +-Name[pt]=Enviar por correio-e +-Name[sk]=Poslať e-mailom +-Name[ru]=Отправить в KMail +- +-Icon=kmail +-Exec=kmail --composer --attach %F `echo attachment=\'file://%F\' | sed 's/ \//,file:\/\/\//g'` +-X-Ubuntu-Gettext-Domain=desktop_kdebase +diff --git desktop/desktop/20-kde-4.6/.kde4/share/apps/kopete/kopetechatwindow.rc desktop/desktop/20-kde-4.6/.kde4/share/apps/kopete/kopetechatwindow.rc +deleted file mode 100644 +index 4708080..0000000 +--- desktop/desktop/20-kde-4.6/.kde4/share/apps/kopete/kopetechatwindow.rc ++++ /dev/null +@@ -1,7 +0,0 @@ +- +- +- +- +- +- +- +diff --git desktop/desktop/20-kde-4.6/.kde4/share/apps/kopete/kopeteemailwindow.rc desktop/desktop/20-kde-4.6/.kde4/share/apps/kopete/kopeteemailwindow.rc +deleted file mode 100644 +index 5f7c52b..0000000 +--- desktop/desktop/20-kde-4.6/.kde4/share/apps/kopete/kopeteemailwindow.rc ++++ /dev/null +@@ -1,7 +0,0 @@ +- +- +- +- +- +- +- +diff --git desktop/desktop/20-kde-4.6/.kde4/share/apps/kwallet/kdewallet.kwl desktop/desktop/20-kde-4.6/.kde4/share/apps/kwallet/kdewallet.kwl +deleted file mode 100644 +index 3e8774c..0000000 +Binary files desktop/desktop/20-kde-4.6/.kde4/share/apps/kwallet/kdewallet.kwl and /dev/null differ +diff --git desktop/desktop/20-kde-4.6/.kde4/share/config/kdeglobals desktop/desktop/20-kde-4.6/.kde4/share/config/kdeglobals +index 4015931..150bd84 100644 +--- desktop/desktop/20-kde-4.6/.kde4/share/config/kdeglobals ++++ desktop/desktop/20-kde-4.6/.kde4/share/config/kdeglobals +@@ -5,15 +5,7 @@ emoticonsTheme=KMess-Cartoon + + #Fonts + [General] +-#?pkg(www-client/chromium)!=# +-BrowserApplication[$e]=file:///usr/share/applications/chromium-chromium.desktop +-#pkg# +-#?pkg(www-client/firefox)!=&&pkg(www-client/chromium)==# +-BrowserApplication[$e]=file:///home/#-ur_login-#/.local/share/applications/mozilla-firefox.desktop +-#pkg# +-#?pkg(www-client/firefox)==&&pkg(www-client/chromium)==# +-BrowserApplication[$e]=file:///usr/share/applications/kde4/konqbrowser.desktop +-#pkg# ++BrowserApplication[$e]=file:///usr/share/applications/calculate-browser.desktop + XftHintStyle=hintmedium + #?pkg(media-fonts/droid)!=# + desktopFont=Droid Sans,10,-1,5,50,0,0,0,0,0 +diff --git desktop/desktop/20-kde-4.6/.kde4/share/config/kopete.notifyrc desktop/desktop/20-kde-4.6/.kde4/share/config/kopete.notifyrc +deleted file mode 100644 +index 0e256cb..0000000 +--- desktop/desktop/20-kde-4.6/.kde4/share/config/kopete.notifyrc ++++ /dev/null +@@ -1,9 +0,0 @@ +-# Calculate format=kde +-[Event/kopete_contact_incoming] +-#реакция на входящее сообщение +-Action=Sound|Popup|Taskbar +- +-[Event/kopete_contact_online] +-#реакция когда пользователь вошел в сеть +-Action= +- +diff --git desktop/desktop/20-kde-4.6/.kde4/share/config/kopeterc desktop/desktop/20-kde-4.6/.kde4/share/config/kopeterc +deleted file mode 100644 +index cb33211..0000000 +--- desktop/desktop/20-kde-4.6/.kde4/share/config/kopeterc ++++ /dev/null +@@ -1,89 +0,0 @@ +-# Calculate format=kde append=replace +-#?env(client.os_remote_auth)!=&&ur_domain_set==on&&server(jabber.host)!=# +-[Account_JabberProtocol_#-ur_jid-#] +-AccountId=#-ur_jid-# +-AllowPlainTextPassword=true +-CustomServer=true +-Port=#-server(jabber.port)-# +-Protocol=JabberProtocol +-RememberPassword=true +-Server=#-server(jabber.host)-# +-UseSSL=true +-#env# +- +-[Behavior] +-#подключаться автоматически +-#?pkg(kde-base/kopete)<4.2# +-autoConnect=true +-#pkg# +-#?pkg(kde-base/kopete)>=4.2# +-initialStatus=Online +-#pkg# +- +-[ContactList] +-#показывать фотографии пользователей (если есть) +-contactListIconMode=IconPhoto +-#показывать пользователей не в сети +-showOfflineUsers=false +- +-[General Options] +-#размер окна +-Geometry=230,600 +-#фиксация панели инструментов +-#ToolBarsMovable=Disabled +-#отображение строки меню +-MenuBar=Disabled +-#статусная строка свернута +-ShownIdentityId= +- +-#[KopeteChatWindowIndividualMode][Toolbar mainToolBar] +-#отображение иконок в окне диалога +-#ToolButtonStyle=IconOnly +- +-#размер окна чата +-[KopeteChatWindowIndividualMode] +-#положение разделителя истории +-ChatViewSplitter=AAAA/wAAAAAAAAACAAAAlQAAAFMAAAAAAwEAAAAC +-Height 768=400 +-Height 800=400 +-Height 900=400 +-Height 1024=400 +-Height 1050=400 +-Height 1200=400 +-Width 1024=500 +-Width 1280=500 +-Width 1440=500 +-Width 1600=500 +-Width 1680=500 +-Width 1920=500 +- +-[MainWindow] +-Height 768=400 +-Height 800=400 +-Height 900=400 +-Height 1024=400 +-Height 1050=400 +-Height 1200=400 +-Width 1024=500 +-Width 1280=500 +-Width 1440=500 +-Width 1600=500 +-Width 1680=500 +-Width 1920=500 +- +-[Notification Messages] +-#?env(client.os_remote_auth)!=&&ur_domain_set==on&&server(jabber.host)!=# +-#выдавать предупреждение при проверке сертификата защищенного соединения +-KopeteTLSWarning#-ur_jid_host-#InvalidCertSelfSigned=false +-#env# +-#предупреждать что программа остается запущенной при закрытии главного окна +-hideOnCloseInfo=false +- +-[QuickSearchBar Settings] +-#скрытие панели поиска +-Hidden=true +- +-[ToolBar Settings] +-#отображение иконок в окне приложения +-ToolButtonStyle=IconOnly +- +diff --git desktop/desktop/20-kde-4.6/.kde4/share/config/kwalletrc desktop/desktop/20-kde-4.6/.kde4/share/config/kwalletrc +deleted file mode 100644 +index 02ee787..0000000 +--- desktop/desktop/20-kde-4.6/.kde4/share/config/kwalletrc ++++ /dev/null +@@ -1,10 +0,0 @@ +-# Calculate format=kde +-#applications that access is allowed +-[Auto Allow] +-kdewallet=Kopete,KMail,Konqueror,Chrome,Network Management,KDE Daemon,KDE-Dienst,Servicio de KDE,Démon de KDE,Demone KDE,Servidor do KDE,Serviço do KDE,Demon KDE,Служба KDE,Фонова служба KDE +- +-[Wallet] +-Close When Idle=false +-Enabled=true +-First Use=false +-Use One Wallet=true +diff --git desktop/desktop/20-kde-4.6/.kde4/share/config/plasma-desktop-appletsrc desktop/desktop/20-kde-4.6/.kde4/share/config/plasma-desktop-appletsrc +deleted file mode 100644 +index 672f36e..0000000 +--- desktop/desktop/20-kde-4.6/.kde4/share/config/plasma-desktop-appletsrc ++++ /dev/null +@@ -1,358 +0,0 @@ +-# Calculate format=plasma append=replace +-#------------------------------------------------------------------------------ +-#рабочий стол +-#------------------------------------------------------------------------------ +-[AppletGlobals][plasma_applet_pager] +-rows=1 +- +-[Containments][#-sum(cont,1)-#] +-activity= +-alignToGrid=true +-customIconSize=48 +-desktop=0 +-filter=0 +-filterFiles=* +-formfactor=0 +-geometry=0,0,#-os_x11_width-#,#-os_x11_height-# +-iconsLocked=false +-immutability=1 +-location=0 +-mimeFilter= +-plugin=folderview +-screen=0 +-url=desktop:/ +-wallpaperplugin=image +-wallpaperpluginmode=SingleImage +-#-sum(iconx,,10)-# +-#-sum(icony,,10)-# +-#-sum(iconcx,,112)-# +-#-sum(iconcy,,100)-# +-#-sum(iconcount,,2)-# +-savedPositions=1,7,Home.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,Share.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,FTP.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,#-sum(iconx,,10)-##-sum(icony,,icony+iconcy)-#calculate-install.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,partitionmanager.desktop,#-sum(iconx,iconx,10)-#,#-sum(icony,icony,icony+iconcy)-#,README.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,calculate-community.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-# +-zvalue=0 +-sortColumn=-1 +- +-[Containments][#-sum(cont,cont)-#][Wallpaper][image] +-slideTimer=600 +-slidepaths=/usr/share/wallpapers/ +-userswallpapers= +-wallpaper=/usr/share/wallpapers/Calculate_Linux +-wallpapercolor=56,111,150 +-wallpaperposition=0 +- +-#------------------------------------------------------------------------------ +-#верхняя панель +-#------------------------------------------------------------------------------ +-#-sum(panel,,31)-# +-#-sum(apporder,,0)-# +- +-[Containments][-#-sum(cont,cont+1)-#] +-desktop=-1 +-formfactor=2 +-geometry=0,0,#-os_x11_width-#,#-sum(panel,panel)-# +-immutability=1 +-location=3 +-plugin=panel +-screen=0 +-zvalue=150 +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,cont*100)-#] +-immutability=1 +-plugin=simplelauncher +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-icon=kde +-#?env(client.os_remote_auth)==||ur_domain_set==off# +-views=Applications,RunCommand,Leave +-#env# +-#?env(client.os_remote_auth)!=&&ur_domain_set==on# +-views=Applications,RunCommand,SwitchUser,LockScreen,Logout +-#env# +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder)-# +- +-#?env(client.os_remote_auth)==||ur_domain_set==off# +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///home/#-ur_login-# +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +-#env# +- +-#?env(client.os_remote_auth)!=&&ur_domain_set==on# +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///home/#-ur_login-#/Home +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///home/#-ur_login-#/Share +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +-#env# +- +-#?env(client.os_remote_auth)!=&&ur_domain_set==on&&server(ftp.host)!=# +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///home/#-ur_login-#/FTP +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +-#env# +-#?server(ftp.host)==# +-[Containments][#-sum(cont,cont)-#][Applets][!#-sum(app,app+1)-#] +-#-sum(apporder,,apporder+1)-# +-#server# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=pager +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-#показывать номер рабочего стола - 0 +-displayedText=0 +-#отображать значки +-showWindowIcons=true +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=tasks +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-#группирование +-groupingStrategy=0 +-#максимум строк +-maxRows=1 +-#показывать задачи только с текущего рабочего стола +-showOnlyCurrentDesktop=true +-#сортировка +-sortingStrategy=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=trash +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][!#-sum(app,app+1)-#] +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=systemtray +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-hidden=kwalletmanager +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=digital-clock +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][999] +-immutability=1 +-plugin=lockout +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][999][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Configuration] +-maximumSize=#-os_x11_width-#,#-sum(panel,panel)-# +-minimumSize=#-os_x11_width-#,#-sum(panel,panel)-# +- +-#------------------------------------------------------------------------------ +-#нижняя панель +-#------------------------------------------------------------------------------ +- +-#-sum(height,,44)-# +-#?hr_cdrom_set==on# +-#-sum(width,,height*14)-# +-#hr_cdrom_set# +-#?hr_cdrom_set==off# +-#-sum(width,,height*13)-# +-#hr_cdrom_set# +-#-sum(apporder,,0)-# +- +-#?pkg(net-irc/konversation)!=# +-#-sum(width,,width+height)-# +-#pkg# +- +-[Containments][-#-sum(cont,cont+1)-#] +-desktop=-1 +-formfactor=2 +-geometry=0,0,#-sum(width,width)-#,#-sum(height,height)-# +-immutability=1 +-location=4 +-plugin=panel +-screen=0 +-zvalue=150 +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,cont*100)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-browser.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-mail.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-#?pkg(net-irc/konversation)!=# +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-chat.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +-#pkg# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-im.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-writer.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-calc.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-calculator.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-imageedit.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-imageview.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-audioplayer.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-videoplayer.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-#?hr_cdrom_set==on# +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-imageburn.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +-#hr_cdrom_set# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-dict.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-textedit.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] +-immutability=1 +-plugin=icon +-zvalue=0 +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +-Url=file:///usr/share/applications/calculate-terminal.desktop +-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] +-Order=#-sum(apporder,apporder+1)-# +- +-[General] +-immutability=2 +- +-[Containments][#-sum(cont,cont)-#][Configuration] +-maximumSize=#-sum(width,width)-#,#-sum(height,height)-# +-minimumSize=#-sum(width,width)-#,#-sum(height,height)-# +- +diff --git desktop/desktop/20-kde-4.6/.kde4/share/config/plasma-desktoprc desktop/desktop/20-kde-4.6/.kde4/share/config/plasma-desktoprc +deleted file mode 100644 +index da6d215..0000000 +--- desktop/desktop/20-kde-4.6/.kde4/share/config/plasma-desktoprc ++++ /dev/null +@@ -1,21 +0,0 @@ +-# Calculate format=plasma +-#расположение панелей +-[PlasmaViews][1] +-Alignment=132 +-Offset=0 +-panelVisibility=1 +- +-[PlasmaViews][2] +-Alignment=132 +-Offset=0 +-panelVisibility=1 +- +-[PlasmaViews][3] +-Offset=0 +-panelVisibility=0 +- +-[ViewIds] +-1=1 +-2=3 +-3=2 +- +diff --git desktop/desktop/20-kde-4.6/.kde4/share/config/plasmarc desktop/desktop/20-kde-4.6/.kde4/share/config/plasmarc +deleted file mode 100644 +index 133c3ab..0000000 +--- desktop/desktop/20-kde-4.6/.kde4/share/config/plasmarc ++++ /dev/null +@@ -1,5 +0,0 @@ +-# Calculate format=plasma +-#оформление +-[Theme] +-name=slim-glow +- +diff --git desktop/desktop/20-kopete-4.6/.calculate_directory desktop/desktop/20-kopete-4.6/.calculate_directory +new file mode 100644 +index 0000000..03e969f +--- /dev/null ++++ desktop/desktop/20-kopete-4.6/.calculate_directory +@@ -0,0 +1 @@ ++# Calculate append=skip belong(kopete)!=&&ini(update.kopete)!=off&&ini(ver.kopete)==&&pkg(kde-base/kopete)>=4.6 +diff --git desktop/desktop/20-kopete-4.6/ini.env desktop/desktop/20-kopete-4.6/ini.env +new file mode 100644 +index 0000000..f4970fe +--- /dev/null ++++ desktop/desktop/20-kopete-4.6/ini.env +@@ -0,0 +1,7 @@ ++# Calculate format=samba path=~/.calculate ++ ++[ver] ++kopete = 4.6 ++ ++[update] ++kopete = on +diff --git desktop/desktop/20-kopete-4.6/kopete.notifyrc desktop/desktop/20-kopete-4.6/kopete.notifyrc +new file mode 100644 +index 0000000..21911c8 +--- /dev/null ++++ desktop/desktop/20-kopete-4.6/kopete.notifyrc +@@ -0,0 +1,10 @@ ++# Calculate format=kde path=~/.kde4/share/config ++ ++[Event/kopete_contact_incoming] ++# response to an incoming message ++Action=Sound|Popup|Taskbar ++ ++[Event/kopete_contact_online] ++# reaction to the birth of a user in the online ++Action= ++ +diff --git desktop/desktop/20-kopete-4.6/kopetechatwindow.rc desktop/desktop/20-kopete-4.6/kopetechatwindow.rc +new file mode 100644 +index 0000000..0ad4d8d +--- /dev/null ++++ desktop/desktop/20-kopete-4.6/kopetechatwindow.rc +@@ -0,0 +1,8 @@ ++# Calculate path=~/.kde4/share/apps/kopete ++ ++ ++ ++ ++ ++ ++ +diff --git desktop/desktop/20-kopete-4.6/kopeteemailwindow.rc desktop/desktop/20-kopete-4.6/kopeteemailwindow.rc +new file mode 100644 +index 0000000..c7dfbff +--- /dev/null ++++ desktop/desktop/20-kopete-4.6/kopeteemailwindow.rc +@@ -0,0 +1,8 @@ ++# Calculate path=~/.kde4/share/apps/kopete ++ ++ ++ ++ ++ ++ ++ +diff --git desktop/desktop/20-kopete-4.6/kopeterc desktop/desktop/20-kopete-4.6/kopeterc +new file mode 100644 +index 0000000..d888cfa +--- /dev/null ++++ desktop/desktop/20-kopete-4.6/kopeterc +@@ -0,0 +1,86 @@ ++# Calculate format=kde append=replace path=~/.kde4/share/config ++ ++#?env(client.os_remote_auth)!=&&ur_domain_set==on&&server(jabber.host)!=# ++[Account_JabberProtocol_#-ur_jid-#] ++AccountId=#-ur_jid-# ++AllowPlainTextPassword=true ++CustomServer=true ++Port=#-server(jabber.port)-# ++Protocol=JabberProtocol ++RememberPassword=true ++Server=#-server(jabber.host)-# ++UseSSL=true ++#env# ++ ++[Behavior] ++# automatically connect ++#?pkg(kde-base/kopete)<4.2# ++autoConnect=true ++#pkg# ++#?pkg(kde-base/kopete)>=4.2# ++initialStatus=Online ++#pkg# ++ ++[ContactList] ++contactListIconMode=IconPhoto ++showOfflineUsers=false ++ ++[General Options] ++Geometry=230,600 ++# fixation toolbar ++#ToolBarsMovable=Disabled ++MenuBar=Disabled ++# the status bar is minimized ++ShownIdentityId= ++ ++#[KopeteChatWindowIndividualMode][Toolbar mainToolBar] ++# map icon in the dialog box ++#ToolButtonStyle=IconOnly ++ ++# size of the chat window ++[KopeteChatWindowIndividualMode] ++# position of the splitter stories ++ChatViewSplitter=AAAA/wAAAAAAAAACAAAAlQAAAFMAAAAAAwEAAAAC ++Height 768=400 ++Height 800=400 ++Height 900=400 ++Height 1024=400 ++Height 1050=400 ++Height 1200=400 ++Width 1024=500 ++Width 1280=500 ++Width 1440=500 ++Width 1600=500 ++Width 1680=500 ++Width 1920=500 ++ ++[MainWindow] ++Height 768=400 ++Height 800=400 ++Height 900=400 ++Height 1024=400 ++Height 1050=400 ++Height 1200=400 ++Width 1024=500 ++Width 1280=500 ++Width 1440=500 ++Width 1600=500 ++Width 1680=500 ++Width 1920=500 ++ ++[Notification Messages] ++#?env(client.os_remote_auth)!=&&ur_domain_set==on&&server(jabber.host)!=# ++# issue a warning when verifying a certificate protected connection ++KopeteTLSWarning#-ur_jid_host-#InvalidCertSelfSigned=false ++#env# ++# warn that the program is running when you close the main window ++hideOnCloseInfo=false ++ ++[QuickSearchBar Settings] ++# hide search bar ++Hidden=true ++ ++[ToolBar Settings] ++# display icons in the application ++ToolButtonStyle=IconOnly ++ +diff --git desktop/desktop/20-kwallet-4.6/.calculate_directory desktop/desktop/20-kwallet-4.6/.calculate_directory +new file mode 100644 +index 0000000..b2d6a13 +--- /dev/null ++++ desktop/desktop/20-kwallet-4.6/.calculate_directory +@@ -0,0 +1 @@ ++# Calculate append=skip belong(kwallet)!=&&ini(update.kwallet)!=off&&ini(ver.kwallet)==&&pkg(kde-base/kwallet)>=4.6 +diff --git desktop/desktop/20-kwallet-4.6/ini.env desktop/desktop/20-kwallet-4.6/ini.env +new file mode 100644 +index 0000000..713626c +--- /dev/null ++++ desktop/desktop/20-kwallet-4.6/ini.env +@@ -0,0 +1,7 @@ ++# Calculate format=samba path=~/.calculate ++ ++[ver] ++kwallet = 4.6 ++ ++[update] ++kwallet = on +diff --git desktop/desktop/20-kwallet-4.6/kwallet/.calculate_directory desktop/desktop/20-kwallet-4.6/kwallet/.calculate_directory +new file mode 100644 +index 0000000..ab3ea29 +--- /dev/null ++++ desktop/desktop/20-kwallet-4.6/kwallet/.calculate_directory +@@ -0,0 +1 @@ ++# Calculate path=~/.kde4/share/apps +diff --git desktop/desktop/20-kwallet-4.6/kwallet/kdewallet.kwl desktop/desktop/20-kwallet-4.6/kwallet/kdewallet.kwl +new file mode 100644 +index 0000000..3e8774c +Binary files /dev/null and desktop/desktop/20-kwallet-4.6/kwallet/kdewallet.kwl differ +diff --git desktop/desktop/20-kwallet-4.6/kwalletrc desktop/desktop/20-kwallet-4.6/kwalletrc +new file mode 100644 +index 0000000..5243adc +--- /dev/null ++++ desktop/desktop/20-kwallet-4.6/kwalletrc +@@ -0,0 +1,11 @@ ++# Calculate format=kde path=~/.kde4/share/config ++ ++# Applications that access is allowed ++[Auto Allow] ++kdewallet=Kopete,KMail,Konqueror,Chrome,Network Management,KDE Daemon,KDE-Dienst,Servicio de KDE,Démon de KDE,Demone KDE,Servidor do KDE,Serviço do KDE,Demon KDE,Служба KDE,Фонова служба KDE ++ ++[Wallet] ++Close When Idle=false ++Enabled=true ++First Use=false ++Use One Wallet=true +diff --git desktop/desktop/20-plasma-4.6/.calculate_directory desktop/desktop/20-plasma-4.6/.calculate_directory +new file mode 100644 +index 0000000..1eed3c1 +--- /dev/null ++++ desktop/desktop/20-plasma-4.6/.calculate_directory +@@ -0,0 +1 @@ ++# Calculate append=skip belong(plasma-workspace)!=&&ini(update.plasma)!=off&&ini(ver.plasma)==&&pkg(kde-base/plasma-workspace)>=4.6 +diff --git desktop/desktop/20-plasma-4.6/ini.env desktop/desktop/20-plasma-4.6/ini.env +new file mode 100644 +index 0000000..73be5bf +--- /dev/null ++++ desktop/desktop/20-plasma-4.6/ini.env +@@ -0,0 +1,7 @@ ++# Calculate format=samba path=~/.calculate ++ ++[ver] ++plasma = 4.6 ++ ++[update] ++plasma = on +diff --git desktop/desktop/20-plasma-4.6/plasma-desktop-appletsrc desktop/desktop/20-plasma-4.6/plasma-desktop-appletsrc +new file mode 100644 +index 0000000..d4799d6 +--- /dev/null ++++ desktop/desktop/20-plasma-4.6/plasma-desktop-appletsrc +@@ -0,0 +1,358 @@ ++# Calculate format=plasma append=replace path=~/.kde4/share/config ++#------------------------------------------------------------------------------ ++#рабочий стол ++#------------------------------------------------------------------------------ ++[AppletGlobals][plasma_applet_pager] ++rows=1 ++ ++[Containments][#-sum(cont,1)-#] ++activity= ++alignToGrid=true ++customIconSize=48 ++desktop=0 ++filter=0 ++filterFiles=* ++formfactor=0 ++geometry=0,0,#-os_x11_width-#,#-os_x11_height-# ++iconsLocked=false ++immutability=1 ++location=0 ++mimeFilter= ++plugin=folderview ++screen=0 ++url=desktop:/ ++wallpaperplugin=image ++wallpaperpluginmode=SingleImage ++#-sum(iconx,,10)-# ++#-sum(icony,,10)-# ++#-sum(iconcx,,112)-# ++#-sum(iconcy,,100)-# ++#-sum(iconcount,,2)-# ++savedPositions=1,7,Home.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,Share.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,FTP.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,#-sum(iconx,,10)-##-sum(icony,,icony+iconcy)-#calculate-install.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,partitionmanager.desktop,#-sum(iconx,iconx,10)-#,#-sum(icony,icony,icony+iconcy)-#,README.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,calculate-community.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-# ++zvalue=0 ++sortColumn=-1 ++ ++[Containments][#-sum(cont,cont)-#][Wallpaper][image] ++slideTimer=600 ++slidepaths=/usr/share/wallpapers/ ++userswallpapers= ++wallpaper=/usr/share/wallpapers/Calculate_Linux ++wallpapercolor=56,111,150 ++wallpaperposition=0 ++ ++#------------------------------------------------------------------------------ ++#верхняя панель ++#------------------------------------------------------------------------------ ++#-sum(panel,,31)-# ++#-sum(apporder,,0)-# ++ ++[Containments][-#-sum(cont,cont+1)-#] ++desktop=-1 ++formfactor=2 ++geometry=0,0,#-os_x11_width-#,#-sum(panel,panel)-# ++immutability=1 ++location=3 ++plugin=panel ++screen=0 ++zvalue=150 ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,cont*100)-#] ++immutability=1 ++plugin=simplelauncher ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++icon=kde ++#?env(client.os_remote_auth)==||ur_domain_set==off# ++views=Applications,RunCommand,Leave ++#env# ++#?env(client.os_remote_auth)!=&&ur_domain_set==on# ++views=Applications,RunCommand,SwitchUser,LockScreen,Logout ++#env# ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder)-# ++ ++#?env(client.os_remote_auth)==||ur_domain_set==off# ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///home/#-ur_login-# ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++#env# ++ ++#?env(client.os_remote_auth)!=&&ur_domain_set==on# ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///home/#-ur_login-#/Home ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///home/#-ur_login-#/Share ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++#env# ++ ++#?env(client.os_remote_auth)!=&&ur_domain_set==on&&server(ftp.host)!=# ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///home/#-ur_login-#/FTP ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++#env# ++#?server(ftp.host)==# ++[Containments][#-sum(cont,cont)-#][Applets][!#-sum(app,app+1)-#] ++#-sum(apporder,,apporder+1)-# ++#server# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=pager ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++#показывать номер рабочего стола - 0 ++displayedText=0 ++#отображать значки ++showWindowIcons=true ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=tasks ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++#группирование ++groupingStrategy=0 ++#максимум строк ++maxRows=1 ++#показывать задачи только с текущего рабочего стола ++showOnlyCurrentDesktop=true ++#сортировка ++sortingStrategy=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=trash ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][!#-sum(app,app+1)-#] ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=systemtray ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++hidden=kwalletmanager ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=digital-clock ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][999] ++immutability=1 ++plugin=lockout ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][999][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Configuration] ++maximumSize=#-os_x11_width-#,#-sum(panel,panel)-# ++minimumSize=#-os_x11_width-#,#-sum(panel,panel)-# ++ ++#------------------------------------------------------------------------------ ++#нижняя панель ++#------------------------------------------------------------------------------ ++ ++#-sum(height,,44)-# ++#?hr_cdrom_set==on# ++#-sum(width,,height*14)-# ++#hr_cdrom_set# ++#?hr_cdrom_set==off# ++#-sum(width,,height*13)-# ++#hr_cdrom_set# ++#-sum(apporder,,0)-# ++ ++#?pkg(net-irc/konversation)!=# ++#-sum(width,,width+height)-# ++#pkg# ++ ++[Containments][-#-sum(cont,cont+1)-#] ++desktop=-1 ++formfactor=2 ++geometry=0,0,#-sum(width,width)-#,#-sum(height,height)-# ++immutability=1 ++location=4 ++plugin=panel ++screen=0 ++zvalue=150 ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,cont*100)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-browser.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-mail.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++#?pkg(net-irc/konversation)!=# ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-chat.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++#pkg# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-im.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-writer.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-calc.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-calculator.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-imageedit.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-imageview.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-audioplayer.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-videoplayer.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++#?hr_cdrom_set==on# ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-imageburn.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++#hr_cdrom_set# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-dict.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-textedit.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] ++immutability=1 ++plugin=icon ++zvalue=0 ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] ++Url=file:///usr/share/applications/calculate-terminal.desktop ++[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] ++Order=#-sum(apporder,apporder+1)-# ++ ++[General] ++immutability=2 ++ ++[Containments][#-sum(cont,cont)-#][Configuration] ++maximumSize=#-sum(width,width)-#,#-sum(height,height)-# ++minimumSize=#-sum(width,width)-#,#-sum(height,height)-# ++ +diff --git desktop/desktop/20-plasma-4.6/plasma-desktoprc desktop/desktop/20-plasma-4.6/plasma-desktoprc +new file mode 100644 +index 0000000..72fa120 +--- /dev/null ++++ desktop/desktop/20-plasma-4.6/plasma-desktoprc +@@ -0,0 +1,22 @@ ++# Calculate format=plasma path=~/.kde4/share/config ++ ++# location of panels ++[PlasmaViews][1] ++Alignment=132 ++Offset=0 ++panelVisibility=1 ++ ++[PlasmaViews][2] ++Alignment=132 ++Offset=0 ++panelVisibility=1 ++ ++[PlasmaViews][3] ++Offset=0 ++panelVisibility=0 ++ ++[ViewIds] ++1=1 ++2=3 ++3=2 ++ +diff --git desktop/desktop/20-plasma-4.6/plasmarc desktop/desktop/20-plasma-4.6/plasmarc +new file mode 100644 +index 0000000..d28b6dc +--- /dev/null ++++ desktop/desktop/20-plasma-4.6/plasmarc +@@ -0,0 +1,5 @@ ++# Calculate format=plasma path=~/.kde4/share/config ++#оформление ++[Theme] ++name=slim-glow ++ +diff --git install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-2.4.desktop install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-2.4.desktop +index 5f21119..a0bc2a5 100644 +--- install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-2.4.desktop ++++ install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-2.4.desktop +@@ -1,4 +1,4 @@ +-# Calculate format=kde link=/usr/share/applications/audacious2.desktop name=calculate-audioplayer.desktop mirror pkg(media-sound/audacious)>=2.4 ++# Calculate format=kde link=/usr/share/applications/audacious2.desktop name=calculate-audioplayer.desktop mirror pkg(media-sound/audacious)>=2.4&&pkg(media-sound/audacious)<3.0 + + # Update info + #-ini(desktop.audioplayer, audacious)-# +diff --git install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-3.0.desktop install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-3.0.desktop +new file mode 100644 +index 0000000..6387c9e +--- /dev/null ++++ install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-3.0.desktop +@@ -0,0 +1,9 @@ ++# Calculate format=kde link=/usr/share/applications/audacious.desktop name=calculate-audioplayer.desktop mirror pkg(media-sound/audacious)>=3.0 ++ ++# Update info ++#-ini(desktop.audioplayer, audacious)-# ++ ++# Hide icon ++[Desktop Entry] ++OnlyShowIn=X-NeverShowThis; ++ +diff --git install/1merge/calculate-desktop/.calculate_directory install/1merge/calculate-desktop/.calculate_directory +new file mode 100644 +index 0000000..437bd6a +--- /dev/null ++++ install/1merge/calculate-desktop/.calculate_directory +@@ -0,0 +1,2 @@ ++# Calculate belong()!=&&cl_chroot_status==off&&pkg(sys-apps/calculate-desktop)!= name=etc path=/usr name=bin ++ +diff --git install/1merge/calculate-desktop/xautologin install/1merge/calculate-desktop/xautologin +new file mode 100644 +index 0000000..1173e71 +--- /dev/null ++++ install/1merge/calculate-desktop/xautologin +@@ -0,0 +1,15 @@ ++# Calculate chmod=0755 ++#!/bin/bash ++echo $BASHPID >/var/run/xinit.pid ++while true; ++do ++#?list(cl_migrate_user,1)!=# ++ env USER=#-list(cl_migrate_user,1)-# /usr/share/calculate/xdm/xdm --login ++ su - #-list(cl_migrate_user,1)-# -c 'source /etc/profile;/bin/bash /etc/X11/xinit/xinitrc' ++ env USER=#-list(cl_migrate_user,1)-# /usr/share/calculate/xdm/xdm --logout ++#list# ++#?list(cl_migrate_user,1)==# ++ : ++#list# ++done ++exit 0 +diff --git install/1merge/xorg-server/conf.d/xdm install/1merge/xorg-server/conf.d/xdm +index eb21521..e7fa676 100644 +--- install/1merge/xorg-server/conf.d/xdm ++++ install/1merge/xorg-server/conf.d/xdm +@@ -1,12 +1,19 @@ + # Calculate comment=# + + CHECKVT=7 +-#?pkg(kde-base/kdm)!=# ++#?os_install_root_type==livecd||os_install_linux_shortname==CMC# ++DISPLAYMANAGER="xinit" ++START_STOP_ARGS="--background -- /usr/bin/xautologin -- vt$CHECKVT" ++#os_install_root_type# ++#?os_install_root_type!=livecd&&os_install_linux_shortname!=CMC&&pkg(kde-base/kdm)!=# + DISPLAYMANAGER="kdm" +-#pkg# +-#?pkg(gnome-base/gdm)!=&&pkg(kde-base/kdm)==# ++!START_STOP_ARGS=empty ++#os_install_root_type# ++#?os_install_root_type!=livecd&&os_install_linux_shortname!=CMC&&pkg(gnome-base/gdm)!=&&pkg(kde-base/kdm)==# + DISPLAYMANAGER="gdm" +-#pkg# +-#?pkg(x11-misc/slim)!=&&pkg(kde-base/kdm)==&&pkg(gnome-base/gdm)==# ++!START_STOP_ARGS=empty ++#os_install_root_type# ++#?os_install_root_type!=livecd&&os_install_linux_shortname!=CMC&&pkg(x11-misc/slim)!=&&pkg(kde-base/kdm)==&&pkg(gnome-base/gdm)==# + DISPLAYMANAGER="slim" +-#pkg# ++!START_STOP_ARGS=empty ++#os_install_root_type# diff --git a/sys-apps/calculate-utilities/ChangeLog b/sys-apps/calculate-utilities/ChangeLog index ea0414d74..aa712d50f 100644 --- a/sys-apps/calculate-utilities/ChangeLog +++ b/sys-apps/calculate-utilities/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-utilities-2.2.21-r3 (23 Aug 2011) + + 23 Aug 2011; Mike Hiretsky (mhiretskiy) + +calculate-utilities-2.2.21-r3.ebuild: + Update templates + *calculate-utilities-2.2.21-r2 (22 Aug 2011) 22 Aug 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index 1c9a05593..5c60369f8 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -32,6 +32,7 @@ EBUILD calculate-utilities-2.2.20-r9.ebuild 874 RMD160 5ff0ffa5245061f5ffe5292cf EBUILD calculate-utilities-2.2.20.ebuild 862 RMD160 192cb774b0a4c7dc0ce9f12a7736ad2f62febe14 SHA1 709c0aeb568224264988e15c4f914187eb6c00c2 SHA256 33618ea225c693f3a532f146e0ebcd7ac5d86c121dedb0f8cc7cfda8e938569d EBUILD calculate-utilities-2.2.21-r1.ebuild 865 RMD160 d09702a54724755cca89e16bccb953ebad700625 SHA1 95f6bf58c10b76813b785edb86a434aaebd6d0a1 SHA256 7c2179eb3b399f465ce81ad5e705b35f605f2620d08fc179fe57159773be8e35 EBUILD calculate-utilities-2.2.21-r2.ebuild 877 RMD160 a1adfa7c7080b83fe20c407d7d7417b8ce6f03ae SHA1 68a1b428712369e87ad313bd2d2603ea83f26705 SHA256 483d5803fa79eca8ff47ee41c14098802e0b9b4f554044aa12052be1a04dd6a6 +EBUILD calculate-utilities-2.2.21-r3.ebuild 877 RMD160 83114cae73ed03d3cd14b04c3702b9df4df28645 SHA1 ea7ac39881ec4693d2f28dcdaa5ecaa87fddd299 SHA256 211a7ca1c30914e1640fa4cc0bba8d5e7132cdd5c4bc6b22f64e82ab17ba477f EBUILD calculate-utilities-2.2.21.ebuild 862 RMD160 3786826c24e6bfc0fb9e5b413c85e429ae412723 SHA1 8beb4139d5f2828421d57c4ab7ba6e8a2e59d9ef SHA256 530ea787bfee6bd4308bb782b82a42f0e60d02fa692877135f3fe8402c4ba677 EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66 -MISC ChangeLog 20442 RMD160 5e3c7155f7a6854750e1927c838fdef91483f76f SHA1 41e27d9f0dd47aa5071fb257fab8df6c51aa7682 SHA256 d19d76a3547a524b69ad481fbb2f5a5a48cc3ced4df170994b782af90b042ff4 +MISC ChangeLog 20609 RMD160 a67212622fd0f661781a880982d6f397441c82c1 SHA1 566f2c85e8fdfe379ecd81398ba87e5e5f66da67 SHA256 9ab0815e49ec8cb38bdb5b9a9e2f130e7739fa05bc5401045ebe1b36f1eaae69 diff --git a/sys-apps/calculate-utilities/calculate-utilities-2.2.21-r3.ebuild b/sys-apps/calculate-utilities/calculate-utilities-2.2.21-r3.ebuild new file mode 100644 index 000000000..71c90b4c4 --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.21-r3.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3 + +DESCRIPTION="Calculate Utilities meta package" +HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" +SRC_URI="" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE=" +cl_assemble +cl_builder +cl_client +cl_desktop +cl_installgui +cl_server +" + +RDEPEND="${RDEPEND} + =sys-apps/calculate-install-2.2.21-r2 + =sys-apps/calculate-templates-2.2.21-r2 + =sys-apps/calculate-lib-2.2.21-r1 + =sys-apps/calculate-i18n-2.2.21-r1 + + cl_assemble? ( =sys-apps/calculate-assemble-2.2.21-r1 ) + cl_builder? ( =sys-apps/calculate-builder-2.2.21 ) + cl_client? ( =sys-apps/calculate-client-2.2.21 ) + cl_desktop? ( =sys-apps/calculate-desktop-2.2.21 ) + cl_installgui? ( =app-misc/calculate-install-gui-2.2.21 ) + + cl_server? ( =sys-apps/calculate-server-2.1.14-r6 ) +" +