[Pkg-utopia-commits] r92 - in packages/gnome-volume-manager/trunk/debian: . patches
Sjoerd Simons
sjoerd@haydn.debian.org
Wed, 17 Nov 2004 11:32:28 -0700
Author: sjoerd
Date: 2004-11-17 11:32:05 -0700 (Wed, 17 Nov 2004)
New Revision: 92
Added:
packages/gnome-volume-manager/trunk/debian/patches/20_specify_mountprogram.patch
Modified:
packages/gnome-volume-manager/trunk/debian/changelog
packages/gnome-volume-manager/trunk/debian/control
packages/gnome-volume-manager/trunk/debian/rules
Log:
Start using pmount!
Modified: packages/gnome-volume-manager/trunk/debian/changelog
===================================================================
--- packages/gnome-volume-manager/trunk/debian/changelog 2004-11-17 18:08:26 UTC (rev 91)
+++ packages/gnome-volume-manager/trunk/debian/changelog 2004-11-17 18:32:05 UTC (rev 92)
@@ -20,6 +20,10 @@
* debian/patches/06_mount_at_start.patch
+ Updated. Removed gui option to not mount static drives. This should be
done by a hal fdi file now.
+ * debian/patches/20_specify_mountprogram.patch
+ + Added. Allows to indicated the mount and unmount programs at compile
+ time.
+ * Use pmount-hal and pumount as commands for mounting and unmounting.
-- Sjoerd Simons <sjoerd@debian.org> Wed, 17 Nov 2004 11:44:57 +0100
Modified: packages/gnome-volume-manager/trunk/debian/control
===================================================================
--- packages/gnome-volume-manager/trunk/debian/control 2004-11-17 18:08:26 UTC (rev 91)
+++ packages/gnome-volume-manager/trunk/debian/control 2004-11-17 18:32:05 UTC (rev 92)
@@ -8,7 +8,7 @@
Package: gnome-volume-manager
Architecture: any
Conflicts: magicdev
-Depends: ${shlibs:Depends}, ${misc:Depends}, hal (>= 0.4.1)
+Depends: ${shlibs:Depends}, ${misc:Depends}, hal (>= 0.4.1), pmount (>= 0.4.1)
Recommends: nautilus-cd-burner, totem, gnome-media, gthumb
Description: GNOME daemon to auto-mount and manage media devices
gnome-volume-manager is a GNOME daemon that acts as a policy agent in
Added: packages/gnome-volume-manager/trunk/debian/patches/20_specify_mountprogram.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/20_specify_mountprogram.patch 2004-11-17 18:08:26 UTC (rev 91)
+++ packages/gnome-volume-manager/trunk/debian/patches/20_specify_mountprogram.patch 2004-11-17 18:32:05 UTC (rev 92)
@@ -0,0 +1,660 @@
+diff -ruN gnome-volume-manager-old/configure gnome-volume-manager/configure
+--- gnome-volume-manager-old/configure 2004-10-30 17:12:10.000000000 +0200
++++ gnome-volume-manager/configure 2004-11-17 19:21:09.082868949 +0100
+@@ -309,7 +309,7 @@
+ # include <unistd.h>
+ #endif"
+
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE mount_path umount_path nautilus_path ALL_LINGUAS GETTEXT_PACKAGE INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL CPP EGREP USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB PKG_CONFIG GVM_CFLAGS GVM_LIBS CAPPLET_CFLAGS CAPPLET_LIBS GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE mount_program umount_program nautilus_path ALL_LINGUAS GETTEXT_PACKAGE INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL CPP EGREP USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB PKG_CONFIG GVM_CFLAGS GVM_LIBS CAPPLET_CFLAGS CAPPLET_LIBS GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+
+ # Initialize some variables set by options.
+@@ -854,6 +854,8 @@
+ Optional Packages:
+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
++ --with-mount-program=program Program to run to mount a device
++ --with-umount-program=program Program to run to umount a device
+ --with-gconf-source=sourceaddress Config database for installing schema files.
+ --with-gconf-schema-file-dir=dir Directory for installing schema files.
+
+@@ -957,7 +959,7 @@
+ else
+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ fi
+- cd $ac_popdir
++ cd "$ac_popdir"
+ done
+ fi
+
+@@ -2311,8 +2313,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2370,8 +2371,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2487,8 +2487,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2542,8 +2541,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2588,8 +2586,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2633,8 +2630,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2848,12 +2844,12 @@
+ set dummy mount; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_path_mount_path+set}" = set; then
++if test "${ac_cv_path_mount_program+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- case $mount_path in
++ case $mount_program in
+ [\\/]* | ?:[\\/]*)
+- ac_cv_path_mount_path="$mount_path" # Let the user override the test with a path.
++ ac_cv_path_mount_program="$mount_program" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -2863,37 +2859,38 @@
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_path_mount_path="$as_dir/$ac_word$ac_exec_ext"
++ ac_cv_path_mount_program="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
+
+- test -z "$ac_cv_path_mount_path" && ac_cv_path_mount_path="no"
++ test -z "$ac_cv_path_mount_program" && ac_cv_path_mount_program="no"
+ ;;
+ esac
+ fi
+-mount_path=$ac_cv_path_mount_path
++mount_program=$ac_cv_path_mount_program
+
+-if test -n "$mount_path"; then
+- echo "$as_me:$LINENO: result: $mount_path" >&5
+-echo "${ECHO_T}$mount_path" >&6
++if test -n "$mount_program"; then
++ echo "$as_me:$LINENO: result: $mount_program" >&5
++echo "${ECHO_T}$mount_program" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
++mount_program="${mount_program} %d"
+ # Extract the first word of "umount", so it can be a program name with args.
+ set dummy umount; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_path_umount_path+set}" = set; then
++if test "${ac_cv_path_umount_program+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- case $umount_path in
++ case $umount_program in
+ [\\/]* | ?:[\\/]*)
+- ac_cv_path_umount_path="$umount_path" # Let the user override the test with a path.
++ ac_cv_path_umount_program="$umount_program" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -2903,27 +2900,28 @@
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_path_umount_path="$as_dir/$ac_word$ac_exec_ext"
++ ac_cv_path_umount_program="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
+
+- test -z "$ac_cv_path_umount_path" && ac_cv_path_umount_path="no"
++ test -z "$ac_cv_path_umount_program" && ac_cv_path_umount_program="no"
+ ;;
+ esac
+ fi
+-umount_path=$ac_cv_path_umount_path
++umount_program=$ac_cv_path_umount_program
+
+-if test -n "$umount_path"; then
+- echo "$as_me:$LINENO: result: $umount_path" >&5
+-echo "${ECHO_T}$umount_path" >&6
++if test -n "$umount_program"; then
++ echo "$as_me:$LINENO: result: $umount_program" >&5
++echo "${ECHO_T}$umount_program" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
++umount_program="${umount_program} %d"
+ # Extract the first word of "nautilus", so it can be a program name with args.
+ set dummy nautilus; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+@@ -2966,13 +2964,26 @@
+
+
+
++# Check whether --with-mount-program or --without-mount-program was given.
++if test "${with_mount_program+set}" = set; then
++ withval="$with_mount_program"
++ mount_program="$withval"
++fi;
++
++# Check whether --with-mount-program or --without-mount-program was given.
++if test "${with_mount_program+set}" = set; then
++ withval="$with_mount_program"
++ umount_program="$withval"
++fi;
++
++
+ cat >>confdefs.h <<_ACEOF
+-#define BIN_MOUNT "${mount_path}"
++#define BIN_MOUNT "${mount_program}"
+ _ACEOF
+
+
+ cat >>confdefs.h <<_ACEOF
+-#define BIN_UMOUNT "${umount_path}"
++#define BIN_UMOUNT "${umount_program}"
+ _ACEOF
+
+
+@@ -3467,8 +3478,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3638,8 +3648,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3707,8 +3716,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3853,8 +3861,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3925,8 +3932,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4070,8 +4076,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4167,8 +4172,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4246,8 +4250,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4311,8 +4314,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4387,8 +4389,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4500,8 +4501,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4667,8 +4667,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4801,8 +4800,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4887,8 +4885,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6030,8 +6027,8 @@
+ s,@CCDEPMODE@,$CCDEPMODE,;t t
+ s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
+ s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+-s,@mount_path@,$mount_path,;t t
+-s,@umount_path@,$umount_path,;t t
++s,@mount_program@,$mount_program,;t t
++s,@umount_program@,$umount_program,;t t
+ s,@nautilus_path@,$nautilus_path,;t t
+ s,@ALL_LINGUAS@,$ALL_LINGUAS,;t t
+ s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
+@@ -6249,11 +6246,6 @@
+ *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+ esac
+
+- if test x"$ac_file" != x-; then
+- { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+- rm -f "$ac_file"
+- fi
+ # Let's still pretend it is `configure' which instantiates (i.e., don't
+ # use $as_me), people would be surprised to read:
+ # /* config.h. Generated by config.status. */
+@@ -6292,6 +6284,12 @@
+ fi;;
+ esac
+ done` || { (exit 1); exit 1; }
++
++ if test x"$ac_file" != x-; then
++ { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
++ rm -f "$ac_file"
++ fi
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ sed "$ac_vpsub
+diff -ruN gnome-volume-manager-old/configure.in gnome-volume-manager/configure.in
+--- gnome-volume-manager-old/configure.in 2004-10-30 17:10:32.000000000 +0200
++++ gnome-volume-manager/configure.in 2004-11-17 19:12:58.529977042 +0100
+@@ -8,12 +8,21 @@
+ AC_PROG_CC
+
+
+-AC_PATH_PROG(mount_path, mount, no)
+-AC_PATH_PROG(umount_path, umount, no)
++AC_PATH_PROG(mount_program, mount, no)
++mount_program="${mount_program} %d"
++AC_PATH_PROG(umount_program, umount, no)
++umount_program="${umount_program} %d"
+ AC_PATH_PROG(nautilus_path, nautilus, no)
+
+-AC_DEFINE_UNQUOTED([BIN_MOUNT], ["${mount_path}"], [path to mount])
+-AC_DEFINE_UNQUOTED([BIN_UMOUNT], ["${umount_path}"], [path to umount])
++AC_ARG_WITH(mount-program,
++ [ --with-mount-program=program Program to run to mount a device],
++ mount_program="$withval",)
++AC_ARG_WITH(mount-program,
++ [ --with-umount-program=program Program to run to umount a device],
++ umount_program="$withval",)
++
++AC_DEFINE_UNQUOTED([BIN_MOUNT], ["${mount_program}"], [mount program])
++AC_DEFINE_UNQUOTED([BIN_UMOUNT], ["${umount_program}"], [umount program])
+ AC_DEFINE_UNQUOTED([BIN_NAUTILUS], ["${nautilus_path}"], [nautilus command])
+
+
+diff -ruN gnome-volume-manager-old/src/manager.c gnome-volume-manager/src/manager.c
+--- gnome-volume-manager-old/src/manager.c 2004-11-17 19:12:31.586392000 +0100
++++ gnome-volume-manager/src/manager.c 2004-11-17 19:18:56.452051176 +0100
+@@ -147,20 +147,20 @@
+ gvm_config_changed, NULL, NULL, NULL);
+ }
+
+-/*
+- * gvm_run_command - run the given command, replacing %d with the device node,
+- * %h with the HAL UDI and %m with the given path. Bails out if the command
+- * requires a given %d,%h or %m and this is NULL.
++/* parses the given command into a command string. It replaces %d with the
++ * device node, * %h with the HAL UDI and %m with the given path.
++ *
++ * Returns NULL f the command * requires a given %d,%h or %m and this is NULL.
+ */
+-static void
+-gvm_run_command (const char *device, const char *command,
+- const char *path, const char *udi)
+-{
+- char *argv[4];
++
++static gchar *
++gvm_parse_command(const char *device, const char *command,
++ const char *path, const char *udi) {
+ gchar *new_command;
+ GError *error = NULL;
+ GString *exec = g_string_new (NULL);
+ char *p, *q;
++ gchar *result;
+
+ /* perform s/%d/device/, s/%m/path/ and s/%h/udi/ */
+ new_command = g_strdup (command);
+@@ -196,26 +196,69 @@
+ }
+ }
+ g_string_append (exec, q);
++ result = exec->str;
+
+- argv[0] = "/bin/sh";
+- argv[1] = "-c";
+- argv[2] = exec->str;
+- argv[3] = NULL;
+-
+- g_spawn_async (g_get_home_dir (), argv, NULL, 0, NULL, NULL,
+- NULL, &error);
+- if (error)
+- warn ("failed to exec %s: %s\n", exec->str, error->message);
+-
+- g_string_free (exec, TRUE);
++ g_string_free (exec, FALSE);
+ g_free (new_command);
+- return;
++ return result;
+
+ error:
+ warn ("command '%s' required unavailable parameter; "
+ "%%d='%s' %%m='%s' %%h='%s'\n", command, device, path, udi);
+ g_string_free (exec, TRUE);
+ g_free (new_command);
++ return NULL;
++}
++
++/*
++ * gvm_run_command - run the given command, replacing %d with the device node,
++ * %h with the HAL UDI and %m with the given path. Bails out if the command
++ * requires a given %d,%h or %m and this is NULL.
++ */
++static void
++gvm_run_command (const char *device, const char *command,
++ const char *path, const char *udi)
++{
++ char *cmd;
++ GError *error = NULL;
++
++ cmd = gvm_parse_command(device, command, path, udi);
++ if (cmd == NULL) {
++ return;
++ }
++ if (!g_spawn_command_line_async (cmd, &error))
++ warn ("failed to exec %s: %s\n", cmd, error->message);
++
++ g_free (cmd);
++ return;
++}
++
++/*
++ * gvm_run_command_sync - run the given command, replacing %d with the device
++ * node, %h with the HAL UDI and %m with the given path. Bails out if the
++ * command requires a given %d,%h or %m and this is NULL.
++ *
++ * Returns the exitcode of the command if run and -1 if failed
++ */
++static gint
++gvm_run_command_sync (const char *device, const char *command,
++ const char *path, const char *udi)
++{
++ char *cmd;
++ gint exit_status;
++ GError *error = NULL;
++
++ cmd = gvm_parse_command(device, command, path, udi);
++ if (cmd == NULL) {
++ return -1;
++ }
++ if (!g_spawn_command_line_sync (cmd, NULL, NULL, &exit_status, &error)) {
++ warn ("failed to exec %s: %s\n", cmd, error->message);
++ g_free (cmd);
++ return -1;
++ }
++ g_free (cmd);
++ return exit_status;
+ }
+
+ /*
+@@ -534,30 +577,9 @@
+ * @return TRUE iff the mount was succesful
+ */
+ static gboolean
+-gvm_device_mount (char *device)
++gvm_device_mount (const char *udi,const char *device)
+ {
+- char *argv[3];
+- GError *error = NULL;
+- char *fstab_device;
+- gint exit_status;
+-
+- fstab_device = gvm_get_fstab_path(device);
+- if (fstab_device == NULL) {
+- return FALSE;
+- }
+-
+- argv[0] = BIN_MOUNT;
+- argv[1] = fstab_device;
+- argv[2] = NULL;
+-
+- g_spawn_sync (g_get_home_dir (), argv, NULL, 0, NULL, NULL,
+- NULL, NULL, &exit_status, &error);
+- g_free(fstab_device);
+- if (error) {
+- warn ("failed to exec " BIN_MOUNT ": %s\n", error->message);
+- return FALSE;
+- }
+- return (exit_status == 0);
++ return (gvm_run_command_sync(device , BIN_MOUNT, NULL, udi) == 0);
+ }
+
+ /*
+@@ -569,23 +591,8 @@
+ * @return TRUE iff the mount was succesful
+ */
+ static gboolean
+-gvm_device_unmount (char *device)
+-{
+- char *argv[3];
+- GError *error = NULL;
+- gint exit_status;
+-
+- argv[0] = BIN_UMOUNT;
+- argv[1] = device;
+- argv[2] = NULL;
+-
+- if (!g_spawn_sync (g_get_home_dir (), argv, NULL, 0, NULL,
+- NULL, NULL, NULL, &exit_status, &error)) {
+- warn ("failed to exec " BIN_MOUNT ": %s\n", error->message);
+- return FALSE;
+- }
+-
+- return (exit_status == 0);
++gvm_device_unmount (const char *udi, const char *device) {
++ return (gvm_run_command_sync(device, BIN_UMOUNT, NULL, udi) == 0);
+ }
+
+ /*
+@@ -644,7 +651,7 @@
+ case MOUNT:
+ if (gvm_is_manual_mount(hal_ctx, udi))
+ break;
+- gvm_device_mount (device);
++ gvm_device_mount (udi, device);
+ mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
+ break;
+ case PLAY:
+@@ -721,7 +728,7 @@
+ gvm_ask_mixed (udi);
+ } else if (has_data) {
+ if (config.automount_media && !gvm_is_manual_mount(hal_ctx, udi)) {
+- gvm_device_mount (device);
++ gvm_device_mount (udi,device);
+ mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
+ }
+ } else if (is_blank) {
+@@ -779,7 +786,7 @@
+ dbg ("Added: %s\n", device);
+
+ if (config.automount_drives && !gvm_is_manual_mount(hal_ctx, udi)) {
+- gvm_device_mount (device);
++ gvm_device_mount (udi, device);
+ mounted_volumes_policy_queue =
+ g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
+ }
+@@ -844,7 +851,7 @@
+ dbg ("Added: %s\n", device);
+
+ if (config.automount_drives && !gvm_is_manual_mount(ctx, udi)) {
+- gvm_device_mount (device);
++ gvm_device_mount (udi, device);
+ mounted_volumes_policy_queue =
+ g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
+ }
+@@ -925,7 +932,7 @@
+
+ policy_udi = g_slist_find_custom (mounted_volumes_policy_queue,
+ udi,
+- g_ascii_strcasecmp);
++ (GCompareFunc)g_ascii_strcasecmp);
+ if (policy_udi != NULL) {
+ g_free (policy_udi->data);
+ mounted_volumes_policy_queue = g_slist_delete_link (mounted_volumes_policy_queue,
+@@ -1136,7 +1143,7 @@
+
+ dbg ("mount_all: mounting %s\n", device_file);
+
+- gvm_device_mount (device_file);
++ gvm_device_mount (udi, device_file);
+
+ hal_free_string (device_file);
+ } else
+@@ -1175,7 +1182,7 @@
+
+ dbg ("unmount_all: unmounting %s\n", device_file);
+
+- gvm_device_unmount (device_file);
++ gvm_device_unmount (udi, device_file);
+ hal_free_string (device_file);
+ } else {
+ warn ("no device_file for udi=%s\n", udi);
Modified: packages/gnome-volume-manager/trunk/debian/rules
===================================================================
--- packages/gnome-volume-manager/trunk/debian/rules 2004-11-17 18:08:26 UTC (rev 91)
+++ packages/gnome-volume-manager/trunk/debian/rules 2004-11-17 18:32:05 UTC (rev 92)
@@ -7,6 +7,9 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/gnome.mk
+DEB_CONFIGURE_EXTRA_FLAGS := --with-mount-program "/usr/bin/pmount-hal %h" \
+ --with-umount-program "/usr/bin/pumount %d"
+
common-install-impl::
install -m 755 debian/gnome-volume-manager-gthumb \
$(DEB_DESTDIR)/usr/bin