summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/lenny/kdebase/debian/kdebase-trinity-bin.install1
-rw-r--r--debian/lenny/kdebase/debian/kdm-trinity.postinst7
-rw-r--r--debian/squeeze/kdebase/debian/kdebase-trinity-bin.install1
-rw-r--r--debian/squeeze/kdebase/debian/kdm-trinity.postinst7
4 files changed, 4 insertions, 12 deletions
diff --git a/debian/lenny/kdebase/debian/kdebase-trinity-bin.install b/debian/lenny/kdebase/debian/kdebase-trinity-bin.install
index 87b20ee6c..2322b0008 100644
--- a/debian/lenny/kdebase/debian/kdebase-trinity-bin.install
+++ b/debian/lenny/kdebase/debian/kdebase-trinity-bin.install
@@ -1,5 +1,6 @@
debian/tmp/opt/trinity/bin/krootbacking
debian/tmp/opt/trinity/bin/kdmtsak
+debian/tmp/opt/trinity/bin/tsak
debian/tmp/opt/trinity/bin/kdebugdialog
debian/tmp/opt/trinity/bin/kreadconfig
debian/tmp/opt/trinity/bin/kwriteconfig
diff --git a/debian/lenny/kdebase/debian/kdm-trinity.postinst b/debian/lenny/kdebase/debian/kdm-trinity.postinst
index c787b37a3..7b4ac4ee3 100644
--- a/debian/lenny/kdebase/debian/kdm-trinity.postinst
+++ b/debian/lenny/kdebase/debian/kdm-trinity.postinst
@@ -8,13 +8,8 @@ set -e
# debconf is not a registry, so we only fiddle with the default file if it
# does not exist
DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
-
-if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" ]; then
- cp -Rp "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" "$DEFAULT_DISPLAY_MANAGER_FILE"
-fi
-
if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
- DEFAULT_DISPLAY_MANAGER=kdm-trinity
+ DEFAULT_DISPLAY_MANAGER=
if db_get shared/default-x-display-manager; then
DEFAULT_DISPLAY_MANAGER="$RET"
fi
diff --git a/debian/squeeze/kdebase/debian/kdebase-trinity-bin.install b/debian/squeeze/kdebase/debian/kdebase-trinity-bin.install
index 87b20ee6c..2322b0008 100644
--- a/debian/squeeze/kdebase/debian/kdebase-trinity-bin.install
+++ b/debian/squeeze/kdebase/debian/kdebase-trinity-bin.install
@@ -1,5 +1,6 @@
debian/tmp/opt/trinity/bin/krootbacking
debian/tmp/opt/trinity/bin/kdmtsak
+debian/tmp/opt/trinity/bin/tsak
debian/tmp/opt/trinity/bin/kdebugdialog
debian/tmp/opt/trinity/bin/kreadconfig
debian/tmp/opt/trinity/bin/kwriteconfig
diff --git a/debian/squeeze/kdebase/debian/kdm-trinity.postinst b/debian/squeeze/kdebase/debian/kdm-trinity.postinst
index c787b37a3..7b4ac4ee3 100644
--- a/debian/squeeze/kdebase/debian/kdm-trinity.postinst
+++ b/debian/squeeze/kdebase/debian/kdm-trinity.postinst
@@ -8,13 +8,8 @@ set -e
# debconf is not a registry, so we only fiddle with the default file if it
# does not exist
DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
-
-if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" ]; then
- cp -Rp "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" "$DEFAULT_DISPLAY_MANAGER_FILE"
-fi
-
if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
- DEFAULT_DISPLAY_MANAGER=kdm-trinity
+ DEFAULT_DISPLAY_MANAGER=
if db_get shared/default-x-display-manager; then
DEFAULT_DISPLAY_MANAGER="$RET"
fi