summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-08-25 19:12:31 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-08-25 19:12:31 -0500
commit10ad164219e7000bd559f8842c68f3c23e04ca39 (patch)
tree435068eb4743f5ba611eb41560da36c20de9ae29
parent8bb54d3c34809687b683704dbea4efdd7e344740 (diff)
downloadtde-packaging-10ad164219e7000bd559f8842c68f3c23e04ca39.tar.gz
tde-packaging-10ad164219e7000bd559f8842c68f3c23e04ca39.zip
Fix kdm's nasty habit of overwriting the default display manager under Ubuntu and Debian
-rw-r--r--debian/lenny/kdebase/debian/kdm-trinity.postinst4
-rw-r--r--debian/squeeze/kdebase/debian/kdm-trinity.postinst4
-rw-r--r--ubuntu/maverick/kdebase/debian/kdm-trinity.postinst4
3 files changed, 12 insertions, 0 deletions
diff --git a/debian/lenny/kdebase/debian/kdm-trinity.postinst b/debian/lenny/kdebase/debian/kdm-trinity.postinst
index 8c879be02..c787b37a3 100644
--- a/debian/lenny/kdebase/debian/kdm-trinity.postinst
+++ b/debian/lenny/kdebase/debian/kdm-trinity.postinst
@@ -9,6 +9,10 @@ set -e
# 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
if db_get shared/default-x-display-manager; then
diff --git a/debian/squeeze/kdebase/debian/kdm-trinity.postinst b/debian/squeeze/kdebase/debian/kdm-trinity.postinst
index 8c879be02..c787b37a3 100644
--- a/debian/squeeze/kdebase/debian/kdm-trinity.postinst
+++ b/debian/squeeze/kdebase/debian/kdm-trinity.postinst
@@ -9,6 +9,10 @@ set -e
# 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
if db_get shared/default-x-display-manager; then
diff --git a/ubuntu/maverick/kdebase/debian/kdm-trinity.postinst b/ubuntu/maverick/kdebase/debian/kdm-trinity.postinst
index 65747f681..04c8a9af8 100644
--- a/ubuntu/maverick/kdebase/debian/kdm-trinity.postinst
+++ b/ubuntu/maverick/kdebase/debian/kdm-trinity.postinst
@@ -9,6 +9,10 @@ set -e
# 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
if db_get shared/default-x-display-manager; then