diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2021-01-17 20:16:20 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-01-17 20:16:20 +0100 |
| commit | 5bc997626bedf1356339a2bbc515a9bda456afef (patch) | |
| tree | 6ff4569c38eb6c7a72d37ab5982fc1ffae32c073 | |
| parent | 36b0e78940f446154a80f064f8288832f2f87a6c (diff) | |
| download | tde-packaging-5bc997626bedf1356339a2bbc515a9bda456afef.tar.gz tde-packaging-5bc997626bedf1356339a2bbc515a9bda456afef.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>
| -rw-r--r-- | debian/_base/core/tdebase/debian/tdm-trinity.config | 9 | ||||
| -rw-r--r-- | dilos/core/tdebase/debian/tdm-trinity.config | 9 | ||||
| -rw-r--r-- | ubuntu/_base/core/tdebase/debian/tdm-trinity.config | 9 |
3 files changed, 15 insertions, 12 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 diff --git a/dilos/core/tdebase/debian/tdm-trinity.config b/dilos/core/tdebase/debian/tdm-trinity.config index 1d73249f7..3454c39fe 100644 --- a/dilos/core/tdebase/debian/tdm-trinity.config +++ b/dilos/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" = "/usr/bin/tdm" ]; then + CURRENT_DEFAULT=${THIS_PACKAGE} else CURRENT_DEFAULT=$(basename $CURRENT_DEFAULT) fi diff --git a/ubuntu/_base/core/tdebase/debian/tdm-trinity.config b/ubuntu/_base/core/tdebase/debian/tdm-trinity.config index 1d73249f7..26fc8427c 100644 --- a/ubuntu/_base/core/tdebase/debian/tdm-trinity.config +++ b/ubuntu/_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 + # 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 |