[Lunar-commits] <moonbase> changes

[Samuel Verstraete]

commit 9adcaa96121c19f770d95352b72e95ffeafabbe4
Author: Samuel Verstraete <samuel.verstraete at gmail.com>
Date:   Sun Nov 9 11:16:01 2008 +0100

    changes
---
 xfce4/core/xfdesktop/DEPENDS |    1 +
 xorg7/extra/libdrm/DETAILS   |   11 -----------
 2 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/xfce4/core/xfdesktop/DEPENDS b/xfce4/core/xfdesktop/DEPENDS
index 7fc35af..ec6d557 100644
--- a/xfce4/core/xfdesktop/DEPENDS
+++ b/xfce4/core/xfdesktop/DEPENDS
@@ -1,4 +1,5 @@
 depends xfce4-panel
 depends libxfce4menu
 depends libxml2
+depends xfconf
 optional_depends Thunar "" "" "for desktop file icon support"
diff --git a/xorg7/extra/libdrm/DETAILS b/xorg7/extra/libdrm/DETAILS
index fbba8d4..6bf7ea5 100644
--- a/xorg7/extra/libdrm/DETAILS
+++ b/xorg7/extra/libdrm/DETAILS
@@ -1,14 +1,4 @@
           MODULE=libdrm
-<<<<<<< HEAD:xorg7/extra/libdrm/DETAILS
-         VERSION=2.4.0
-          SOURCE=$MODULE-$VERSION.tar.bz2
-      SOURCE_URL=http://dri.freedesktop.org/libdrm/
-      SOURCE_VFY=sha1:8b33375e86be5105de593b7965c76626665a8c97
-   MODULE_PREFIX=${X11R7_PREFIX:-/usr}
-        WEB_SITE=http://www.freedesktop.org/
-         ENTERED=20061017
-         UPDATED=20081019
-=======
          VERSION=2.4.1
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=http://dri.freedesktop.org/libdrm/
@@ -17,7 +7,6 @@
         WEB_SITE=http://www.freedesktop.org/
          ENTERED=20061017
          UPDATED=20081106
->>>>>>> master:xorg7/extra/libdrm/DETAILS
            SHORT="the userspace interface to kernel DRM services"
 
 cat << EOF