diff options
| author | Calvin Morrison <mutantturkey@gmail.com> | 2011-12-14 15:50:42 -0500 |
|---|---|---|
| committer | Calvin Morrison <mutantturkey@gmail.com> | 2011-12-14 15:50:42 -0500 |
| commit | fc98476aef6bf17768cfc0450bd25ac967d01834 (patch) | |
| tree | 7411b50fd18336185de9fb8520fd9154822020b4 /ubuntu/lucid_automake/kdebase/debian | |
| parent | cc3f13111c121c8a39b9937bb2e1bf00207c9df0 (diff) | |
| parent | e9bf572672fe20775479a10b426d32379f4185d0 (diff) | |
| download | tde-packaging-fc98476aef6bf17768cfc0450bd25ac967d01834.tar.gz tde-packaging-fc98476aef6bf17768cfc0450bd25ac967d01834.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/lucid_automake/kdebase/debian')
| -rw-r--r-- | ubuntu/lucid_automake/kdebase/debian/changelog | 8 | ||||
| -rwxr-xr-x | ubuntu/lucid_automake/kdebase/debian/kdm-kde3.conf | 2 | ||||
| -rw-r--r-- | ubuntu/lucid_automake/kdebase/debian/kdm-kde3.txt | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ubuntu/lucid_automake/kdebase/debian/changelog b/ubuntu/lucid_automake/kdebase/debian/changelog index 994546f0b..b39130360 100644 --- a/ubuntu/lucid_automake/kdebase/debian/changelog +++ b/ubuntu/lucid_automake/kdebase/debian/changelog @@ -196,7 +196,7 @@ kdebase-kde3 (4:3.5.10-0ubuntu3~intrepid19) intrepid; urgency=low kdebase-kde3 (4:3.5.10-0ubuntu3~intrepid18) intrepid; urgency=low - * Added XDG_DATA_DIRS and KDEDIRS to startkde, as suggested by zekica on the Kubuntu forums + * Added XDG_DATA_DIRS and TDEDIRS to startkde, as suggested by zekica on the Kubuntu forums -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 07 Mar 2009 13:18:00 -0600 @@ -780,7 +780,7 @@ kdebase (4:3.5.7-1ubuntu21) gutsy; urgency=low kdebase (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 $kdehome 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 @@ kdebase (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 $kdehome 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 @@ kdebase (4:3.5.7-1ubuntu18) gutsy; urgency=low kdebase (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/lucid_automake/kdebase/debian/kdm-kde3.conf b/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.conf index 40acdd6b6..387be8b90 100755 --- a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.conf +++ b/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.conf @@ -38,7 +38,7 @@ script export LANG LANGUAGE fi - KDEDIRS=/opt/kde3/ + TDEDIRS=/opt/kde3/ PATH=/opt/kde3/bin:/bin:/usr/bin:/sbin:/usr/sbin initctl emit starting-dm DM=kdm-kde3 diff --git a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.txt b/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.txt index 191c344fd..71b5beb79 100644 --- a/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.txt +++ b/ubuntu/lucid_automake/kdebase/debian/kdm-kde3.txt @@ -22,7 +22,7 @@ set -e HEED_DEFAULT_DISPLAY_MANAGER=true DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager -KDEDIRS=/opt/kde3/ +TDEDIRS=/opt/kde3/ PATH=/opt/kde3/bin:/bin:/usr/bin:/sbin:/usr/sbin DAEMON=/opt/kde3/bin/kdm PIDFILE=/var/run/kdm.pid |