summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-08-25 10:24:49 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-08-25 10:24:49 +0900
commita4a26b276bce8c80786f403237e8b408baccc963 (patch)
treeac15e0014ed9f31db21e970d079c1f2f08ca95e1 /ubuntu/maverick
parentab39cf651a84ac9b6d1a2711100eb5cc0d0f2cb0 (diff)
parent4ac8a1a8905b7058a85e3fa072f0d86eeb3ddc90 (diff)
downloadtde-packaging-a4a26b276bce8c80786f403237e8b408baccc963.tar.gz
tde-packaging-a4a26b276bce8c80786f403237e8b408baccc963.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick')
-rwxr-xr-xubuntu/maverick/tdebase/debian/plasma-desktop.autodetect14
-rwxr-xr-xubuntu/maverick/tdebase/debian/plasma.autodetect14
-rwxr-xr-xubuntu/maverick/tdebase/debian/rules2
3 files changed, 0 insertions, 30 deletions
diff --git a/ubuntu/maverick/tdebase/debian/plasma-desktop.autodetect b/ubuntu/maverick/tdebase/debian/plasma-desktop.autodetect
deleted file mode 100755
index b083cb277..000000000
--- a/ubuntu/maverick/tdebase/debian/plasma-desktop.autodetect
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-DESKTOP_SESSION="$DESKTOP_SESSION"
-echo "You are running $DESKTOP_SESSION"
-
-if [[ "$DESKTOP_SESSION" == "trinity" ]]
-then
- # Do nothing, this is Trinity
- echo "I detected Trinity"
-else
- # This is KDE4, start plasma-desktop
- echo "I detected KDE4"
- /usr/bin/plasma-desktop.kde4
-fi
diff --git a/ubuntu/maverick/tdebase/debian/plasma.autodetect b/ubuntu/maverick/tdebase/debian/plasma.autodetect
deleted file mode 100755
index c23f68909..000000000
--- a/ubuntu/maverick/tdebase/debian/plasma.autodetect
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-DESKTOP_SESSION="$DESKTOP_SESSION"
-echo "You are running $DESKTOP_SESSION"
-
-if [[ "$DESKTOP_SESSION" == "trinity" ]]
-then
- # Do nothing, this is Trinity
- echo "I detected Trinity"
-else
- # This is KDE4, start plasma
- echo "I detected KDE4"
- /usr/bin/plasma.kde4
-fi
diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules
index 1d062ca42..1192433cb 100755
--- a/ubuntu/maverick/tdebase/debian/rules
+++ b/ubuntu/maverick/tdebase/debian/rules
@@ -291,5 +291,3 @@ binary-install/tdebase-trinity-bin::
binary-install/ksmserver-trinity::
install -p -D -m644 debian/tmp/opt/trinity/share/apps/tdm/sessions/tde.desktop debian/ksmserver-trinity/usr/share/xsessions/trinity.desktop
- install -p -D -m755 debian/plasma.autodetect debian/ksmserver-trinity/usr/bin/plasma
- install -p -D -m755 debian/plasma-desktop.autodetect debian/ksmserver-trinity/usr/bin/plasma-desktop