[Lunar-commits] <moonbase> xfce: chages

[Samuel Verstraete]

commit 287e2b2aa9b7ec26f5da21ffd88cecc0d03320b1
Author: Samuel Verstraete <elangelo at lunar-linux.org>
Date:   Tue May 12 21:58:57 2009 +0200

    xfce: chages
---
 xfce4/core/xfce4-session/BUILD   |    8 ++------
 xfce4/core/xfce4-session/DEPENDS |    2 ++
 xfce4/core/xfce4-session/DETAILS |    4 +---
 xfce4/core/xfconf/DETAILS        |   16 ----------------
 4 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/xfce4/core/xfce4-session/BUILD b/xfce4/core/xfce4-session/BUILD
index 339d297..578930b 100644
--- a/xfce4/core/xfce4-session/BUILD
+++ b/xfce4/core/xfce4-session/BUILD
@@ -1,16 +1,12 @@
 (
-
-#   patch_it $SOURCE2 1 &&
    [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
 
    # make sure proper PKG_CONFIG_PATH is set
    export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}"  &&
 
-   PATH="$PATH:/usr/X11/bin"
-
-   ./autogen.sh --build=$BUILD                                        \
+   ./autogen.sh --build=$BUILD                   \
                 --prefix=${MODULE_PREFIX}        \
-                $OPTS                                           &&
+                $OPTS                            &&
 
    default_make
 
diff --git a/xfce4/core/xfce4-session/DEPENDS b/xfce4/core/xfce4-session/DEPENDS
index 1bda173..c9cfb80 100644
--- a/xfce4/core/xfce4-session/DEPENDS
+++ b/xfce4/core/xfce4-session/DEPENDS
@@ -1,5 +1,7 @@
+
 depends xfconf
 depends libxfce4util
 depends libxfcegui4
 
 optional_depends fortune "" "" "so xfce4-tips can give you the fortune of the day"
+
diff --git a/xfce4/core/xfce4-session/DETAILS b/xfce4/core/xfce4-session/DETAILS
index 06b1aa9..9d9c9e9 100644
--- a/xfce4/core/xfce4-session/DETAILS
+++ b/xfce4/core/xfce4-session/DETAILS
@@ -1,10 +1,8 @@
           MODULE=xfce4-session
-         VERSION="svn-`date +%Y%U`"
+         VERSION=svn-`date +%Y%U`
           SOURCE=$MODULE.tar.bz2
-          #SOURCE2=fast_xfce.patch
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
       SOURCE_URL=svn+http://svn.xfce.org/svn/xfce/$MODULE/trunk:$MODULE
-      #SOURCE2_URL=http://merlin.ugent.be/lunar/patches
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org
          ENTERED=20030715
diff --git a/xfce4/core/xfconf/DETAILS b/xfce4/core/xfconf/DETAILS
index 5f13920..8e93262 100644
--- a/xfce4/core/xfconf/DETAILS
+++ b/xfce4/core/xfconf/DETAILS
@@ -1,4 +1,3 @@
-<<<<<<< HEAD:xfce4/core/xfconf/DETAILS
           MODULE=xfconf
          VERSION="svn-`date +%Y%U`"
           SOURCE=$MODULE.tar.bz2
@@ -11,20 +10,5 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
            SHORT="Something that does something"
 
 cat << EOF
-Something that does that other thing
-=======
-        MODULE=xfconf
-       VERSION=4.6.1
-        SOURCE=$MODULE-$VERSION.tar.bz2
-    SOURCE_URL=http://www.xfce.org/archive/xfce-$VERSION/src
-    SOURCE_VFY=sha1:6df092942c5c5af5d65a58589fb85e29755a37ee
- MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
-      WEB_SITE=http://www.xfce.org
-       ENTERED=20090227
-       UPDATED=20090424
-         SHORT="Configuration system for Xfce"
-
-cat << EOF
 Configuration storage system for Xfce
->>>>>>> master:xfce4/core/xfconf/DETAILS
 EOF