[SM-Commit] PERFORCE change 76692 by Flavien Bridault for review

Perforce Review Daemon p4review at smee.org
Fri Mar 24 05:15:02 EST 2006


Change 76692 by flavien_bridault at flavien-Gargamel on 2006/03/24 10:11:04

	Integrate in test

Affected files ...

... //sgl/grimoires/test/ChangeLog#217 integrate
... //sgl/grimoires/test/gnome2-apps/gnome-mount/DEPENDS#1 branch
... //sgl/grimoires/test/gnome2-apps/gnome-mount/DETAILS#1 branch
... //sgl/grimoires/test/gnome2-apps/gnome-mount/HISTORY#1 branch
... //sgl/grimoires/test/gnome2-libs/gnome-vfs2/BUILD#7 integrate
... //sgl/grimoires/test/gnome2-libs/gnome-vfs2/DEPENDS#10 integrate
... //sgl/grimoires/test/gnome2-libs/gnome-vfs2/HISTORY#18 integrate
... //sgl/grimoires/test/gnome2-libs/gnome-volume-manager/BUILD#6 delete
... //sgl/grimoires/test/gnome2-libs/gnome-volume-manager/DEPENDS#6 integrate
... //sgl/grimoires/test/gnome2-libs/gnome-volume-manager/DETAILS#9 integrate
... //sgl/grimoires/test/gnome2-libs/gnome-volume-manager/HISTORY#14 integrate
... //sgl/grimoires/test/gnome2-libs/gnome-volume-manager/gnome-volume-manager#1 branch

Differences ...

==== //sgl/grimoires/test/ChangeLog#217 (text) ====

@@ -1,3 +1,8 @@
+2006-03-24 Flavien Bridault <vlaaad at sourcemage.org>
+	* gnome2-libs/gnome-python-desktop: added
+	* gnome2-apps/gnome-mount: added
+	* gnome2-apps/deskbar-applet: added 
+
 2006-03-24 Pol Vinogradov <vin.public at gmail.com>
 	* science-libs/cuba: added, a library for multidimensional numerical integration
 

==== //sgl/grimoires/test/gnome2-libs/gnome-vfs2/BUILD#7 (xtext) ====

@@ -8,7 +8,7 @@
         $OPTS"
 fi  &&
 
-OPTS=$(echo $OPTS|sed 's!PMOUNT_ON!--with-mount-command=\"/usr/bin/pmount-hal %h\" --with-unmount-command=\"/usr/bin/pumount %d\"!')
+OPTS=$(echo $OPTS|sed 's!PMOUNT_ON!--with-hal-mount=\"/usr/bin/pmount-hal %h\" --with-hal-umount=\"/usr/bin/pumount %d\"!')
 
 # Fix a simple Samba API name change; not using patch because of a single line
 # See "http://websvn.samba.org/cgi-bin/viewcvs.cgi/branches/SAMBA_3_0_RELEASE/source/include/libsmbclient.h?rev=8329&r1=6369&r2=8329"

==== //sgl/grimoires/test/gnome2-libs/gnome-vfs2/DEPENDS#10 (xtext) ====

@@ -5,10 +5,6 @@
 depends  shared-mime-info    &&
 depends  desktop-file-utils  &&
 
-if [ "$VFS_PMOUNT" == "y" ]; then
-   depends  pmount
-fi                           &&
-
 if    [  "$GNOME_VFS_CRYPTO"  ==  "openssl"  ];  then
   depends  openssl  '--enable-openssl  --disable-gnutls'
 elif  [  "$GNOME_VFS_CRYPTO"  ==  "gnutls"   ];  then
@@ -35,10 +31,15 @@
                   "--disable-howl"                          \
                   "for automatic network service discovery" &&
 
+optional_depends  gnome-mount                               \
+                  ""                                        \
+                  ""                                        \
+                  "Use new gnome-mount to mount volumes" y  &&
+
 optional_depends  pmount                                    \
                   "PMOUNT_ON"                               \
                   ""                                        \
-                  "Use for pmount for automount"            &&
+                  "Use pmount to mount volumes" n           &&
 
 optional_depends  zlib                                      \
                   "--with-zlib"                             \

==== //sgl/grimoires/test/gnome2-libs/gnome-vfs2/HISTORY#18 (text) ====

@@ -1,3 +1,8 @@
+2006-03-24 Flavien Bridault <disk at sourcemage.org>
+        * BUILD: updated options for pmount
+	* DEPENDS: added gnome-mount, removed a useless VFS_PMOUNT test 
+	  (variable not set anywhere)
+
 2006-03-13 Robin Cook <rcook at wyrms.net>
 	* DETAILS: updated VERSION to 2.14.0
 

==== //sgl/grimoires/test/gnome2-libs/gnome-volume-manager/DEPENDS#6 (xtext) ====

@@ -2,8 +2,4 @@
 depends dbus       &&
 depends libgnomeui &&
 depends libglade2  &&
-
-optional_depends pmount            \
-                 "PMOUNT_ON"       \
-                 ""                \
-                 "Use for pmount"
+depends gnome-mount

==== //sgl/grimoires/test/gnome2-libs/gnome-volume-manager/DETAILS#9 (xtext) ====

@@ -9,6 +9,7 @@
         WEB_SITE=http://www.gnome.org
          ENTERED=20020507
          UPDATED=20051022
+      PATCHLEVEL=1
         KEYWORDS="gnome2 libs"
            SHORT="Volume Manager for GNOME"
 cat << EOF

==== //sgl/grimoires/test/gnome2-libs/gnome-volume-manager/HISTORY#14 (text) ====

@@ -1,3 +1,10 @@
+2006-03-24 Flavien Bridault <vlaaadk at sourcemage.org>
+        * DEPENDS: Replaced pmount by gnome-mount
+	* BUILD: Removed, no options needed now
+	* DETAILS: Updated UPDATED
+	* gnome-volume-manager: added this script to simulate pam_console behavior
+	* INSTALL: installed previous script 
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 



More information about the SM-Commit mailing list