summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-09-20 05:08:25 +0200
committerSlávek Banko <slavek.banko@axis.cz>2015-09-20 05:08:25 +0200
commit55eba1f800c4e92d2359ce052e677f2bb36a4ed5 (patch)
treeab0d98615130a85caeb2266634554a27a5d64a7e
parent0c183905de60d9f4b26d475581adef4349442835 (diff)
downloadtde-packaging-55eba1f800c4e92d2359ce052e677f2bb36a4ed5.tar.gz
tde-packaging-55eba1f800c4e92d2359ce052e677f2bb36a4ed5.zip
Rename tdm-trinity.service on Ubuntu to match name of tdm binary
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--ubuntu/maverick/tdebase/debian/tdm-trinity.install1
-rw-r--r--ubuntu/maverick/tdebase/debian/tdm-trinity.postinst1
-rw-r--r--ubuntu/maverick/tdebase/debian/tdm.service (renamed from ubuntu/maverick/tdebase/debian/tdm-trinity.service)0
3 files changed, 1 insertions, 1 deletions
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.install b/ubuntu/maverick/tdebase/debian/tdm-trinity.install
index afcf37d7b..b69800a6f 100644
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.install
@@ -1,4 +1,5 @@
debian/local/tdm.options etc/trinity/tdm/
+debian/tdm.service lib/systemd/system/
debian/tmp/etc/trinity/tdm/tdmrc
debian/tmp/etc/trinity/tdm/Xaccess
debian/tmp/etc/trinity/tdm/Xreset
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.postinst b/ubuntu/maverick/tdebase/debian/tdm-trinity.postinst
index c33169e82..ec394f9cf 100644
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity.postinst
+++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.postinst
@@ -49,7 +49,6 @@ DEFAULT_SERVICE=/etc/systemd/system/display-manager.service
if [ "$1" = configure ] && [ -d /etc/systemd/system/ ]; then
if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
SERVICE=/lib/systemd/system/$(basename $(cat "$DEFAULT_DISPLAY_MANAGER_FILE")).service
- SERVICE=`echo "$SERVICE" | sed "s/tdm\./tdm-trinity./"`
if [ -h "$DEFAULT_SERVICE" ] && [ $(readlink "$DEFAULT_SERVICE") = /dev/null ]; then
echo "Display manager service is masked" >&2
elif [ -e "$SERVICE" ]; then
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.service b/ubuntu/maverick/tdebase/debian/tdm.service
index 349823a9f..349823a9f 100644
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity.service
+++ b/ubuntu/maverick/tdebase/debian/tdm.service