[Lunar-commits] CVS: moonbase/gnome-desktop/gconf-editor BUILD, 1.6, 1.7 DEPENDS, 1.1, 1.2 DETAILS, 1.9, 1.10

[Auke Kok]

Update of /var/cvs/lunar/moonbase/gnome-desktop/gconf-editor
In directory espresso.foo-projects.org:/home/sofar/active/moonbase/gnome-desktop/gconf-editor

Modified Files:
	BUILD DEPENDS DETAILS 
Log Message:
merging gnome-2.10 by cmak into moonbase

Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/gnome-desktop/gconf-editor/BUILD,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- BUILD	9 Apr 2004 15:08:21 -0000	1.6
+++ BUILD	25 Mar 2005 14:59:28 -0000	1.7
@@ -1,11 +1,11 @@
 (
 
-   ./configure  --prefix=${GNOME26_PREFIX:-/usr}  \
+   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
                 --build=$BUILD                    \
                 --sysconfdir=/etc                 \
                 --localstatedir=/var              \
-                --infodir=${GNOME26_PREFIX:-/usr}/share/info \
-                --mandir=${GNOME26_PREFIX:-/usr}/share/man   \
+                --infodir=${GNOME210_PREFIX:-/usr}/share/info \
+                --mandir=${GNOME210_PREFIX:-/usr}/share/man   \
                 $OPTS                             &&
     default_make                   
 

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/gnome-desktop/gconf-editor/DEPENDS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DEPENDS	1 Oct 2002 06:53:40 -0000	1.1
+++ DEPENDS	25 Mar 2005 14:59:28 -0000	1.2
@@ -1,2 +1,3 @@
 depends gtk+-2  &&
+depends gnome-keyring &&
 depends GConf2

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/gnome-desktop/gconf-editor/DETAILS,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- DETAILS	15 Mar 2005 11:41:13 -0000	1.9
+++ DETAILS	25 Mar 2005 14:59:28 -0000	1.10
@@ -1,11 +1,12 @@
-           MODULE=gconf-editor
-         VERSION=2.8.2
+          MODULE=gconf-editor
+         VERSION=2.10.0
+           MAJOR=2.10
           SOURCE=$MODULE-$VERSION.tar.bz2
-   SOURCE_URL[0]=$GNOME_URL/sources/$MODULE/2.8/
-      #SOURCE_VFY=sha1:eaed1d64dee8ddcb7aae371f6d60a1338796c023
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
+      SOURCE_VFY=sha1:710961b318c3410ca772cf2e169f05bd4e275e56
         WEB_SITE=http://www.gnome.org
          ENTERED=20020716
-         UPDATED=20050315
+         UPDATED=20050317
            SHORT="Configuration editor for GConf"
 cat << EOF
 The GNOME configuration editor for GConf