diff options
Diffstat (limited to 'ubuntu/maverick/tdebase/debian')
4 files changed, 13 insertions, 13 deletions
diff --git a/ubuntu/maverick/tdebase/debian/changelog b/ubuntu/maverick/tdebase/debian/changelog index f19a0e4e8..f4c18cd62 100644 --- a/ubuntu/maverick/tdebase/debian/changelog +++ b/ubuntu/maverick/tdebase/debian/changelog @@ -196,7 +196,7 @@ tdebase-trinity (4:3.5.10-0ubuntu3~intrepid19) intrepid; urgency=low tdebase-trinity (4:3.5.10-0ubuntu3~intrepid18) intrepid; urgency=low - * Added XDG_DATA_DIRS and KDEDIRS to starttde, as suggested by zekica on the Debian forums + * Added XDG_DATA_DIRS and TDEDIRS to starttde, as suggested by zekica on the Debian forums -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 07 Mar 2009 13:18:00 -0600 @@ -758,8 +758,8 @@ tdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low tdebase (4:3.5.7-1ubuntu23) gutsy; urgency=low * Fixed kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff as $kdehome=$HOME/.kde so we should use - $kdehome instead of $HOME/$kdehome + kubuntu_53_kwallet_config.diff as $tdehome=$HOME/.kde so we should use + $tdehome instead of $HOME/$tdehome -- Anthony Mercatante <tonio@ubuntu.com> Wed, 19 Sep 2007 12:22:46 +0200 @@ -780,7 +780,7 @@ tdebase (4:3.5.7-1ubuntu21) gutsy; urgency=low tdebase (4:3.5.7-1ubuntu20) gutsy; urgency=low - * Changed (again) $KDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and + * Changed (again) $TDEHOME to $tdehome in kubuntu_52_gtk_qt_engine_config.diff and kubuntu_53_kwallet_config.diff . (LP: #136560) -- Jonathan Riddell <jriddell@ubuntu.com> Sat, 15 Sep 2007 23:12:26 +0100 @@ -799,7 +799,7 @@ tdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low [ Ryan Kavanagh ] * Dropping kubuntu_9902_nspluginviewer_hangs_cpu.diff and the libgtk build-dep as they are no longer needed - * Changed $KDEHOME to $kdehome in kubuntu_52_gtk_qt_engine_config.diff and + * Changed $TDEHOME to $tdehome in kubuntu_52_gtk_qt_engine_config.diff and kubuntu_53_kwallet_config.diff . (LP: #136560) -- Ryan Kavanagh <ryanakca@kubuntu.org> Mon, 03 Sep 2007 10:26:36 -0400 @@ -807,7 +807,7 @@ tdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low tdebase (4:3.5.7-1ubuntu17) gutsy; urgency=low * Edit kubuntu_52_gtk_qt_engine_config.diff and - kubuntu_53_kwallet_config.diff to use $KDEHOME instead of .kde + kubuntu_53_kwallet_config.diff to use $TDEHOME instead of .kde * Remove kubuntu_77_kiosystem.diff, home:/ better than /home now * Edit kubuntu_27_aboutscreen_searchbar.diff to work with strigi * Add kubuntu_9903_api_docs_move.diff for new API website diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.conf b/ubuntu/maverick/tdebase/debian/kdm-trinity.conf index 554e5a38e..95c0fcd67 100755 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.conf +++ b/ubuntu/maverick/tdebase/debian/kdm-trinity.conf @@ -38,7 +38,7 @@ script export LANG LANGUAGE fi - KDEDIRS=/opt/trinity/ + TDEDIRS=/opt/trinity/ PATH=/opt/trinity/bin:/bin:/usr/bin:/sbin:/usr/sbin initctl emit starting-dm DM=kdm-trinity diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.txt b/ubuntu/maverick/tdebase/debian/kdm-trinity.txt index effad2fd6..a1940a4d8 100644 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.txt +++ b/ubuntu/maverick/tdebase/debian/kdm-trinity.txt @@ -22,7 +22,7 @@ set -e HEED_DEFAULT_DISPLAY_MANAGER=true DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager -KDEDIRS=/opt/trinity/ +TDEDIRS=/opt/trinity/ PATH=/opt/trinity/bin:/bin:/usr/bin:/sbin:/usr/sbin DAEMON=/opt/trinity/bin/kdm PIDFILE=/var/run/kdm.pid diff --git a/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff index 0eebed280..21011fbd5 100644 --- a/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff +++ b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff @@ -1,14 +1,14 @@ --- starttde +++ starttde @@ -184,17 +184,17 @@ - . $kdehome/share/config/startupconfig + . $tdehome/share/config/startupconfig fi -# Make sure a default wallpaper is set. --if [ ! -e $kdehome/share/config/kdesktoprc ]; then +-if [ ! -e $tdehome/share/config/kdesktoprc ]; then - # With Trinity KDE this file should exist, but test first. - if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then --cat >$kdehome/share/config/kdesktoprc <<EOF +-cat >$tdehome/share/config/kdesktoprc <<EOF -[Desktop0] -Wallpaper=isadora.png -WallpaperMode=Scaled @@ -16,10 +16,10 @@ - fi -fi +## Make sure a default wallpaper is set. -+#if [ ! -e $kdehome/share/config/kdesktoprc ]; then ++#if [ ! -e $tdehome/share/config/kdesktoprc ]; then +# # With Trinity KDE this file should exist, but test first. +# if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then -+#cat >$kdehome/share/config/kdesktoprc <<EOF ++#cat >$tdehome/share/config/kdesktoprc <<EOF +#[Desktop0] +#Wallpaper=isadora.png +#WallpaperMode=Scaled |