Patchwork [meta-systemd,1/2] xfwm4: cleanup update-alternatives deprecated code

login
register
mail settings
Submitter Andreas Müller
Date Aug. 27, 2012, 8:36 a.m.
Message ID <1346056611-31432-2-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/35387/
State Accepted
Commit b4d98cfc53994d71ce404a4534549ff4a9d4e672
Headers show

Comments

Andreas Müller - Aug. 27, 2012, 8:36 a.m.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.3.bb |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.3.bb b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.3.bb
index 299c7ad..304ff66 100644
--- a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.3.bb
+++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.3.bb
@@ -3,6 +3,7 @@  SECTION = "x11/wm"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855"
 DEPENDS = "virtual/libx11 libxpm gtk+ libxfce4util libxfce4ui xfconf libwnck dbus-glib startup-notification"
+PR = "r1"
 
 inherit xfce update-alternatives
 
@@ -18,10 +19,9 @@  python populate_packages_prepend () {
 
 PACKAGES_DYNAMIC += "xfwm4-theme-*"
 
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PATH = "${bindir}/xfce4-session"
-ALTERNATIVE_PRIORITY = "30"
+ALTERNATIVE_${PN} = "x-window-manager"
+ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/xfwm4"
+ALTERNATIVE_PRIORITY[x-window-manager] = "30"
 
 RDEPENDS_${PN} = "xfwm4-theme-default"
 FILES_${PN} += "${libdir}/xfce4/xfwm4/helper-dialog \