diff options
| author |   Doug Goldstein <cardoe@gentoo.org> | 2005-08-31 07:30:58 +0000 |
|---|---|---|
| committer | Doug Goldstein <cardoe@gentoo.org> | 2005-08-31 07:30:58 +0000 |
| commit | 70f1d1eaf6aa423cf8d5924dbf7e00f8de76245c (patch) | |
| tree | b5fdf638089503c2cd92867bd93d251af3167e29 /gnome-base/gnome-volume-manager/files | |
| parent | remove vserver-sources (diff) | |
| download | gentoo-2-70f1d1eaf6aa423cf8d5924dbf7e00f8de76245c.tar.gz gentoo-2-70f1d1eaf6aa423cf8d5924dbf7e00f8de76245c.tar.bz2 gentoo-2-70f1d1eaf6aa423cf8d5924dbf7e00f8de76245c.zip | |
Rev bump to bring it inline with Gnome 2.11/2.12
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'gnome-base/gnome-volume-manager/files')
| -rw-r--r-- | gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.5.0 | 2 | ||||
| -rw-r--r-- | gnome-base/gnome-volume-manager/files/gvm-use-pmount-if-available-nochangelog.patch | 43 |
2 files changed, 45 insertions, 0 deletions
diff --git a/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.5.0 b/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.5.0 new file mode 100644 index 000000000000..c15ec916c182 --- /dev/null +++ b/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.5.0 @@ -0,0 +1,2 @@ +MD5 dfd61938c2dde0f41487f823e02ebb8e gnome-volume-manager-1.5.0.tar.gz 298517 +MD5 3054a930a0eddef2be59d4a602719bb1 gnome-volume-manager-1.3.3-reconnect_dbus.patch.bz2 12026 diff --git a/gnome-base/gnome-volume-manager/files/gvm-use-pmount-if-available-nochangelog.patch b/gnome-base/gnome-volume-manager/files/gvm-use-pmount-if-available-nochangelog.patch new file mode 100644 index 000000000000..8afaba3ab756 --- /dev/null +++ b/gnome-base/gnome-volume-manager/files/gvm-use-pmount-if-available-nochangelog.patch @@ -0,0 +1,43 @@ +Index: configure.in +=================================================================== +RCS file: /cvs/gnome/gnome-volume-manager/configure.in,v +retrieving revision 1.94 +diff -u -b -B -r1.94 configure.in +--- configure.in 3 Aug 2005 17:52:49 -0000 1.94 ++++ configure.in 8 Aug 2005 18:10:06 -0000 +@@ -8,14 +8,28 @@ + AC_PROG_CC + + AC_PATH_PROG(mount_path, mount, mount) ++AC_PATH_PROG(pmount_hal_path, pmount-hal, NOTFOUND) + AC_PATH_PROG(umount_path, umount, umount) ++AC_PATH_PROG(pumount_path, pumount, NOTFOUND) ++ ++if test ! x$pmount_hal_path = xNOTFOUND; then ++ mount_path="${pmount_hal_path} %h" ++else ++ mount_path="${mount_path} %d" ++fi ++ ++if test ! x$pumount_path = xNOTFOUND; then ++ umount_path="${pumount_path} %d" ++else ++ umount_path="${umount_path} %d" ++fi + + AC_ARG_WITH(mount-command, AC_HELP_STRING(--with-mount-command], [Command to invoke in order to mount a device]), +- mount_command="$withval", mount_command="${mount_path} %d") ++ mount_command="$withval", mount_command="${mount_path}") + AC_DEFINE_UNQUOTED([MOUNT_COMMAND], ["${mount_command}"], [mount command]) + + AC_ARG_WITH(unmount-command, AC_HELP_STRING(--with-unmount-command], [Command to invoke in order to unmount a device]), +- unmount_command="$withval", unmount_command="${umount_path} %d") ++ unmount_command="$withval", unmount_command="${umount_path}") + AC_DEFINE_UNQUOTED([UNMOUNT_COMMAND], ["${unmount_command}"], [unmount command]) + + AC_PATH_PROG(nautilus_path, nautilus, nautilus) +Index: src/manager.c +=================================================================== +RCS file: /cvs/gnome/gnome-volume-manager/src/manager.c,v +retrieving revision 1.72 +diff -u -b -B -r1.72 manager.c |