diff --git a/debian/lenny/tdebase/debian/plasma-desktop.autodetect b/debian/lenny/tdebase/debian/plasma-desktop.autodetect deleted file mode 100755 index b083cb277..000000000 --- a/debian/lenny/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/debian/lenny/tdebase/debian/plasma.autodetect b/debian/lenny/tdebase/debian/plasma.autodetect deleted file mode 100755 index c23f68909..000000000 --- a/debian/lenny/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/debian/lenny/tdebase/debian/rules b/debian/lenny/tdebase/debian/rules index 2a7629870..33fbe4cab 100755 --- a/debian/lenny/tdebase/debian/rules +++ b/debian/lenny/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 diff --git a/debian/squeeze/tdebase/debian/plasma-desktop.autodetect b/debian/squeeze/tdebase/debian/plasma-desktop.autodetect deleted file mode 100755 index b083cb277..000000000 --- a/debian/squeeze/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/debian/squeeze/tdebase/debian/plasma.autodetect b/debian/squeeze/tdebase/debian/plasma.autodetect deleted file mode 100755 index c23f68909..000000000 --- a/debian/squeeze/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/debian/squeeze/tdebase/debian/rules b/debian/squeeze/tdebase/debian/rules index 5a8456157..ebe5164ad 100755 --- a/debian/squeeze/tdebase/debian/rules +++ b/debian/squeeze/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 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