diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-12-04 22:04:50 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-12-04 22:04:50 +0100 |
| commit | 280cd7b5541219ea4c0155a2b769fe90d4a59c5f (patch) | |
| tree | 46d18c1bf7c5efb4b8374c7c4718746703790808 /ubuntu/raring/tdebase/debian/ksmserver-trinity.preinst | |
| parent | f0e34da01a2c7e1f1401a94977ce4130709e372f (diff) | |
| parent | ae49825dd56fc5c18e7590d3599b93a5fa9b0265 (diff) | |
| download | tde-packaging-280cd7b5541219ea4c0155a2b769fe90d4a59c5f.tar.gz tde-packaging-280cd7b5541219ea4c0155a2b769fe90d4a59c5f.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/raring/tdebase/debian/ksmserver-trinity.preinst')
| -rw-r--r-- | ubuntu/raring/tdebase/debian/ksmserver-trinity.preinst | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ubuntu/raring/tdebase/debian/ksmserver-trinity.preinst b/ubuntu/raring/tdebase/debian/ksmserver-trinity.preinst index 4a2ab8a19..503524a11 100644 --- a/ubuntu/raring/tdebase/debian/ksmserver-trinity.preinst +++ b/ubuntu/raring/tdebase/debian/ksmserver-trinity.preinst @@ -6,8 +6,14 @@ case "$1" in upgrade) # Remove old-style Plasma diversions - dpkg-divert --package $package_name --rename --remove /usr/bin/plasma || true - dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop || true + divert=`dpkg-divert --listpackage "/usr/bin/plasma"` + if [ -n "$divert" ]; then + dpkg-divert --package $package_name --rename --remove /usr/bin/plasma + fi + divert=`dpkg-divert --listpackage "/usr/bin/plasma-desktop"` + if [ -n "$divert" ]; then + dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop + fi mkdir -p /usr/share/autostart ;; |