[Pkg-utopia-commits] r186 - in packages/gnome-volume-manager/trunk/debian: . patches
Sjoerd Simons
sjoerd@costa.debian.org
Fri, 18 Mar 2005 13:14:21 +0100
Author: sjoerd
Date: 2005-03-18 13:14:21 +0100 (Fri, 18 Mar 2005)
New Revision: 186
Added:
packages/gnome-volume-manager/trunk/debian/patches/33_track_cdrom_changes.patch
packages/gnome-volume-manager/trunk/debian/patches/34_compiler_warnings.patch
Removed:
packages/gnome-volume-manager/trunk/debian/patches/08_fr.patch
Modified:
packages/gnome-volume-manager/trunk/debian/changelog
packages/gnome-volume-manager/trunk/debian/patches/20_specify_programs.patch
Log:
* New upstream version
* Suck in the changes done in the ubuntu package
Modified: packages/gnome-volume-manager/trunk/debian/changelog
===================================================================
--- packages/gnome-volume-manager/trunk/debian/changelog 2005-02-15 10:53:59 UTC (rev 185)
+++ packages/gnome-volume-manager/trunk/debian/changelog 2005-03-18 12:14:21 UTC (rev 186)
@@ -1,3 +1,28 @@
+gnome-volume-manager (1.2.0-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/patches/08_fr.patch
+ + Removed. Fixed upstream
+ * Updates from the ubuntu package (Thanks to Martin Pitt):
+ * debian/patches/20_specify_programs.patch:
+ - Adapted to new upstream version.
+ - Regenerated autoconf changes.
+ + Added debian/patches/32_cleanup_debugging.patch:
+ - Remove irritating info.capabilities error messages.
+ - Clean up added/removed messages.
+ + Added debian/patches/33_track_cdrom_changes.patch:
+ - Keep track of the CD-ROMs we already handled change/add events on; this
+ avoids playing audio CDs (and similar stuff) on hald restarts.
+ - gvm_mount_device(): Add device to the mounted list even if mounting
+ fails. With a data volume we don't need to try it again, and with a
+ CD-ROM we want to avoid false "change" events on hald restarts.
+ + Added debian/patches/34_compiler_warnings.patch:
+ - Format string buffer overflow.
+ - Include missing dbus/dbus-glib-lowlevel.h.
+ - Other minor fixes.
+
+ -- Sjoerd Simons <sjoerd@debian.org> Fri, 18 Mar 2005 12:57:18 +0100
+
gnome-volume-manager (1.1.3-2) unstable; urgency=low
* Install the desktop file in /usr/share/control-center-2.0/capplets instead
Deleted: packages/gnome-volume-manager/trunk/debian/patches/08_fr.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/08_fr.patch 2005-02-15 10:53:59 UTC (rev 185)
+++ packages/gnome-volume-manager/trunk/debian/patches/08_fr.patch 2005-03-18 12:14:21 UTC (rev 186)
@@ -1,71 +0,0 @@
-diff -ruN gnome-volume-manager-1.1.3-old/po/fr.po gnome-volume-manager-1.1.3/po/fr.po
---- gnome-volume-manager-1.1.3-old/po/fr.po 2005-02-01 17:49:16.000000000 +0100
-+++ gnome-volume-manager-1.1.3/po/fr.po 2005-02-08 13:23:48.167625211 +0100
-@@ -32,9 +32,8 @@
- msgstr "Montage automatique des média amovibles"
-
- #: gnome-volume-manager.schemas.in.h:4
--#, fuzzy
- msgid "Autorun nautilus"
--msgstr "Lancement automatique du chemin"
-+msgstr "Lancement automatique de nautilus"
-
- #: gnome-volume-manager.schemas.in.h:5
- msgid "Autorun path"
-@@ -70,7 +69,7 @@
-
- #: gnome-volume-manager.schemas.in.h:12
- msgid "Command to run when the eject button on a optical drive is pressed."
--msgstr ""
-+msgstr "Commande à lancer quand le bouton d'éjection d'un lecteur optique est pressé."
-
- #: gnome-volume-manager.schemas.in.h:13
- msgid "DVD play command"
-@@ -78,12 +77,11 @@
-
- #: gnome-volume-manager.schemas.in.h:14
- msgid "Eject command"
--msgstr ""
-+msgstr "Commande d'éjection"
-
- #: gnome-volume-manager.schemas.in.h:15
--#, fuzzy
- msgid "Open nautilus on removeable media insert."
--msgstr "Monter les média amovibles lors de l'_insertion"
-+msgstr "Ouvrir nautilus lors de l'insertion d'un média amovible."
-
- #: gnome-volume-manager.schemas.in.h:16
- msgid "Perform autorun"
-@@ -210,7 +208,7 @@
- #: gnome-volume-properties.glade.h:8
- #, fuzzy
- msgid "Browse _removable media when inserted"
--msgstr "Monter les média amovibles lors de l'_insertion"
-+msgstr "Parcourir les média _amovibles lors de l'insertion"
-
- #: gnome-volume-properties.glade.h:9
- #, fuzzy
-diff -ruN gnome-volume-manager-1.1.3-old/po/fr.po.rej gnome-volume-manager-1.1.3/po/fr.po.rej
---- gnome-volume-manager-1.1.3-old/po/fr.po.rej 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-volume-manager-1.1.3/po/fr.po.rej 2005-02-08 13:21:33.138603300 +0100
-@@ -0,0 +1,20 @@
-+***************
-+*** 207,215 ****
-+ msgstr "<b>Stockage amovible</b>"
-+
-+ #: gnome-volume-properties.glade.h:9
-+- #, fuzzy
-+ msgid "Browse _removable media when inserted"
-+- msgstr "Monter les média amovibles lors de l'_insertion"
-+
-+ #: gnome-volume-properties.glade.h:10
-+ msgid "Command:"
-+--- 205,212 ----
-+ msgstr "<b>Stockage amovible</b>"
-+
-+ #: gnome-volume-properties.glade.h:9
-+ msgid "Browse _removable media when inserted"
-++ msgstr "Parcourir les média _amovibles lors de l'insertion"
-+
-+ #: gnome-volume-properties.glade.h:10
-+ msgid "Command:"
Modified: packages/gnome-volume-manager/trunk/debian/patches/20_specify_programs.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/20_specify_programs.patch 2005-02-15 10:53:59 UTC (rev 185)
+++ packages/gnome-volume-manager/trunk/debian/patches/20_specify_programs.patch 2005-03-18 12:14:21 UTC (rev 186)
@@ -1,12 +1,12 @@
-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-12-18 20:30:20.000000000 +0100
+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
@@ -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_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_files=''
# Initialize some variables set by options.
@@ -20,76 +20,7 @@
--with-gconf-source=sourceaddress Config database for installing schema files.
--with-gconf-schema-file-dir=dir Directory for installing schema files.
-@@ -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
-
-@@ -2311,8 +2314,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 +2372,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 +2488,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 +2542,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 +2587,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 +2631,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 +2845,12 @@
+@@ -2816,12 +2819,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
@@ -105,7 +36,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2863,37 +2860,38 @@
+@@ -2831,37 +2834,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
@@ -153,7 +84,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2903,27 +2901,28 @@
+@@ -2871,27 +2875,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
@@ -188,7 +119,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
-@@ -2966,13 +2965,33 @@
+@@ -2934,13 +2939,33 @@
@@ -224,147 +155,7 @@
_ACEOF
-@@ -3467,8 +3486,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 +3656,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 +3724,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 +3869,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 +3940,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 +4084,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 +4180,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 +4258,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 +4322,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 +4397,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 +4509,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 +4675,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 +4808,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 +4893,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 +6035,8 @@
+@@ -6382,8 +6407,8 @@
s,@CCDEPMODE@,$CCDEPMODE,;t t
s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
@@ -375,34 +166,9 @@
s,@nautilus_path@,$nautilus_path,;t t
s,@ALL_LINGUAS@,$ALL_LINGUAS,;t t
s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
-@@ -6249,11 +6254,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 +6292,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-12-18 20:30:20.000000000 +0100
+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
@@ -8,12 +8,25 @@
AC_PROG_CC
@@ -433,9 +199,9 @@
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-12-18 20:30:20.000000000 +0100
-+++ gnome-volume-manager/src/manager.c 2004-12-18 20:42:19.000000000 +0100
+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
@@ -145,20 +145,20 @@
gvm_config_changed, NULL, NULL, NULL);
}
@@ -581,7 +347,7 @@
}
/*
-@@ -457,23 +504,9 @@
+@@ -472,23 +519,9 @@
* @return TRUE iff the mount was succesful
*/
static gboolean
@@ -607,7 +373,7 @@
}
/*
-@@ -485,23 +518,8 @@
+@@ -500,23 +533,8 @@
* @return TRUE iff the mount was succesful
*/
static gboolean
@@ -633,7 +399,7 @@
}
/*
-@@ -558,7 +576,7 @@
+@@ -577,7 +595,7 @@
switch (action) {
case MOUNT:
@@ -642,7 +408,7 @@
mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
break;
case PLAY:
-@@ -635,7 +653,7 @@
+@@ -654,7 +672,7 @@
gvm_ask_mixed (udi);
} else if (has_data) {
if (config.automount_media) {
@@ -651,7 +417,7 @@
mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
}
} else if (is_blank) {
-@@ -693,7 +711,7 @@
+@@ -712,7 +730,7 @@
dbg ("Added: %s\n", device);
if (config.automount_drives) {
@@ -660,7 +426,7 @@
mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
}
}
-@@ -757,7 +775,7 @@
+@@ -776,7 +794,7 @@
dbg ("Added: %s\n", device);
if (config.automount_drives) {
@@ -669,7 +435,7 @@
mounted_volumes_policy_queue = g_slist_append (mounted_volumes_policy_queue, g_strdup (udi));
}
-@@ -837,7 +855,7 @@
+@@ -856,7 +874,7 @@
policy_udi = g_slist_find_custom (mounted_volumes_policy_queue,
udi,
@@ -678,7 +444,7 @@
if (policy_udi != NULL) {
g_free (policy_udi->data);
mounted_volumes_policy_queue = g_slist_delete_link (mounted_volumes_policy_queue,
-@@ -1045,7 +1063,7 @@
+@@ -1064,7 +1082,7 @@
dbg ("mount_all: mounting %s\n", device_file);
@@ -687,7 +453,7 @@
hal_free_string (device_file);
} else
-@@ -1084,7 +1102,7 @@
+@@ -1103,7 +1121,7 @@
dbg ("unmount_all: unmounting %s\n", device_file);
Added: packages/gnome-volume-manager/trunk/debian/patches/33_track_cdrom_changes.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/33_track_cdrom_changes.patch 2005-02-15 10:53:59 UTC (rev 185)
+++ packages/gnome-volume-manager/trunk/debian/patches/33_track_cdrom_changes.patch 2005-03-18 12:14:21 UTC (rev 186)
@@ -0,0 +1,64 @@
+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:54:46.000000000 +0100
++++ gnome-volume-manager-1.1.3/src/manager.c 2005-02-23 15:55:55.000000000 +0100
+@@ -678,11 +678,9 @@
+ }
+
+ ret = (gvm_run_command_sync(device , BIN_MOUNT, NULL, udi) == 0);
+- if (ret) {
+ /* add to list of all volumes mounted during lifetime */
+ all_mounted_volumes =
+ g_slist_append (all_mounted_volumes, g_strdup (udi));
+- }
+ if (ret && run_policy) {
+ mounted_volumes_policy_queue =
+ g_slist_append (mounted_volumes_policy_queue, g_strdup(udi));
+@@ -815,6 +813,7 @@
+ dbus_bool_t has_audio;
+ dbus_bool_t has_data;
+ dbus_bool_t is_blank;
++ GSList *i;
+
+ has_audio = hal_device_get_property_bool (hal_ctx, udi,
+ "volume.disc.has_audio");
+@@ -831,6 +830,17 @@
+ goto out;
+ }
+
++ /* check whether we already saw the insertion/change of this device
++ * without a removal; this happens on HAL restarts */
++ for (i=all_mounted_volumes; i != NULL; i = g_slist_next (i))
++ if (strcmp (udi, (const char *)i->data) == 0) {
++ dbg ("Detected change event on already handled device, probably due to a hald restart\n");
++ goto out;
++ }
++
++ /* add to the list of mounted volumes */
++ all_mounted_volumes = g_slist_append (all_mounted_volumes, g_strdup (udi));
++
+ if (has_audio && (!has_data)) {
+ gvm_run_cdplayer (device, device, udi);
+ } else if (has_audio && has_data) {
+@@ -974,7 +984,22 @@
+ hal_device_removed (LibHalContext *ctx __attribute__((__unused__)),
+ const char *udi)
+ {
++ GSList *i;
++ GSList *next;
++
+ dbg ("Device removed: %s\n", udi);
++ /* remove from list of all volumes mounted during lifetime */
++
++ for (i=all_mounted_volumes; i != NULL; i = next) {
++ next = g_slist_next (i);
++ if (strcmp (udi, (const char *)i->data) == 0) {
++ g_free (i->data);
++ all_mounted_volumes =
++ g_slist_delete_link (
++ all_mounted_volumes, i);
++ break;
++ }
++ }
+ }
+
+ /** Invoked when device in the Global Device List acquires a new capability.
Added: packages/gnome-volume-manager/trunk/debian/patches/34_compiler_warnings.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/34_compiler_warnings.patch 2005-02-15 10:53:59 UTC (rev 185)
+++ packages/gnome-volume-manager/trunk/debian/patches/34_compiler_warnings.patch 2005-03-18 12:14:21 UTC (rev 186)
@@ -0,0 +1,37 @@
+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
+@@ -20,6 +20,7 @@
+ #include <gdk/gdkx.h>
+ #include <dbus/dbus.h>
+ #include <dbus/dbus-glib.h>
++#include <dbus/dbus-glib-lowlevel.h>
+ #include <libhal.h>
+ #include <signal.h>
+
+@@ -257,7 +258,6 @@
+ 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, *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);
+
+ gtk_dialog_add_buttons (GTK_DIALOG (askme),
+ GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+@@ -1225,7 +1225,7 @@
+ char *udi;
+ char *device_file;
+ char *drive_udi = NULL;
+- gboolean do_mount;
++ gboolean do_mount = FALSE;
+
+ volumes = hal_find_device_by_capability (ctx, "volume", &num_volumes);
+ for (i = 0; i < num_volumes; i++) {