summaryrefslogtreecommitdiffstats
path: root/debian/_base/core
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-01-17 20:16:20 +0100
committerSlávek Banko <slavek.banko@axis.cz>2021-01-17 20:20:58 +0100
commit6fc61c67bf5d44161dfee1fac92b1bc4295b9b2d (patch)
tree03d399253778558becad14d5b3dc55852378ec31 /debian/_base/core
parentf229967711dc1d6640fcb74183c0d1047c9b5bf8 (diff)
downloadtde-packaging-6fc61c67bf5d44161dfee1fac92b1bc4295b9b2d.tar.gz
tde-packaging-6fc61c67bf5d44161dfee1fac92b1bc4295b9b2d.zip
DEB tdebase: Fix the default DM service package name detection for TDM.
This resolves an unwanted change from TDM to another installed DM during the tdm-trinity package upgrade. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 5bc997626bedf1356339a2bbc515a9bda456afef)
Diffstat (limited to 'debian/_base/core')
-rw-r--r--debian/_base/core/tdebase/debian/tdm-trinity.config9
1 files changed, 5 insertions, 4 deletions
diff --git a/debian/_base/core/tdebase/debian/tdm-trinity.config b/debian/_base/core/tdebase/debian/tdm-trinity.config
index 1d73249f7..8e5c207d7 100644
--- a/debian/_base/core/tdebase/debian/tdm-trinity.config
+++ b/debian/_base/core/tdebase/debian/tdm-trinity.config
@@ -38,10 +38,11 @@ if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
CURRENT_DEFAULT=$(grep -v '^[[:space:]]*#' \
"$DEFAULT_DISPLAY_MANAGER_FILE" |
head -n 1)
- # both the binaries for tdm and tdm-kde4 share the same basename
- # so we need to check if it's tdm-kde4 or another display manager
- if [ "$CURRENT_DEFAULT" = "/usr/lib/kde4/bin/tdm" ]; then
- CURRENT_DEFAULT=${THIS_PACKAGE}-kde4
+ # the debconf configuration stores the package name,
+ # while the configuration files point to the binary name
+ # therefore tdm-trinity package name must be used for the tdm binary
+ if [ "$CURRENT_DEFAULT" = "/opt/trinity/bin/tdm" ]; then
+ CURRENT_DEFAULT=${THIS_PACKAGE}
else
CURRENT_DEFAULT=$(basename $CURRENT_DEFAULT)
fi