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>

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

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

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