diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-09-15 17:39:24 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-09-15 17:39:24 -0500 |
| commit | 0cb1c3163d43f6058a7b4dc702344ec8b76cbc1b (patch) | |
| tree | 2a861eaf9257cae5cd7783945c5ed4441875fc7c | |
| parent | 5181d0f5c45980613ff79580883752eabfacbc9b (diff) | |
| download | tde-packaging-0cb1c3163d43f6058a7b4dc702344ec8b76cbc1b.tar.gz tde-packaging-0cb1c3163d43f6058a7b4dc702344ec8b76cbc1b.zip | |
Fix up kdm postinst file based on the "fixed" version that ships with KDE4
Time will tell if it is actually fixed or not...
| -rw-r--r-- | debian/lenny/kdebase/debian/kdm-trinity.postinst | 7 | ||||
| -rw-r--r-- | debian/squeeze/kdebase/debian/kdm-trinity.postinst | 7 | ||||
| -rw-r--r-- | ubuntu/maverick/kdebase/debian/kdm-trinity.postinst | 7 |
3 files changed, 3 insertions, 18 deletions
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/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 diff --git a/ubuntu/maverick/kdebase/debian/kdm-trinity.postinst b/ubuntu/maverick/kdebase/debian/kdm-trinity.postinst index 04c8a9af8..0c9b05b4a 100644 --- a/ubuntu/maverick/kdebase/debian/kdm-trinity.postinst +++ b/ubuntu/maverick/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 |