Merge branch 'master' of http://asamoukin@git.calculate.ru/dev/calculate2/calculate-client

15 years ago · b1d93b477e
parent cc2d37b489 8d36ab9a19
commit b1d93b477e
204 changed files with 16 additions and 30 deletions
--- a/profile.install/client/etc/slim.conf
+++ b/profile.install/client/etc/slim.conf
--- a/profile.install/client/usr/share/config/kdm/kdmrc
+++ b/profile.install/client/usr/share/config/kdm/kdmrc
--- a/profile.install/domain/etc/ldap.conf
+++ b/profile.install/domain/etc/ldap.conf
--- a/profile.install/domain/etc/nsswitch.conf
+++ b/profile.install/domain/etc/nsswitch.conf
--- a/profile.install/domain/etc/pam.d/system-auth
+++ b/profile.install/domain/etc/pam.d/system-auth
--- a/profile.install/domain/etc/ssh/ssh_config
+++ b/profile.install/domain/etc/ssh/ssh_config
--- a/profile.install/domain/usr/share/config/kdm/kdmrc
+++ b/profile.install/domain/usr/share/config/kdm/kdmrc
--- a/profile/10kde4.2/.calculate_directory
+++ b/profile/10kde4.2/.calculate_directory
@ -0,0 +1,2 @@
+# Calculate os_linux_shortname==CLD&cl_pass_step==first&pkg(kdelibs)>=4.2.1&pkg(kdelibs)<4.3
+
--- a/profile/CLD/10kde4.2/.kde4/share/apps/kabc/std.vcf
+++ b/profile/CLD/10kde4.2/.kde4/share/apps/kabc/std.vcf
--- a/profile/CLD/10kde4.2/.kde4/share/apps/kabc/std.vcf_1
+++ b/profile/CLD/10kde4.2/.kde4/share/apps/kabc/std.vcf_1
--- a/profile/CLD/10kde4.2/.kde4/share/apps/kfileplaces/bookmarks.xml
+++ b/profile/CLD/10kde4.2/.kde4/share/apps/kfileplaces/bookmarks.xml
--- a/profile/CLD/10kde4.2/.kde4/share/apps/kfileplaces/bookmarks.xml.tbcache
+++ b/profile/CLD/10kde4.2/.kde4/share/apps/kfileplaces/bookmarks.xml.tbcache
--- a/profile/CLD/10kde4.2/.kde4/share/apps/nsplugins/cache
+++ b/profile/CLD/10kde4.2/.kde4/share/apps/nsplugins/cache
--- a/profile/CLD/10kde4.2/.kde4/share/apps/nsplugins/pluginsinfo
+++ b/profile/CLD/10kde4.2/.kde4/share/apps/nsplugins/pluginsinfo
--- a/profile/CLD/10kde4.2/.kde4/share/config/emailidentities
+++ b/profile/CLD/10kde4.2/.kde4/share/config/emailidentities
--- a/profile/CLD/10kde4.2/.kde4/share/config/filetypesrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/filetypesrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/gtkrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/gtkrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/gtkrc-2.0
+++ b/profile/CLD/10kde4.2/.kde4/share/config/gtkrc-2.0
--- a/profile/CLD/10kde4.2/.kde4/share/config/kalarmrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/kalarmrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/katerc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/katerc
--- a/profile/CLD/10kde4.2/.kde4/share/config/kcalcrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/kcalcrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/kcharselectrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/kcharselectrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/kcmaudiocdrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/kcmaudiocdrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/kcmcddbrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/kcmcddbrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/kcmdisplayrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/kcmdisplayrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/kcminputrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/kcminputrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/kcmnspluginrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/kcmnspluginrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/kconf_updaterc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/kconf_updaterc
--- a/profile/CLD/10kde4.2/.kde4/share/config/kcookiejarrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/kcookiejarrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/kdedrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/kdedrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/kdeglobals
+++ b/profile/CLD/10kde4.2/.kde4/share/config/kdeglobals
--- a/profile/CLD/10kde4.2/.kde4/share/config/kdesvnpartrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/kdesvnpartrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/kfmclientrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/kfmclientrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/kickoffrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/kickoffrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/kio_httprc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/kio_httprc
--- a/profile/CLD/10kde4.2/.kde4/share/config/kioslaverc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/kioslaverc
--- a/profile/CLD/10kde4.2/.kde4/share/config/kmail.eventsrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/kmail.eventsrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/kmailrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/kmailrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/knoderc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/knoderc
--- a/profile/CLD/10kde4.2/.kde4/share/config/konqsidebartng.rc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/konqsidebartng.rc
--- a/profile/CLD/10kde4.2/.kde4/share/config/konquerorrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/konquerorrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/kopeterc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/kopeterc
--- a/profile/CLD/10kde4.2/.kde4/share/config/korgacrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/korgacrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/korganizerrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/korganizerrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/kpgprc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/kpgprc
--- a/profile/CLD/10kde4.2/.kde4/share/config/kres-migratorrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/kres-migratorrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/kresources/calendar/stdrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/kresources/calendar/stdrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/kresources/contact/stdrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/kresources/contact/stdrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/kresources/notes/stdrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/kresources/notes/stdrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/krunnerrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/krunnerrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/ksmserverrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/ksmserverrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/kuriikwsfilterrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/kuriikwsfilterrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/kwin.eventsrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/kwin.eventsrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/kwinrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/kwinrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/libkcal_htmlexportrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/libkcal_htmlexportrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/libkleopatrarc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/libkleopatrarc
--- a/profile/CLD/10kde4.2/.kde4/share/config/mailtransports
+++ b/profile/CLD/10kde4.2/.kde4/share/config/mailtransports
--- a/profile/CLD/10kde4.2/.kde4/share/config/nepomukserverrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/nepomukserverrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/plasma-appletsrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/plasma-appletsrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/plasmarc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/plasmarc
--- a/profile/CLD/10kde4.2/.kde4/share/config/powerdevilprofilesrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/powerdevilprofilesrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/powerdevilrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/powerdevilrc
--- a/profile/CLD/10kde4.2/.kde4/share/config/session/kwin_1013b155dcdd000124628380500000179650000_1246283898_384037
+++ b/profile/CLD/10kde4.2/.kde4/share/config/session/kwin_1013b155dcdd000124628380500000179650000_1246283898_384037
--- a/profile/CLD/10kde4.2/.kde4/share/config/startupconfig
+++ b/profile/CLD/10kde4.2/.kde4/share/config/startupconfig
--- a/profile/CLD/10kde4.2/.kde4/share/config/startupconfigfiles
+++ b/profile/CLD/10kde4.2/.kde4/share/config/startupconfigfiles
--- a/profile/CLD/10kde4.2/.kde4/share/config/startupconfigkeys
+++ b/profile/CLD/10kde4.2/.kde4/share/config/startupconfigkeys
--- a/profile/CLD/10kde4.2/.kde4/share/config/taskbargroupblacklistrc
+++ b/profile/CLD/10kde4.2/.kde4/share/config/taskbargroupblacklistrc
--- a/profile/CLD/10kde4.2/.kde4/share/kde4/services/nsplugin.desktop
+++ b/profile/CLD/10kde4.2/.kde4/share/kde4/services/nsplugin.desktop
--- a/profile/CLD/20default/.bashrc
+++ b/profile/CLD/20default/.bashrc
--- a/profile/20CLD/.calculate_directory
+++ b/profile/20CLD/.calculate_directory
@ -0,0 +1 @@
+# Calculate os_linux_shortname==CLD&cl_pass_step==first
--- a/profile/CLD/20default/.config/autostart/kopete.desktop
+++ b/profile/CLD/20default/.config/autostart/kopete.desktop
--- a/profile/CLD/20default/.config/gcstar/GCstar.conf
+++ b/profile/CLD/20default/.config/gcstar/GCstar.conf
--- a/profile/CLD/20default/.config/qtcurve.gtk-icons
+++ b/profile/CLD/20default/.config/qtcurve.gtk-icons
--- a/profile/CLD/20default/.config/smplayer/smplayer.ini
+++ b/profile/CLD/20default/.config/smplayer/smplayer.ini
--- a/profile/CLD/20default/.directory
+++ b/profile/CLD/20default/.directory
--- a/profile/CLD/20default/.gtkrc-2.0-kde4
+++ b/profile/CLD/20default/.gtkrc-2.0-kde4
--- a/profile/CLD/20default/.kde4/env/gtk-qt-engine.rc.sh
+++ b/profile/CLD/20default/.kde4/env/gtk-qt-engine.rc.sh
--- a/profile/CLD/20default/.kde4/share/apps/konqueror/profiles/webbrowsing
+++ b/profile/CLD/20default/.kde4/share/apps/konqueror/profiles/webbrowsing
--- a/profile/CLD/20default/.kde4/share/apps/konsole/Shell.profile
+++ b/profile/CLD/20default/.kde4/share/apps/konsole/Shell.profile
--- a/profile/CLD/20default/.kde4/share/apps/konsole/default.keytab
+++ b/profile/CLD/20default/.kde4/share/apps/konsole/default.keytab
--- a/profile/CLD/20default/.kde4/share/apps/kopete/kopetechatwindow.rc
+++ b/profile/CLD/20default/.kde4/share/apps/kopete/kopetechatwindow.rc
--- a/profile/CLD/20default/.kde4/share/apps/kopete/kopeteemailwindow.rc
+++ b/profile/CLD/20default/.kde4/share/apps/kopete/kopeteemailwindow.rc
--- a/profile/CLD/20default/.kde4/share/apps/kwallet/kdewallet.kwl
+++ b/profile/CLD/20default/.kde4/share/apps/kwallet/kdewallet.kwl
--- a/profile/CLD/20default/.kde4/share/config/amarokrc
+++ b/profile/CLD/20default/.kde4/share/config/amarokrc
--- a/profile/CLD/20default/.kde4/share/config/colors/Recent_Colors
+++ b/profile/CLD/20default/.kde4/share/config/colors/Recent_Colors
--- a/profile/CLD/20default/.kde4/share/config/emaildefaults
+++ b/profile/CLD/20default/.kde4/share/config/emaildefaults
--- a/profile/CLD/20default/.kde4/share/config/emailidentities
+++ b/profile/CLD/20default/.kde4/share/config/emailidentities
--- a/profile/CLD/20default/.kde4/share/config/gtkrc
+++ b/profile/CLD/20default/.kde4/share/config/gtkrc
--- a/profile/CLD/20default/.kde4/share/config/gtkrc-2.0
+++ b/profile/CLD/20default/.kde4/share/config/gtkrc-2.0
--- a/profile/CLD/20default/.kde4/share/config/katerc
+++ b/profile/CLD/20default/.kde4/share/config/katerc
--- a/profile/CLD/20default/.kde4/share/config/kclock.kssrc
+++ b/profile/CLD/20default/.kde4/share/config/kclock.kssrc
--- a/profile/CLD/20default/.kde4/share/config/kcmdisplayrc
+++ b/profile/CLD/20default/.kde4/share/config/kcmdisplayrc
--- a/profile/CLD/20default/.kde4/share/config/kcminputrc
+++ b/profile/CLD/20default/.kde4/share/config/kcminputrc
--- a/profile/CLD/20default/.kde4/share/config/kcookiejarrc
+++ b/profile/CLD/20default/.kde4/share/config/kcookiejarrc
--- a/profile/CLD/20default/.kde4/share/config/kde.notifyrc
+++ b/profile/CLD/20default/.kde4/share/config/kde.notifyrc
--- a/profile/CLD/20default/.kde4/share/config/kdeglobals
+++ b/profile/CLD/20default/.kde4/share/config/kdeglobals
--- a/profile/CLD/20default/.kde4/share/config/kglobalshortcutsrc
+++ b/profile/CLD/20default/.kde4/share/config/kglobalshortcutsrc
--- a/profile/CLD/20default/.kde4/share/config/kio_httprc
+++ b/profile/CLD/20default/.kde4/share/config/kio_httprc
--- a/profile/CLD/20default/.kde4/share/config/kmailrc
+++ b/profile/CLD/20default/.kde4/share/config/kmailrc
--- a/profile/CLD/20default/.kde4/share/config/konquerorrc
+++ b/profile/CLD/20default/.kde4/share/config/konquerorrc
--- a/Show More
+++ b/Show More
				`@ -0,0 +1,2 @@`
				`# Calculate os_linux_shortname==CLD&cl_pass_step==first&pkg(kdelibs)>=4.2.1&pkg(kdelibs)<4.3`
				`@ -0,0 +1 @@`
				`# Calculate os_linux_shortname==CLD&cl_pass_step==first`