diff options
Diffstat (limited to 'ubuntu/raring/defaultsettings/redmond-default-settings')
11 files changed, 110 insertions, 147 deletions
diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings/Makefile b/ubuntu/raring/defaultsettings/redmond-default-settings/Makefile index 77c7d269a..40306f9ae 100644 --- a/ubuntu/raring/defaultsettings/redmond-default-settings/Makefile +++ b/ubuntu/raring/defaultsettings/redmond-default-settings/Makefile @@ -198,106 +198,105 @@ install: install -m644 artwork/ksplash/* "$(KSPLASH_THEME_DIR)"
ln -s /usr/share/wallpapers/kubuntu-wallpaper.png "$(KSPLASH_THEME_DIR)/Background.jpg"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/metabar/themes/kubuntu"
- install -m644 artwork/metabar/* "$(SETTINGS_DIR)/kde-profile/default/share/apps/metabar/themes/kubuntu"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/metabar/themes/kubuntu"
+ install -m644 artwork/metabar/* "$(SETTINGS_DIR)/tde-profile/default/share/apps/metabar/themes/kubuntu"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/amarok/themes/kubuntu"
- install -m644 artwork/amarok/* "$(SETTINGS_DIR)/kde-profile/default/share/apps/amarok/themes/kubuntu"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/amarok/themes/kubuntu"
+ install -m644 artwork/amarok/* "$(SETTINGS_DIR)/tde-profile/default/share/apps/amarok/themes/kubuntu"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/konversation/themes/oxygen"
- install -m644 artwork/konversation/* "$(SETTINGS_DIR)/kde-profile/default/share/apps/konversation/themes/oxygen"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/konversation/themes/oxygen"
+ install -m644 artwork/konversation/* "$(SETTINGS_DIR)/tde-profile/default/share/apps/konversation/themes/oxygen"
mkdir -p "$(DESTDIR)/etc"
- install -m644 kde-profile/kderc "$(DESTDIR)/etc"
- install -m644 kde-profile/kde4rc "$(DESTDIR)/etc"
- install -m644 kde-profile/kde-user-profile "$(DESTDIR)/etc"
+ install -m644 tde-profile/tderc "$(DESTDIR)/etc"
+ install -m644 tde-profile/kde4rc "$(DESTDIR)/etc"
+ install -m644 tde-profile/tde-user-profile "$(DESTDIR)/etc"
mkdir -p "$(DESTDIR)/etc/qt3"
install -m644 qt-rc-files/*rc "$(DESTDIR)/etc/qt3"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/config/"
- install -m644 kde-rc-files/*rc "$(SETTINGS_DIR)/kde-profile/default/share/config/"
- install -m644 kde-rc-files/uiserver "$(SETTINGS_DIR)/kde-profile/default/share/config/"
- install -m644 kde-rc-files/kdeglobals "$(SETTINGS_DIR)/kde-profile/default/share/config/"
- install -m644 kde-rc-files/startupconfig "$(SETTINGS_DIR)/kde-profile/default/share/config/"
- install -m644 kde-rc-files/cryptodefaults "$(SETTINGS_DIR)/kde-profile/default/share/config/"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/config/"
+ install -m644 kde-rc-files/*rc "$(SETTINGS_DIR)/tde-profile/default/share/config/"
+ install -m644 kde-rc-files/uiserver "$(SETTINGS_DIR)/tde-profile/default/share/config/"
+ install -m644 kde-rc-files/kdeglobals "$(SETTINGS_DIR)/tde-profile/default/share/config/"
+ install -m644 kde-rc-files/startupconfig "$(SETTINGS_DIR)/tde-profile/default/share/config/"
+ install -m644 kde-rc-files/cryptodefaults "$(SETTINGS_DIR)/tde-profile/default/share/config/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdedisplay/color-schemes/"
- install -m644 colour-schemes/*rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdedisplay/color-schemes/"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/tdedisplay/color-schemes/"
+ install -m644 colour-schemes/*rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/tdedisplay/color-schemes/"
mkdir -p "$(CURSOR_DIR)/cursors"
install -m644 cursors/index.theme "$(CURSOR_DIR)/"
mkdir -p "$(CURSOR_DIR)cursors/"
install -m644 cursors/contrastlarge/cursors/* "$(CURSOR_DIR)/cursors/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqueror/"
- install -m644 ui-rc-files/konqueror.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqueror/"
-# mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/konversation/"
-# install -m644 ui-rc-files/konversationui.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/konversation/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kopete/"
- install -m644 ui-rc-files/kopetechatwindow.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/kopete/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/gwenview/"
- install -m644 ui-rc-files/gwenviewui.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/gwenview/"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/konqueror/"
+ install -m644 ui-rc-files/konqueror.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/konqueror/"
+# mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/konversation/"
+# install -m644 ui-rc-files/konversationui.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/konversation/"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/kopete/"
+ install -m644 ui-rc-files/kopetechatwindow.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/kopete/"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/gwenview/"
+ install -m644 ui-rc-files/gwenviewui.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/gwenview/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqueror/servicemenus/"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/konqueror/servicemenus/"
mkdir -p "$(DESTDIR)/usr/bin"
- install -m644 konqueror-profile/konq_plugins.xml "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqueror/"
+ install -m644 konqueror-profile/konq_plugins.xml "$(SETTINGS_DIR)/tde-profile/default/share/apps/konqueror/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/16x16/actions/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/22x22/actions/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/32x32/actions/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/48x48/actions/"
- install -m644 artwork/throbber/16x16/kde.png "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/16x16/actions/"
- install -m644 artwork/throbber/22x22/kde.png "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/22x22/actions/"
- install -m644 artwork/throbber/32x32/kde.png "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/32x32/actions/"
- install -m644 artwork/throbber/48x48/kde.png "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/48x48/actions/"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/16x16/actions/"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/22x22/actions/"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/32x32/actions/"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/48x48/actions/"
+ install -m644 artwork/throbber/16x16/kde.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/16x16/actions/"
+ install -m644 artwork/throbber/22x22/kde.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/22x22/actions/"
+ install -m644 artwork/throbber/32x32/kde.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/32x32/actions/"
+ install -m644 artwork/throbber/48x48/kde.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/48x48/actions/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/64x64/actions/"
- install -m644 kaffeine/fileopen64.png "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/64x64/actions/fileopen.png"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/128x128/actions/"
- install -m644 kaffeine/fileopen128.png "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/128x128/actions/fileopen.png"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/scalable/actions/"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/64x64/actions/"
+ install -m644 kaffeine/fileopen64.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/64x64/actions/fileopen.png"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/128x128/actions/"
+ install -m644 kaffeine/fileopen128.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/128x128/actions/fileopen.png"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/scalable/actions/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kaffeine/"
- install -m644 kaffeine/wizard_stamp_v0.7.1 "$(SETTINGS_DIR)/kde-profile/default/share/apps/kaffeine"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/kaffeine/"
+ install -m644 kaffeine/wizard_stamp_v0.7.1 "$(SETTINGS_DIR)/tde-profile/default/share/apps/kaffeine"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kpdfpart/"
- install -m644 kpart-rc-files/part.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/kpdfpart/"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/kpdfpart/"
+ install -m644 kpart-rc-files/part.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/kpdfpart/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/gvimagepart/"
- install -m644 kpart-rc-files/gvimagepart.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/gvimagepart/"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/gvimagepart/"
+ install -m644 kpart-rc-files/gvimagepart.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/gvimagepart/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/ark/"
- install -m644 kpart-rc-files/ark_part.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/ark/"
- install -m644 kpart-rc-files/ark_part_readonly.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/ark/"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/ark/"
+ install -m644 kpart-rc-files/ark_part.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/ark/"
+ install -m644 kpart-rc-files/ark_part_readonly.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/ark/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/ksvg/"
- install -m644 kpart-rc-files/ksvgplugin.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/ksvg/"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/ksvg/"
+ install -m644 kpart-rc-files/ksvgplugin.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/ksvg/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdehtml/"
- install -m644 kpart-rc-files/tdehtml_browser.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdehtml/"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/tdehtml/"
+ install -m644 kpart-rc-files/tdehtml_browser.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/tdehtml/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
- install -m644 mimelnk/x-tar.desktop "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
- install -m644 mimelnk/x-tarz.desktop "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
- install -m644 mimelnk/x-tbz.desktop "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
- install -m644 mimelnk/x-tgz.desktop "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
- install -m644 mimelnk/x-zip.desktop "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/mimelnk/application/"
+ install -m644 mimelnk/x-tar.desktop "$(SETTINGS_DIR)/tde-profile/default/share/mimelnk/application/"
+ install -m644 mimelnk/x-tarz.desktop "$(SETTINGS_DIR)/tde-profile/default/share/mimelnk/application/"
+ install -m644 mimelnk/x-tbz.desktop "$(SETTINGS_DIR)/tde-profile/default/share/mimelnk/application/"
+ install -m644 mimelnk/x-tgz.desktop "$(SETTINGS_DIR)/tde-profile/default/share/mimelnk/application/"
+ install -m644 mimelnk/x-zip.desktop "$(SETTINGS_DIR)/tde-profile/default/share/mimelnk/application/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqiconview/kpartplugins/"
- install -m644 kpart-plugins/dirfilterplugin.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqiconview/kpartplugins/"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/konqiconview/kpartplugins/"
+ install -m644 kpart-plugins/dirfilterplugin.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/konqiconview/kpartplugins/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdewallet/"
- install -m644 tdewallet-default-wallet/kdewallet.kwl "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdewallet/"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/tdewallet/"
+ install -m644 tdewallet-default-wallet/kdewallet.kwl "$(SETTINGS_DIR)/tde-profile/default/share/apps/tdewallet/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwin/"
- install -m644 artwork/window-decoration-gradient.png "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwin/"
- install -m644 artwork/window-decoration-gradient-inactive.png "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwin/"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/kwin/"
+ install -m644 artwork/window-decoration-gradient.png "$(SETTINGS_DIR)/tde-profile/default/share/apps/kwin/"
+ install -m644 artwork/window-decoration-gradient-inactive.png "$(SETTINGS_DIR)/tde-profile/default/share/apps/kwin/"
install -m644 gtk-qt-engine-rc-files/gtkrc-2.0-kde4 "$(SETTINGS_DIR)/.gtkrc-2.0-kde4"
install -m644 gtk-qt-engine-rc-files/gtk_qt_engine_rc "$(SETTINGS_DIR)/.gtk_qt_engine_rc"
install -m644 gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh "$(SETTINGS_DIR)/gtk-qt-engine.rc.sh"
-# install -m644 hal/hal-policy-ntfs-config-write-policy.fdi "$(SETTINGS_DIR)/hal-policy-ntfs-config-write-policy.fdi"
mkdir -p "$(DESTDIR)/etc/skel"
install -m644 gtk-qt-engine-rc-files/gtkrc-2.0-kde4 "$(DESTDIR)/etc/skel/.gtkrc-2.0-kde4"
@@ -310,16 +309,16 @@ install: mkdir -p "$(KDESKEL_DIR)/share/apps/kdesktop"
install -m644 default-icon-positions/IconPositions "$(KDESKEL_DIR)/share/apps/kdesktop/IconPositions"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/lesser-visual-impairment/share/config/"
- cp -r accessibility/lesser-visual-impairment/* "$(SETTINGS_DIR)/kde-profile/lesser-visual-impairment/share/config/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/moderate-visual-impairment/share/config/"
- cp -r accessibility/moderate-visual-impairment/* "$(SETTINGS_DIR)/kde-profile/moderate-visual-impairment/share/config/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/minor-motor-difficulties/share/config/"
- cp -r accessibility/minor-motor-difficulties/* "$(SETTINGS_DIR)/kde-profile/minor-motor-difficulties/share/config/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/motor-difficulties-pointing-devices/share/config/"
- cp -r accessibility/motor-difficulties-pointing-devices/* "$(SETTINGS_DIR)/kde-profile/motor-difficulties-pointing-devices/share/config/"
- mkdir -p "$(SETTINGS_DIR)/kde-profile/motor-difficulties-pointing-devices/share/Autostart/"
- ln -s /usr/bin/kmousetool "$(SETTINGS_DIR)/kde-profile/motor-difficulties-pointing-devices/share/Autostart/kmousetool"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/lesser-visual-impairment/share/config/"
+ cp -r accessibility/lesser-visual-impairment/* "$(SETTINGS_DIR)/tde-profile/lesser-visual-impairment/share/config/"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/moderate-visual-impairment/share/config/"
+ cp -r accessibility/moderate-visual-impairment/* "$(SETTINGS_DIR)/tde-profile/moderate-visual-impairment/share/config/"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/minor-motor-difficulties/share/config/"
+ cp -r accessibility/minor-motor-difficulties/* "$(SETTINGS_DIR)/tde-profile/minor-motor-difficulties/share/config/"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/motor-difficulties-pointing-devices/share/config/"
+ cp -r accessibility/motor-difficulties-pointing-devices/* "$(SETTINGS_DIR)/tde-profile/motor-difficulties-pointing-devices/share/config/"
+ mkdir -p "$(SETTINGS_DIR)/tde-profile/motor-difficulties-pointing-devices/share/Autostart/"
+ ln -s /usr/bin/kmousetool "$(SETTINGS_DIR)/tde-profile/motor-difficulties-pointing-devices/share/Autostart/kmousetool"
mkdir -p "$(DESTDIR)/etc/redmond-default-settings"
install -m644 kde-hidden/hidden-media "$(DESTDIR)/etc/redmond-default-settings/"
diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings/debian/redmond-default-settings-trinity.postinst b/ubuntu/raring/defaultsettings/redmond-default-settings/debian/redmond-default-settings-trinity.postinst index eb31db57b..23a675af0 100644 --- a/ubuntu/raring/defaultsettings/redmond-default-settings/debian/redmond-default-settings-trinity.postinst +++ b/ubuntu/raring/defaultsettings/redmond-default-settings/debian/redmond-default-settings-trinity.postinst @@ -14,7 +14,7 @@ case "$1" in fi # Clean this file, as it seems to be removal resistant... - rm -rf /etc/default/kdm-trinity.d/20_kubuntu_default_settings + rm -rf /etc/default/tdm-trinity.d/20_kubuntu_default_settings # create links for .hidden files, don't bail out if s.th. goes wrong. if [ -d /media ]; then diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings/hal/20-ntfs-config-write-policy.fdi b/ubuntu/raring/defaultsettings/redmond-default-settings/hal/20-ntfs-config-write-policy.fdi deleted file mode 100644 index 2dead0109..000000000 --- a/ubuntu/raring/defaultsettings/redmond-default-settings/hal/20-ntfs-config-write-policy.fdi +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> - -<deviceinfo version="0.2"> - -<!-- file created by ntfs-config --> -<!-- mount ntfs volume with the ntfs-3g driver to enable write support --> - - <device> - <match key="volume.fstype" string="ntfs"> - <match key="@block.storage_device:storage.hotpluggable" bool="true"> - <merge key="volume.fstype" type="string">ntfs-3g</merge> - <merge key="volume.policy.mount_filesystem" type="string">ntfs-3g</merge> - <append key="volume.mount.valid_options" type="strlist">locale=</append> - </match> - </match> - </device> - -</deviceinfo> diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings/hal/hal-policy-ntfs-config-write-policy.fdi b/ubuntu/raring/defaultsettings/redmond-default-settings/hal/hal-policy-ntfs-config-write-policy.fdi deleted file mode 100644 index 2dead0109..000000000 --- a/ubuntu/raring/defaultsettings/redmond-default-settings/hal/hal-policy-ntfs-config-write-policy.fdi +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> - -<deviceinfo version="0.2"> - -<!-- file created by ntfs-config --> -<!-- mount ntfs volume with the ntfs-3g driver to enable write support --> - - <device> - <match key="volume.fstype" string="ntfs"> - <match key="@block.storage_device:storage.hotpluggable" bool="true"> - <merge key="volume.fstype" type="string">ntfs-3g</merge> - <merge key="volume.policy.mount_filesystem" type="string">ntfs-3g</merge> - <append key="volume.mount.valid_options" type="strlist">locale=</append> - </match> - </match> - </device> - -</deviceinfo> diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings/kde-rc-files/kcmnspluginrc b/ubuntu/raring/defaultsettings/redmond-default-settings/kde-rc-files/kcmnspluginrc index 54d5dc921..dd67afa35 100644 --- a/ubuntu/raring/defaultsettings/redmond-default-settings/kde-rc-files/kcmnspluginrc +++ b/ubuntu/raring/defaultsettings/redmond-default-settings/kde-rc-files/kcmnspluginrc @@ -1,4 +1,4 @@ [Misc] startkdeScan=true useArtsdsp=true -PluginsListFile=/usr/share/redmond-default-settings/kde-profile/default/share/apps/konqueror/konq_plugins.xml
\ No newline at end of file +PluginsListFile=/usr/share/redmond-default-settings/tde-profile/default/share/apps/konqueror/konq_plugins.xml
\ No newline at end of file diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings/kde-rc-files/twincrystalrc b/ubuntu/raring/defaultsettings/redmond-default-settings/kde-rc-files/twincrystalrc index 3368a104a..e86bdc2e0 100644 --- a/ubuntu/raring/defaultsettings/redmond-default-settings/kde-rc-files/twincrystalrc +++ b/ubuntu/raring/defaultsettings/redmond-default-settings/kde-rc-files/twincrystalrc @@ -32,8 +32,8 @@ LogoAlignment=1 LogoDistance=0 LogoFile= LogoStretch=0 -OverlayFileActive=/usr/share/redmond-default-settings/kde-profile/default/share/apps/kwin/window-decoration-gradient.png -OverlayFileInactive=/usr/share/redmond-default-settings/kde-profile/default/share/apps/kwin/window-decoration-gradient-inactive.png +OverlayFileActive=/usr/share/redmond-default-settings/tde-profile/default/share/apps/kwin/window-decoration-gradient.png +OverlayFileInactive=/usr/share/redmond-default-settings/tde-profile/default/share/apps/kwin/window-decoration-gradient-inactive.png OverlayModeActive=2 OverlayModeInactive=2 RepaintMode=3 diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kcmnspluginrc b/ubuntu/raring/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kcmnspluginrc index 897bed37a..a6f9f10fd 100644 --- a/ubuntu/raring/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kcmnspluginrc +++ b/ubuntu/raring/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kcmnspluginrc @@ -1,3 +1,3 @@ [Misc] startkdeScan=true -PluginsListFile=/usr/share/redmond-default-settings/kde-profile/default/share/apps/konqueror/konq_plugins.xml +PluginsListFile=/usr/share/redmond-default-settings/tde-profile/default/share/apps/konqueror/konq_plugins.xml diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings/kde-profile/kde4rc b/ubuntu/raring/defaultsettings/redmond-default-settings/tde-profile/kde4rc index 454fa83f3..454fa83f3 100755 --- a/ubuntu/raring/defaultsettings/redmond-default-settings/kde-profile/kde4rc +++ b/ubuntu/raring/defaultsettings/redmond-default-settings/tde-profile/kde4rc diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings/kde-profile/kde-user-profile b/ubuntu/raring/defaultsettings/redmond-default-settings/tde-profile/tde-user-profile index 647a34e46..647a34e46 100755 --- a/ubuntu/raring/defaultsettings/redmond-default-settings/kde-profile/kde-user-profile +++ b/ubuntu/raring/defaultsettings/redmond-default-settings/tde-profile/tde-user-profile diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings/kde-profile/kderc b/ubuntu/raring/defaultsettings/redmond-default-settings/tde-profile/tderc index df5ec9dc6..f6a7decc9 100755 --- a/ubuntu/raring/defaultsettings/redmond-default-settings/kde-profile/kderc +++ b/ubuntu/raring/defaultsettings/redmond-default-settings/tde-profile/tderc @@ -2,4 +2,4 @@ userProfileMapFile=/etc/kde-user-profile [Directories-default] -prefixes=/usr/share/redmond-default-settings-trinity/kde-profile/default/ +prefixes=/usr/share/redmond-default-settings-trinity/tde-profile/default/ diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings/tdmdistrc b/ubuntu/raring/defaultsettings/redmond-default-settings/tdmdistrc index 72678a3e7..dc0a36c78 100644 --- a/ubuntu/raring/defaultsettings/redmond-default-settings/tdmdistrc +++ b/ubuntu/raring/defaultsettings/redmond-default-settings/tdmdistrc @@ -1,12 +1,12 @@ -# KDM master configuration file +# TDM master configuration file # # Please note: Settings in this file are sometimes ignored (overridden). -# The default KDM startup script /etc/init.d/kdm looks in /etc/default/kdm.d +# The default TDM startup script /etc/init.d/tdm looks in /etc/default/tdm.d # for theme-related settings which, if found, take precedence. The possibly # overridden settings are: UseBackground, BackgroundCfg, UseTheme, Theme. -# See /usr/share/doc/kdm/README.Debian for details +# See /usr/share/doc/tdm/README.Debian for details # -# Definition: the greeter is the login dialog, i.e., the part of KDM +# Definition: the greeter is the login dialog, i.e., the part of TDM # which the user sees. # # You can configure every X-display individually. @@ -42,7 +42,7 @@ # # Every comment applies to the following section or key. Note that all # comments will be lost if you change this file with the kcontrol frontend. -# The defaults refer to KDM's built-in values, not anything set in this file. +# The defaults refer to TDM's built-in values, not anything set in this file. # # Special characters need to be backslash-escaped (leading and trailing # spaces (\s), tab (\t), linefeed (\n), carriage return (\r) and the @@ -72,26 +72,26 @@ ServerVTs=-7 # TTYs (without /dev/) to monitor for activity while in console mode. # Default is "" ConsoleTTYs=tty1,tty2,tty3,tty4,tty5,tty6 -# Where KDM should store its PID (do not store if empty). +# Where TDM should store its PID (do not store if empty). # Default is "" -PidFile=/var/run/kdm.pid -# Whether KDM should lock the PID file to prevent having multiple KDM +PidFile=/var/run/tdm.pid +# Whether TDM should lock the PID file to prevent having multiple TDM # instances running at once. Do not change unless you are brave. # Default is true #LockPidFile=false # Where to store authorization files. # Default is "/var/run/xauth" #AuthDir=/tmp -# Whether KDM should automatically re-read configuration files, if it +# Whether TDM should automatically re-read configuration files, if it # finds them having changed. # Default is true #AutoRescan=false -# Additional environment variables KDM should pass on to all programs it runs. +# Additional environment variables TDM should pass on to all programs it runs. # LD_LIBRARY_PATH and XCURSOR_THEME are good candidates; # otherwise, it should not be necessary very often. # Default is "" #ExportList=LD_LIBRARY_PATH,ANOTHER_IMPORTANT_VAR -# A character device KDM should read entropy from. +# A character device TDM should read entropy from. # Empty means use the system's preferred entropy device. # Default is "" #RandomDevice=/dev/altrandom @@ -103,25 +103,25 @@ PidFile=/var/run/kdm.pid # can be either a name or a numerical ID. # Default is 0 #FifoGroup=xdmctl -# The directory in which KDM should store persistent working data. -# Default is "/var/lib/kdm" +# The directory in which TDM should store persistent working data. +# Default is "/var/lib/tdm" #DataDir= -# The directory in which KDM should store users' .dmrc files. This is only +# The directory in which TDM should store users' .dmrc files. This is only # needed if the home directories are not readable before actually logging in # (like with AFS). # Default is "" #DmrcDir=/nfs-shared/var/dmrcs [Xdmcp] -# Whether KDM should listen to incoming XDMCP requests. +# Whether TDM should listen to incoming XDMCP requests. # Default is true Enable=false -# The UDP port on which KDM should listen for XDMCP requests. Do not change. +# The UDP port on which TDM should listen for XDMCP requests. Do not change. # Default is 177 #Port=177 # File with the private keys of X-terminals. Required for XDM authentication. # Default is "" -#KeyFile=/etc/trinity/tdm/kdmkeys +#KeyFile=/etc/trinity/tdm/tdmkeys # XDMCP access control file in the usual XDM-Xaccess format. # Default is "/etc/trinity/tdm/Xaccess" #Xaccess= @@ -157,7 +157,7 @@ Willing=/etc/trinity/tdm/Xwilling # system via the global command FiFo. # Default is true #AllowFifoNow=false -# The boot manager KDM should use for offering boot options in the +# The boot manager TDM should use for offering boot options in the # shutdown dialog. # "None" - no boot manager # "Grub" - Grub boot manager @@ -165,7 +165,7 @@ Willing=/etc/trinity/tdm/Xwilling # Default is None #BootManager=Grub -# Rough estimations about how many seconds KDM will spend at most on +# Rough estimations about how many seconds TDM will spend at most on # - opening a connection to the X-server (OpenTime) if the attempt # - times out: OpenTimeout # - is refused: OpenRepeat * OpenDelay @@ -279,13 +279,13 @@ AllowShutdown=Root # Default is Never #ScheduledSd=Optional # The directories containing session type definitions in .desktop format. -# Default is "/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/kdm/sessions" -#SessionsDirs=/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/kdm/sessions +# Default is "/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/tdm/sessions" +#SessionsDirs=/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/tdm/sessions # The file (relative to $HOME) to redirect the session output to. This is # a printf format string; one %s will be replaced with the display name. # Default is ".xsession-errors" ClientLogFile=.xsession-errors-%s -# Whether KDM's built-in utmp/wtmp/lastlog registration should be used. +# Whether TDM's built-in utmp/wtmp/lastlog registration should be used. # Default is false #UseSessReg=true @@ -319,7 +319,7 @@ ClientLogFile=.xsession-errors-%s LogoArea=Logo # The image to show when LogoArea=Logo. # Default is "" -LogoPixmap=/opt/trinity/share/apps/kdm/pics/kdelogo.png +LogoPixmap=/opt/trinity/share/apps/tdm/pics/kdelogo.png # The relative coordinates (X,Y in percent) of the center of the greeter. # Default is "50,50" #GreeterPos=30,40 @@ -397,7 +397,7 @@ MaxShowUID=29999 # Default is AdminOnly #FaceSource=PreferUser # The directory containing the user images if FaceSource is not UserOnly. -# Default is "/opt/trinity/share/apps/kdm/faces" +# Default is "/opt/trinity/share/apps/tdm/faces" #FaceDir=/usr/share/faces # Specify, if/which user should be preselected for log in. # "None" - do not preselect any user @@ -415,7 +415,7 @@ MaxShowUID=29999 # "NoEcho" - nothing is shown at all, the cursor does not move # Default is OneStar #EchoMode=NoEcho -# If true, krootimage will be automatically started by KDM; otherwise, the +# If true, krootimage will be automatically started by TDM; otherwise, the # Setup script should be used to setup the background. # Default is true #UseBackground=false @@ -464,8 +464,8 @@ Preloader=/opt/trinity/bin/preloadkde #UseTheme=true # The theme to use for the greeter. Can point to either a directory or an XML # file. -# Default is "/opt/trinity/share/apps/kdm/themes/o2_enterprise" -Theme=/opt/trinity/share/apps/kdm/themes/kubuntu-trinity +# Default is "/opt/trinity/share/apps/tdm/themes/o2_enterprise" +Theme=/opt/trinity/share/apps/tdm/themes/kubuntu-trinity # Core config for local displays [X-:*-Core] @@ -563,7 +563,7 @@ AllowClose=true #AutoLoginUser=fred # The password for the user to log in automatically. This is NOT required # unless the user is logged into a NIS or Kerberos domain. If you use this -# option, you should "chmod 600 kdmrc" for obvious reasons. +# option, you should "chmod 600 tdmrc" for obvious reasons. # Default is "" #AutoLoginPass=secret! # Immediately lock the automatically started session. This works only with |