diff options
| author | albator <albator@arcadia.vtf> | 2011-09-18 23:25:28 +0200 |
|---|---|---|
| committer | albator <albator@arcadia.vtf> | 2011-09-18 23:25:28 +0200 |
| commit | d20183da14961148333e1f76f794c19bd763c7b0 (patch) | |
| tree | c3389b9cc8b948f950f30aa85fe9ad008ead1531 /debian/lenny | |
| parent | bca7b432a75bf6ecfd46b10ef8482f3dbf900645 (diff) | |
| parent | 645725620fe61bc988efee8a944a0e7805ac45ae (diff) | |
| download | tde-packaging-d20183da14961148333e1f76f794c19bd763c7b0.tar.gz tde-packaging-d20183da14961148333e1f76f794c19bd763c7b0.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'debian/lenny')
| -rw-r--r-- | debian/lenny/kdebase/debian/kdebase-trinity-bin.install | 1 | ||||
| -rw-r--r-- | debian/lenny/kdebase/debian/kdm-trinity.postinst | 7 |
2 files changed, 2 insertions, 6 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 |