diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-11-22 13:15:52 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-11-22 13:15:52 -0600 |
commit | 3b70e3c52399effdeb514679275b97d15dac669f (patch) | |
tree | 1ad55c858a493b877547fe85515306d96da267cd | |
parent | 42aa1eb3360c60f6f1266b2945b4eb4f3df8e3cf (diff) | |
download | tde-packaging-3b70e3c52399effdeb514679275b97d15dac669f.tar.gz tde-packaging-3b70e3c52399effdeb514679275b97d15dac669f.zip |
Enable tdm compositor in Debian and Ubuntu default settings packages
6 files changed, 7 insertions, 2 deletions
diff --git a/debian/lenny/tdebase/debian/tdm-trinity.init b/debian/lenny/tdebase/debian/tdm-trinity.init index 5654e186d..e5286ff8d 100644 --- a/debian/lenny/tdebase/debian/tdm-trinity.init +++ b/debian/lenny/tdebase/debian/tdm-trinity.init @@ -73,6 +73,7 @@ gentdmconf --in $TDMCFGDIR 1> /dev/null [ -n "$BACKGROUNDCFG" ] && sed -i "s|^#\?BackgroundCfg=.*|BackgroundCfg=$BACKGROUNDCFG|" $TDMCFG [ -n "$USETHEME" ] && sed -i "s|^#\?UseTheme=.*|UseTheme=$USETHEME|" $TDMCFG [ -n "$THEME" ] && sed -i "s|^#\?Theme=.*|Theme=$THEME|" $TDMCFG +[ -n "$COMPOSITOR" ] && sed -i "s|^#\?Compositor=.*|Compositor=$COMPOSITOR|" $TDMCFG [ -n "$WALLPAPER" ] && sed -i "s|^#\?Wallpaper=.*|Wallpaper=`readlink -f $WALLPAPER`|" $BACKGROUNDCFG diff --git a/debian/squeeze/tdebase/debian/tdm-trinity.init b/debian/squeeze/tdebase/debian/tdm-trinity.init index 5654e186d..e5286ff8d 100644 --- a/debian/squeeze/tdebase/debian/tdm-trinity.init +++ b/debian/squeeze/tdebase/debian/tdm-trinity.init @@ -73,6 +73,7 @@ gentdmconf --in $TDMCFGDIR 1> /dev/null [ -n "$BACKGROUNDCFG" ] && sed -i "s|^#\?BackgroundCfg=.*|BackgroundCfg=$BACKGROUNDCFG|" $TDMCFG [ -n "$USETHEME" ] && sed -i "s|^#\?UseTheme=.*|UseTheme=$USETHEME|" $TDMCFG [ -n "$THEME" ] && sed -i "s|^#\?Theme=.*|Theme=$THEME|" $TDMCFG +[ -n "$COMPOSITOR" ] && sed -i "s|^#\?Compositor=.*|Compositor=$COMPOSITOR|" $TDMCFG [ -n "$WALLPAPER" ] && sed -i "s|^#\?Wallpaper=.*|Wallpaper=`readlink -f $WALLPAPER`|" $BACKGROUNDCFG diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/distrospecific/tdm-theme/tdm.d/10_desktop-base b/ubuntu/maverick/defaultsettings/desktop-base/debian/distrospecific/tdm-theme/tdm.d/10_desktop-base index eadf355ac..280a58042 100644 --- a/ubuntu/maverick/defaultsettings/desktop-base/debian/distrospecific/tdm-theme/tdm.d/10_desktop-base +++ b/ubuntu/maverick/defaultsettings/desktop-base/debian/distrospecific/tdm-theme/tdm.d/10_desktop-base @@ -1,3 +1,5 @@ USETHEME="true" THEME="/usr/share/apps/tdm/themes/moreblue-orbit" WALLPAPER="/usr/share/apps/tdm/themes/moreblue-orbit/background.png" +COMPOSITOR="compton-tde" + diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/distrospecific/tdmdistrc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/distrospecific/tdmdistrc index ab17e1e86..d0fc250a5 100644 --- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/distrospecific/tdmdistrc +++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/distrospecific/tdmdistrc @@ -297,7 +297,7 @@ ClientLogFile=.xsession-errors-%s #GUIStyle=Windows # Compositor binary name, if compositing is desired. "" means no compositing support. # Default is "" -#Compositor= +Compositor=compton-tde # Window manager binary name, if window decorations are desired. "" means no window manager support. # Default is "twin" #WindowManager= diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/tdmdistrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/tdmdistrc index d21f33a1f..53ab306a1 100644 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/tdmdistrc +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/tdmdistrc @@ -297,7 +297,7 @@ ClientLogFile=.xsession-errors-%s #GUIStyle=Windows # Compositor binary name, if compositing is desired. "" means no compositing support. # Default is "" -#Compositor= +Compositor=compton-tde # Window manager binary name, if window decorations are desired. "" means no window manager support. # Default is "twin" #WindowManager= diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.txt b/ubuntu/maverick/tdebase/debian/tdm-trinity.txt index bdae3fc62..2aa4cd688 100644 --- a/ubuntu/maverick/tdebase/debian/tdm-trinity.txt +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.txt @@ -70,6 +70,7 @@ gentdmconf --in $TDMCFGDIR 1> /dev/null [ -n "$BACKGROUNDCFG" ] && sed -i "s|^#\?BackgroundCfg=.*|BackgroundCfg=$BACKGROUNDCFG|" $TDMCFG [ -n "$USETHEME" ] && sed -i "s|^#\?UseTheme=.*|UseTheme=$USETHEME|" $TDMCFG [ -n "$THEME" ] && sed -i "s|^#\?Theme=.*|Theme=$THEME|" $TDMCFG +[ -n "$COMPOSITOR" ] && sed -i "s|^#\?Compositor=.*|Compositor=$COMPOSITOR|" $TDMCFG [ -n "$WALLPAPER" ] && sed -i "s|^#\?Wallpaper=.*|Wallpaper=`readlink -f $WALLPAPER`|" $BACKGROUNDCFG |