[Pkg-utopia-commits] r201 - in packages/gnome-volume-manager/trunk/debian: . patches
Sjoerd Simons
sjoerd@costa.debian.org
Fri, 29 Apr 2005 11:46:21 +0000
Author: sjoerd
Date: 2005-04-29 11:46:21 +0000 (Fri, 29 Apr 2005)
New Revision: 201
Modified:
packages/gnome-volume-manager/trunk/debian/changelog
packages/gnome-volume-manager/trunk/debian/patches/00_set_defaults.patch
packages/gnome-volume-manager/trunk/debian/patches/20_specify_programs.patch
packages/gnome-volume-manager/trunk/debian/patches/34_compiler_warnings.patch
packages/gnome-volume-manager/trunk/debian/rules
Log:
Prepare for new upstream release
Modified: packages/gnome-volume-manager/trunk/debian/changelog
===================================================================
--- packages/gnome-volume-manager/trunk/debian/changelog 2005-04-11 19:49:32 UTC (rev 200)
+++ packages/gnome-volume-manager/trunk/debian/changelog 2005-04-29 11:46:21 UTC (rev 201)
@@ -1,3 +1,9 @@
+gnome-volume-manager (1.2.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Sjoerd Simons <sjoerd@debian.org> Fri, 29 Apr 2005 12:07:24 +0200
+
gnome-volume-manager (1.2.0-2) unstable; urgency=low
* debian/patches/11_dbus_reconnect_on_bus_exit.patch
Modified: packages/gnome-volume-manager/trunk/debian/patches/00_set_defaults.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/00_set_defaults.patch 2005-04-11 19:49:32 UTC (rev 200)
+++ packages/gnome-volume-manager/trunk/debian/patches/00_set_defaults.patch 2005-04-29 11:46:21 UTC (rev 201)
@@ -1,6 +1,6 @@
-diff -ruN gnome-volume-manager-old/gnome-volume-manager.schemas.in gnome-volume-manager/gnome-volume-manager.schemas.in
---- gnome-volume-manager-old/gnome-volume-manager.schemas.in 2004-08-13 19:11:56.000000000 +0200
-+++ gnome-volume-manager/gnome-volume-manager.schemas.in 2004-11-18 19:00:52.565531549 +0100
+diff -ruN gnome-volume-manager-1.2.1-old/gnome-volume-manager.schemas.in gnome-volume-manager-1.2.1/gnome-volume-manager.schemas.in
+--- gnome-volume-manager-1.2.1-old/gnome-volume-manager.schemas.in 2005-03-30 23:05:15.000000000 +0200
++++ gnome-volume-manager-1.2.1/gnome-volume-manager.schemas.in 2005-04-29 12:30:46.000000000 +0200
@@ -29,7 +29,7 @@
<key>/schemas/desktop/gnome/volume_manager/autobrowse</key>
<applyto>/desktop/gnome/volume_manager/autobrowse</applyto>
@@ -28,15 +28,6 @@
<locale name="C">
<short>Play inserted video DVDs</short>
<long>Whether, when a video DVD is inserted,
-@@ -122,7 +122,7 @@
- <key>/schemas/desktop/gnome/volume_manager/autoplay_dvd_command</key>
- <applyto>/desktop/gnome/volume_manager/autoplay_dvd_command</applyto>
- <type>string</type>
-- <default>totem %d</default>
-+ <default>totem dvd://</default>
- <locale name="C">
- <short>DVD play command</short>
- <long>Command to run when a video DVD is inserted.</long>
@@ -146,7 +146,7 @@
<key>/schemas/desktop/gnome/volume_manager/autophoto_command</key>
<applyto>/desktop/gnome/volume_manager/autophoto_command</applyto>
Modified: packages/gnome-volume-manager/trunk/debian/patches/20_specify_programs.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/20_specify_programs.patch 2005-04-11 19:49:32 UTC (rev 200)
+++ packages/gnome-volume-manager/trunk/debian/patches/20_specify_programs.patch 2005-04-29 11:46:21 UTC (rev 201)
@@ -1,12 +1,12 @@
-diff -ruN gnome-volume-manager-1.2.0-old/configure gnome-volume-manager-1.2.0/configure
---- gnome-volume-manager-1.2.0-old/configure 2005-03-08 00:03:17.000000000 +0100
-+++ gnome-volume-manager-1.2.0/configure 2005-03-08 11:59:41.628431289 +0100
+diff -ruN gnome-volume-manager-1.2.1-old/configure gnome-volume-manager-1.2.1/configure
+--- gnome-volume-manager-1.2.1-old/configure 2005-03-30 23:54:30.000000000 +0200
++++ gnome-volume-manager-1.2.1/configure 2005-04-29 12:38:02.000000000 +0200
@@ -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 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_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT mkdir_p CPP EGREP USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS 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 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_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT mkdir_p CPP EGREP USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS 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 install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar 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_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT 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 install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar 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_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT 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.
@@ -20,7 +20,76 @@
--with-gconf-source=sourceaddress Config database for installing schema files.
--with-gconf-schema-file-dir=dir Directory for installing schema files.
-@@ -2816,12 +2819,12 @@
+@@ -957,7 +960,7 @@
+ else
+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ fi
+- cd $ac_popdir
++ cd "$ac_popdir"
+ done
+ fi
+
+@@ -2323,8 +2326,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=$?
+@@ -2382,8 +2384,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=$?
+@@ -2499,8 +2500,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=$?
+@@ -2554,8 +2554,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=$?
+@@ -2600,8 +2599,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=$?
+@@ -2645,8 +2643,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=$?
+@@ -2865,12 +2862,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
@@ -36,7 +105,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2831,37 +2834,38 @@
+@@ -2880,37 +2877,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
@@ -84,7 +153,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2871,27 +2875,28 @@
+@@ -2920,27 +2918,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
@@ -119,7 +188,7 @@
# 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
-@@ -2934,13 +2939,33 @@
+@@ -2983,13 +2982,33 @@
@@ -155,7 +224,177 @@
_ACEOF
-@@ -6382,8 +6407,8 @@
+@@ -3678,8 +3697,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=$?
+@@ -3849,8 +3867,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=$?
+@@ -3918,8 +3935,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=$?
+@@ -4064,8 +4080,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=$?
+@@ -4136,8 +4151,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=$?
+@@ -4281,8 +4295,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=$?
+@@ -4340,8 +4353,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=$?
+@@ -4438,8 +4450,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=$?
+@@ -4518,8 +4529,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=$?
+@@ -4583,8 +4593,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=$?
+@@ -4648,8 +4657,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=$?
+@@ -4726,8 +4734,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=$?
+@@ -4791,8 +4798,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=$?
+@@ -4908,8 +4914,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=$?
+@@ -5076,8 +5081,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=$?
+@@ -5210,8 +5214,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=$?
+@@ -5296,8 +5299,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=$?
+@@ -6442,8 +6444,8 @@
s,@CCDEPMODE@,$CCDEPMODE,;t t
s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
@@ -166,9 +405,34 @@
s,@nautilus_path@,$nautilus_path,;t t
s,@ALL_LINGUAS@,$ALL_LINGUAS,;t t
s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
-diff -ruN gnome-volume-manager-1.2.0-old/configure.in gnome-volume-manager-1.2.0/configure.in
---- gnome-volume-manager-1.2.0-old/configure.in 2005-03-07 21:41:45.000000000 +0100
-+++ gnome-volume-manager-1.2.0/configure.in 2005-03-08 11:59:09.231718559 +0100
+@@ -6666,11 +6668,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. */
+@@ -6709,6 +6706,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-1.2.1-old/configure.in gnome-volume-manager-1.2.1/configure.in
+--- gnome-volume-manager-1.2.1-old/configure.in 2005-03-30 23:52:42.000000000 +0200
++++ gnome-volume-manager-1.2.1/configure.in 2005-04-29 12:32:32.000000000 +0200
@@ -8,12 +8,25 @@
AC_PROG_CC
@@ -199,9 +463,9 @@
AC_DEFINE_UNQUOTED([BIN_NAUTILUS], ["${nautilus_path}"], [nautilus command])
-diff -ruN gnome-volume-manager-1.2.0-old/src/manager.c gnome-volume-manager-1.2.0/src/manager.c
---- gnome-volume-manager-1.2.0-old/src/manager.c 2005-03-08 11:57:55.675534000 +0100
-+++ gnome-volume-manager-1.2.0/src/manager.c 2005-03-08 11:59:09.264710120 +0100
+diff -ruN gnome-volume-manager-1.2.1-old/src/manager.c gnome-volume-manager-1.2.1/src/manager.c
+--- gnome-volume-manager-1.2.1-old/src/manager.c 2005-04-29 12:32:32.000000000 +0200
++++ gnome-volume-manager-1.2.1/src/manager.c 2005-04-29 12:32:32.000000000 +0200
@@ -145,20 +145,20 @@
gvm_config_changed, NULL, NULL, NULL);
}
@@ -347,7 +611,7 @@
}
/*
-@@ -472,23 +519,9 @@
+@@ -473,23 +520,9 @@
* @return TRUE iff the mount was succesful
*/
static gboolean
@@ -373,7 +637,7 @@
}
/*
-@@ -500,23 +533,8 @@
+@@ -501,23 +534,8 @@
* @return TRUE iff the mount was succesful
*/
static gboolean
@@ -399,7 +663,7 @@
}
/*
-@@ -577,7 +595,7 @@
+@@ -579,7 +597,7 @@
switch (action) {
case MOUNT:
@@ -408,7 +672,7 @@
mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
break;
case PLAY:
-@@ -654,7 +672,7 @@
+@@ -656,7 +674,7 @@
gvm_ask_mixed (udi);
} else if (has_data) {
if (config.automount_media) {
@@ -417,7 +681,7 @@
mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
}
} else if (is_blank) {
-@@ -712,7 +730,7 @@
+@@ -713,7 +731,7 @@
dbg ("Added: %s\n", device);
if (config.automount_drives) {
@@ -426,7 +690,7 @@
mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
}
}
-@@ -776,7 +794,7 @@
+@@ -777,7 +795,7 @@
dbg ("Added: %s\n", device);
if (config.automount_drives) {
@@ -435,17 +699,8 @@
mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
}
-@@ -856,7 +874,7 @@
+@@ -1072,7 +1090,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,
-@@ -1064,7 +1082,7 @@
-
dbg ("mount_all: mounting %s\n", device_file);
- gvm_device_mount (device_file);
@@ -453,7 +708,7 @@
hal_free_string (device_file);
} else
-@@ -1103,7 +1121,7 @@
+@@ -1111,7 +1129,7 @@
dbg ("unmount_all: unmounting %s\n", device_file);
Modified: packages/gnome-volume-manager/trunk/debian/patches/34_compiler_warnings.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/34_compiler_warnings.patch 2005-04-11 19:49:32 UTC (rev 200)
+++ packages/gnome-volume-manager/trunk/debian/patches/34_compiler_warnings.patch 2005-04-29 11:46:21 UTC (rev 201)
@@ -1,6 +1,6 @@
-diff -ruN gnome-volume-manager-1.1.3-old/src/manager.c gnome-volume-manager-1.1.3/src/manager.c
---- gnome-volume-manager-1.1.3-old/src/manager.c 2005-02-23 15:33:51.000000000 +0100
-+++ gnome-volume-manager-1.1.3/src/manager.c 2005-02-23 15:33:04.000000000 +0100
+diff -ruN gnome-volume-manager-1.2.1-old/src/manager.c gnome-volume-manager-1.2.1/src/manager.c
+--- gnome-volume-manager-1.2.1-old/src/manager.c 2005-04-29 12:39:34.000000000 +0200
++++ gnome-volume-manager-1.2.1/src/manager.c 2005-04-29 12:48:20.000000000 +0200
@@ -20,6 +20,7 @@
#include <gdk/gdkx.h>
#include <dbus/dbus.h>
@@ -9,7 +9,7 @@
#include <libhal.h>
#include <signal.h>
-@@ -257,7 +258,6 @@
+@@ -155,7 +156,6 @@
gvm_parse_command(const char *device, const char *command,
const char *path, const char *udi) {
gchar *new_command;
@@ -17,16 +17,17 @@
GString *exec = g_string_new (NULL);
char *p, *q;
gchar *result, *tmp;
-@@ -383,7 +383,7 @@
- /*FIXME!! A better secondary label....*/
- gtk_message_dialog_format_secondary_text (GTK_DIALOG (askme),
- _("The file \"%s\" on the inserted media is an auto-run"
-- "file."));
-+ "file."), path);
-
+@@ -279,8 +279,7 @@
+ GTK_BUTTONS_NONE,
+ _("Run command from inserted media?"));
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (askme),
+- "%s", _("Do you want to run "
+- "the file \"%s?\""));
++ _("Do you want to run the file \"%s?\""), path);
gtk_dialog_add_buttons (GTK_DIALOG (askme),
GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
-@@ -1225,7 +1225,7 @@
+ _("_Run Command"), GTK_RESPONSE_ACCEPT,
+@@ -1124,7 +1123,7 @@
char *udi;
char *device_file;
char *drive_udi = NULL;
Modified: packages/gnome-volume-manager/trunk/debian/rules
===================================================================
--- packages/gnome-volume-manager/trunk/debian/rules 2005-04-11 19:49:32 UTC (rev 200)
+++ packages/gnome-volume-manager/trunk/debian/rules 2005-04-29 11:46:21 UTC (rev 201)
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-DEB_TAR_SRCDIR=gnome-volume-manager-1.2.0
+DEB_TAR_SRCDIR=gnome-volume-manager-1.2.1
include /usr/share/cdbs/1/rules/tarball.mk
include /usr/share/cdbs/1/rules/debhelper.mk