summaryrefslogtreecommitdiff
path: root/extra/xfdesktop
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-05-04 00:47:11 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2012-05-04 00:47:11 +0200
commitc39cbc60bd9cca21cdb7f174725bcd1f866e95d9 (patch)
treee1ab5429c30dcac4e282e1fba53182f0ea509d75 /extra/xfdesktop
parent70dd19e62605010a1403e8e28a9d40ca5b09409a (diff)
parent5520a8b04cecf4af812cbf2285e9ab6efabe147f (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/libgringotts/PKGBUILD community/ruby-gtk2/PKGBUILD community/steghide/PKGBUILD community/twin/PKGBUILD core/bzip2/PKGBUILD multilib/lib32-mpg123/PKGBUILD testing/samba/PKGBUILD testing/xfsprogs/PKGBUILD
Diffstat (limited to 'extra/xfdesktop')
-rw-r--r--extra/xfdesktop/PKGBUILD7
1 files changed, 3 insertions, 4 deletions
diff --git a/extra/xfdesktop/PKGBUILD b/extra/xfdesktop/PKGBUILD
index b6a15f5bd..9a79b4aee 100644
--- a/extra/xfdesktop/PKGBUILD
+++ b/extra/xfdesktop/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 157989 2012-04-30 17:36:28Z foutrelis $
+# $Id: PKGBUILD 158046 2012-05-01 19:51:23Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: tobias <tobias funnychar archlinux.org>
pkgname=xfdesktop
pkgver=4.10.0
-pkgrel=2
+pkgrel=3
pkgdesc="A desktop manager for Xfce"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.xfce.org/"
license=('GPL2')
groups=('xfce4')
depends=('libxfce4ui' 'thunar' 'garcon' 'hicolor-icon-theme' 'libwnck')
-makedepends=('intltool' 'xfce4-panel')
-optdepends=('xfce4-panel: panel menu plugin')
+makedepends=('intltool')
conflicts=('xfce4-menueditor')
replaces=('xfce4-menueditor')
options=('!libtool')