diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' file-roller-2.30.0/ChangeLog file-roller-2.30.1.1/ChangeLog --- file-roller-2.30.0/ChangeLog 2010-03-29 22:40:47.000000000 +0200 +++ file-roller-2.30.1.1/ChangeLog 2010-04-27 08:55:34.000000000 +0200 @@ -1,6 +1,154 @@ +commit 9bd82ed6b2c47a5329efabb78aa55068582a01c1 +Author: Paolo Bacchilega +Date: 2010-04-27 + + updated for version 2.30.1.1 + +M NEWS +M configure.ac + +commit 7d4c57ff5255fd35a6c6fa4a74d68acb5f5ec3ca +Author: Takao Fujiwara +Date: 2010-03-24 + + Extract multi-byte filename from URI in case of DND. + + [bug #613298] + +M src/fr-command-tar.c +M src/fr-window.c + +commit 29c9d2b1b226929dfe6991351f7e4df1abbb0d00 +Author: Paolo Bacchilega +Date: 2010-04-26 + + updated for verson 2.30.1 + +M NEWS +M configure.ac + +commit 246bd0f5fd688404af6af86ab74537c007e17279 +Author: Peteris Krisjanis +Date: 2010-04-25 + + Updated Latvian translation. + +M po/lv.po + +commit 67d6cc8e8e78e1362d7302cad5da40f87a334540 +Author: Peteris Krisjanis +Date: 2010-04-25 + + Updated Latvian translation. + +M po/lv.po + +commit dcc204b5dfd4113b6490aa0fa39e0796a11e667c +Author: Andika Triwidada +Date: 2010-04-24 + + Updated Indonesian translation + +M po/id.po + +commit 55d10f1152640458af488e69721901ed9776d615 +Author: Carles Ferrando +Date: 2010-04-21 + + Updated Catalan (Valencian) translation + +M po/ca@valencia.po + +commit d8e2500f752b865a404c1d0d0c04d8d605ff8aa9 +Author: Yannig Marchegay +Date: 2010-04-14 + + Occitan translation update + +M po/oc.po + +commit 73697d78c9b9557da4ddb45662fdc9d02b735f92 +Author: Theppitak Karoonboonyanan +Date: 2010-04-13 + + Updated Thai translation. + +M po/th.po + +commit ee88883ad2c3298d4a0a374895b131022a69faa1 +Author: Runa Bhattacharjee +Date: 2010-04-13 + + Typo corrections + +M po/bn_IN.po + +commit c52133b453f69d103ca708c9244096fe6ab26b72 +Author: Josselin Mouette +Date: 2010-04-08 + + Uses dbus-glib but doesn't check for it + + dlg-package-installer.c unconditionally includes dbus/dbus-glib.h, + but configure.ac only checks for dbus-glib-1 if packagekit support + is requested. It should check for it always, to avoid build failures. + + [bug #615127] + +M src/dlg-package-installer.c + +commit c8d375e1d07406b8c8b9cde48b9f4b6c2dad044a +Author: Paolo Bacchilega +Date: 2010-04-08 + + Revert "Uses dbus-glib but doesn't check for it" + + Wrong author in the commit. + This reverts commit eb72724883731cb965c97e4bc307ec3efc57a379. + +M src/dlg-package-installer.c + +commit eb72724883731cb965c97e4bc307ec3efc57a379 +Author: Emilio Pozuelo Monfort +Date: 2010-04-08 + + Uses dbus-glib but doesn't check for it + + dlg-package-installer.c unconditionally includes dbus/dbus-glib.h, + but configure.ac only checks for dbus-glib-1 if packagekit support + is requested. It should check for it always, to avoid build failures. + + [bug #615127] + +M src/dlg-package-installer.c + +commit 17498a1f4b041f0773569f73d24dccb2ee6c9d7c +Author: Edward Sheldrake +Date: 2010-04-03 + + progressbar in statusbar missing with gtk+ 2.20 + +M src/fr-window.c + +commit 83d87d45487cf4dd81d5f1875bf4a7c0d744398f +Author: Wouter Bolsterlee +Date: 2010-03-30 + + Dutch translation updated by Wouter Bolsterlee + +M po/nl.po + +commit 3951c9e6f5d9c38de8d19f9a524dc83363c20e3d +Author: Takayuki KUSANO +Date: 2010-03-30 + + Updated Japanese translation. + +M po/ja.po + commit 1602f42392512a5ff1fb3ede43e9b44be19a71ba Author: Paolo Bacchilega -Date: 2010-03-29 +Date: 2010-03-29 updated for version 2.30.0 diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' file-roller-2.30.0/configure file-roller-2.30.1.1/configure --- file-roller-2.30.0/configure 2010-03-29 22:22:02.000000000 +0200 +++ file-roller-2.30.1.1/configure 2010-04-27 08:46:25.000000000 +0200 @@ -1,12 +1,14 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.64 for file-roller 2.30.0. +# Generated by GNU Autoconf 2.65 for file-roller 2.30.1.1. # # Report bugs to . # +# # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software -# Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. @@ -677,7 +679,8 @@ -exec 7<&0 &1 +test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -699,8 +702,8 @@ # Identity of this package. PACKAGE_NAME='file-roller' PACKAGE_TARNAME='file-roller' -PACKAGE_VERSION='2.30.0' -PACKAGE_STRING='file-roller 2.30.0' +PACKAGE_VERSION='2.30.1.1' +PACKAGE_STRING='file-roller 2.30.1.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller' PACKAGE_URL='' @@ -1513,7 +1516,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures file-roller 2.30.0 to adapt to many kinds of systems. +\`configure' configures file-roller 2.30.1.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1583,7 +1586,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of file-roller 2.30.0:";; + short | recursive ) echo "Configuration of file-roller 2.30.1.1:";; esac cat <<\_ACEOF @@ -1631,7 +1634,7 @@ LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor PKG_CONFIG path to pkg-config utility @@ -1708,8 +1711,8 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -file-roller configure 2.30.0 -generated by GNU Autoconf 2.64 +file-roller configure 2.30.1.1 +generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -1756,7 +1759,7 @@ ac_retval=1 fi eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval + as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1802,7 +1805,7 @@ # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval + as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -1870,7 +1873,7 @@ ac_retval=1 fi eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval + as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -1912,7 +1915,7 @@ fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval + as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -2079,8 +2082,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by file-roller $as_me 2.30.0, which was -generated by GNU Autoconf 2.64. Invocation command line was +It was created by file-roller $as_me 2.30.1.1, which was +generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2333,7 +2336,7 @@ for ac_site_file in "$ac_site_file1" "$ac_site_file2" do test "x$ac_site_file" = xNONE && continue - if test -r "$ac_site_file"; then + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 @@ -2342,9 +2345,9 @@ done if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 $as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in @@ -2763,6 +2766,7 @@ fi + test -d ./--version && rmdir ./--version if test "${ac_cv_path_mkdir+set}" = set; then MKDIR_P="$ac_cv_path_mkdir -p" else @@ -2770,7 +2774,6 @@ # value for MKDIR_P within a source directory, because that will # break other packages using the cache if that directory is # removed, or if the value is a relative name. - test -d ./--version && rmdir ./--version MKDIR_P="$ac_install_sh -d" fi fi @@ -2887,7 +2890,7 @@ # Define the identity of the package. PACKAGE='file-roller' - VERSION='2.30.0' + VERSION='2.30.1.1' cat >>confdefs.h <<_ACEOF @@ -3277,32 +3280,30 @@ ... rest of stderr output deleted ... 10q' conftest.err >conftest.er1 cat conftest.er1 >&5 - rm -f conftest.er1 conftest.err fi + rm -f conftest.er1 conftest.err $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + int main () { -FILE *f = fopen ("conftest.out", "w"); - return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: @@ -3364,10 +3365,10 @@ else ac_file='' fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } if test -z "$ac_file"; then : - $as_echo "$as_me: failed program was:" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 @@ -3375,51 +3376,18 @@ { as_fn_set_status 77 as_fn_error "C compiler cannot create executables See \`config.log' for more details." "$LINENO" 5; }; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } ac_exeext=$ac_cv_exeext -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } - fi - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 $as_echo_n "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" @@ -3452,13 +3420,72 @@ as_fn_error "cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." "$LINENO" 5; } fi -rm -f conftest$ac_cv_exeext +rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 $as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } if test "${ac_cv_objext+set}" = set; then : @@ -3950,8 +3977,8 @@ -macro_version='2.2.6' -macro_revision='1.3012' +macro_version='2.2.6b' +macro_revision='1.3017' @@ -4622,13 +4649,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4625: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4652: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4628: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4655: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4631: output\"" >&5) + (eval echo "\"\$as_me:4658: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5094,7 +5121,7 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -5834,7 +5861,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5837 "configure"' > conftest.$ac_ext + echo '#line 5864 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7330,11 +7357,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7333: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7360: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7337: \$? = $ac_status" >&5 + echo "$as_me:7364: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7499,7 +7526,7 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -7669,11 +7696,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7672: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7699: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7676: \$? = $ac_status" >&5 + echo "$as_me:7703: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7774,11 +7801,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7777: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7804: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7781: \$? = $ac_status" >&5 + echo "$as_me:7808: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7829,11 +7856,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7832: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7859: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7836: \$? = $ac_status" >&5 + echo "$as_me:7863: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7972,6 +7999,7 @@ fi supports_anon_versioning=no case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... @@ -8063,7 +8091,7 @@ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@ -9525,7 +9553,7 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -10212,7 +10240,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10215 "configure" +#line 10243 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10308,7 +10336,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10311 "configure" +#line 10339 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13349,8 +13377,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by file-roller $as_me 2.30.0, which was -generated by GNU Autoconf 2.64. Invocation command line was +This file was extended by file-roller $as_me 2.30.1.1, which was +generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -13390,6 +13418,7 @@ -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit + --config print configuration, then exit -q, --quiet, --silent do not print progress messages -d, --debug don't remove temporary files @@ -13412,10 +13441,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -file-roller config.status 2.30.0 -configured by $0, generated by GNU Autoconf 2.64, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +file-roller config.status 2.30.1.1 +configured by $0, generated by GNU Autoconf 2.65, + with options \\"\$ac_cs_config\\" Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation @@ -13453,6 +13483,8 @@ ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) @@ -13923,7 +13955,7 @@ t delim :nl h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p @@ -13937,7 +13969,7 @@ t nl :delim h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' file-roller-2.30.0/configure.ac file-roller-2.30.1.1/configure.ac --- file-roller-2.30.0/configure.ac 2010-03-29 22:21:51.000000000 +0200 +++ file-roller-2.30.1.1/configure.ac 2010-04-27 08:45:56.000000000 +0200 @@ -2,7 +2,7 @@ AC_PREREQ(2.61) -AC_INIT(file-roller, 2.30.0, [http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller]) +AC_INIT(file-roller, 2.30.1.1, [http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller]) AM_INIT_AUTOMAKE([1.9 foreign]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' file-roller-2.30.0/data/file-roller.desktop file-roller-2.30.1.1/data/file-roller.desktop --- file-roller-2.30.0/data/file-roller.desktop 2010-03-29 22:23:00.000000000 +0200 +++ file-roller-2.30.1.1/data/file-roller.desktop 2010-04-27 08:51:07.000000000 +0200 @@ -10,7 +10,7 @@ Name[be@latin]=Archivaryjus Name[bg]=Работа с архиви Name[bn]=আর্কাইভ ম্যানেজার -Name[bn_IN]=আর্কাইভ ম্যানেজার +Name[bn_IN]=আর্কাইভ পরিচালন ব্যবস্থা Name[br]=Ardoer dielloù Name[bs]=Upravitelj arhivama Name[ca]=Gestor d'arxius @@ -49,7 +49,7 @@ Name[ko]=압축 관리자 Name[ku]=Rêveberê Arşîvê Name[lt]=Archyvų tvarkymo programa -Name[lv]=Arhīvu Pārvaldnieks +Name[lv]=Arhīvu pārvaldnieks Name[mai]=अभिलेख प्रबंधक Name[mg]=Mpandrindra arsiva Name[mk]=Менаџер на архиви @@ -140,7 +140,7 @@ Comment[ko]=압축 파일을 만들고 수정합니다 Comment[ku]=Arşîvekê çêbike an jî biguherîne Comment[lt]=Kurti ir modifikuoti archyvą -Comment[lv]=Izveidot un izmainīt arhīvu +Comment[lv]=Izveidot arhīvus un mainīt to saturu Comment[mai]=अभिलेख बनाबू आओर परिवर्धित करू Comment[mg]=Mamorona sy manova arsiva Comment[mk]=Креирај и измени архива @@ -194,4 +194,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=file-roller X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=2.30.0 +X-GNOME-Bugzilla-Version=2.30.1.1 diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' file-roller-2.30.0/data/file-roller.desktop.in file-roller-2.30.1.1/data/file-roller.desktop.in --- file-roller-2.30.0/data/file-roller.desktop.in 2010-03-29 22:22:54.000000000 +0200 +++ file-roller-2.30.1.1/data/file-roller.desktop.in 2010-04-27 08:51:04.000000000 +0200 @@ -13,4 +13,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=file-roller X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=2.30.0 +X-GNOME-Bugzilla-Version=2.30.1.1 diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' file-roller-2.30.0/debian/changelog file-roller-2.30.1.1/debian/changelog --- file-roller-2.30.0/debian/changelog 2010-04-29 10:16:19.000000000 +0200 +++ file-roller-2.30.1.1/debian/changelog 2010-04-29 10:16:20.000000000 +0200 @@ -1,3 +1,15 @@ +file-roller (2.30.1.1-0ubuntu1) lucid-proposed; urgency=low + + * New upstream release: (LP: #571589) + - Extract multi-byte filename from URI in case of DND. (Takao + Fujiwara) (#613298) + - Fixed build error when dbus is not available. + - Updated translations + * debian/patches/70_autotools.patch: + - refreshed + + -- Didier Roche Wed, 28 Apr 2010 18:53:40 +0200 + file-roller (2.30.0-0ubuntu1) lucid; urgency=low * New upstream version diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' file-roller-2.30.0/debian/control file-roller-2.30.1.1/debian/control --- file-roller-2.30.0/debian/control 2010-04-29 10:16:19.000000000 +0200 +++ file-roller-2.30.1.1/debian/control 2010-04-29 10:16:20.000000000 +0200 @@ -8,7 +8,7 @@ Priority: optional Maintainer: Ubuntu Desktop Team XSBC-Original-Maintainer: Clément Stenac -Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort +Uploaders: Debian GNOME Maintainers Build-Depends: cdbs (>= 0.4.41), quilt, debhelper (>= 5), diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' file-roller-2.30.0/file-roller.spec file-roller-2.30.1.1/file-roller.spec --- file-roller-2.30.0/file-roller.spec 2010-03-29 22:22:54.000000000 +0200 +++ file-roller-2.30.1.1/file-roller.spec 2010-04-27 08:51:04.000000000 +0200 @@ -1,7 +1,7 @@ %define release 6 %define prefix /usr %define name file-roller -%define version 2.30.0 +%define version 2.30.1.1 Summary: An archive manager for GNOME. Name: %{name} diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' file-roller-2.30.0/ltmain.sh file-roller-2.30.1.1/ltmain.sh --- file-roller-2.30.0/ltmain.sh 2010-02-08 21:21:33.000000000 +0100 +++ file-roller-2.30.1.1/ltmain.sh 2010-04-26 20:28:33.000000000 +0200 @@ -1,6 +1,6 @@ # Generated from ltmain.m4sh. -# ltmain.sh (GNU libtool) 2.2.6 +# ltmain.sh (GNU libtool) 2.2.6b # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. @@ -65,7 +65,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4 +# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1 # automake: $automake_version # autoconf: $autoconf_version # @@ -73,9 +73,9 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION="2.2.6 Debian-2.2.6a-4" +VERSION="2.2.6b Debian-2.2.6b-2ubuntu1" TIMESTAMP="" -package_revision=1.3012 +package_revision=1.3017 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' file-roller-2.30.0/NEWS file-roller-2.30.1.1/NEWS --- file-roller-2.30.0/NEWS 2010-03-29 22:38:30.000000000 +0200 +++ file-roller-2.30.1.1/NEWS 2010-04-27 08:45:49.000000000 +0200 @@ -1,3 +1,30 @@ +version 2.30.1.1 +---------------- + + Bugs fixed: + + * Extract multi-byte filename from URI in case of DND. (Takao + Fujiwara) (#613298) + +version 2.30.1 +-------------- + + Bugs fixed: + + * Fixed build error when dbus is not available. (Josselin + Mouette) (#615127) + + New or updated application translations: + + * Bengali INDIA (Runa Bhattacharjee) + * Catalan (Gil Forcada) + * Dutch (Wouter Bolsterlee) + * Indonesian (Andika Triwidada) + * Japanese (KUSANO Takayuki) + * Latviešu (Peteris Krisjanis) + * Occitan (Yannig Marchegay (Kokoyaya)) + * Thai (Theppitak Karoonboonyanan) + version 2.30.0 -------------- diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' file-roller-2.30.0/src/dlg-package-installer.c file-roller-2.30.1.1/src/dlg-package-installer.c --- file-roller-2.30.0/src/dlg-package-installer.c 2010-03-11 18:44:54.000000000 +0100 +++ file-roller-2.30.1.1/src/dlg-package-installer.c 2010-04-08 10:11:51.000000000 +0200 @@ -25,7 +25,11 @@ #include #include #include + +#ifdef ENABLE_PACKAGEKIT #include +#endif /* ENABLE_PACKAGEKIT */ + #include "dlg-package-installer.h" #include "gtk-utils.h" #include "main.h" @@ -76,6 +80,7 @@ } +#ifdef ENABLE_PACKAGEKIT static void packagekit_install_package_call_notify_cb (DBusGProxy *proxy, DBusGProxyCall *call, @@ -216,6 +221,7 @@ installer_data_free (idata); } } +#endif /* ENABLE_PACKAGEKIT */ void @@ -226,8 +232,6 @@ InstallerData *idata; GType command_type; FrCommand *command; - DBusGConnection *connection; - gboolean success = FALSE; idata = g_new0 (InstallerData, 1); idata->window = g_object_ref (window); diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' file-roller-2.30.0/src/fr-command-tar.c file-roller-2.30.1.1/src/fr-command-tar.c --- file-roller-2.30.0/src/fr-command-tar.c 2010-03-11 18:44:54.000000000 +0100 +++ file-roller-2.30.1.1/src/fr-command-tar.c 2010-04-27 08:42:13.000000000 +0200 @@ -168,6 +168,9 @@ fdata->original_path = fdata->full_path + 1; } g_free (name); + name = g_filename_from_utf8 (fdata->original_path, -1, NULL, NULL, NULL); + if (name) + fdata->original_path = name; if (fields[1] != NULL) fdata->link = g_strdup (fields[1]); diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' file-roller-2.30.0/src/fr-window.c file-roller-2.30.1.1/src/fr-window.c --- file-roller-2.30.0/src/fr-window.c 2010-03-11 18:44:55.000000000 +0100 +++ file-roller-2.30.1.1/src/fr-window.c 2010-04-27 08:42:13.000000000 +0200 @@ -4059,6 +4059,8 @@ if (r == GTK_RESPONSE_YES) { char *first_item; char *folder; + char *local_path = NULL; + char *utf8_path = NULL; const char *archive_name; fr_window_free_batch_data (window); @@ -4072,12 +4074,26 @@ if (folder != NULL) fr_window_set_open_default_dir (window, folder); - if ((list->next != NULL) && (folder != NULL)) + if ((list->next != NULL) && (folder != NULL)) { archive_name = file_name_from_path (folder); - else - archive_name = file_name_from_path (first_item); + } + else { + if (uri_is_local (first_item)) { + local_path = g_filename_from_uri (first_item, NULL, NULL); + if (local_path) + utf8_path = g_filename_to_utf8 (local_path, -1, NULL, NULL, NULL); + if (!utf8_path) + utf8_path= g_strdup (first_item); + g_free (local_path); + } + else { + utf8_path = g_strdup (first_item); + } + archive_name = file_name_from_path (utf8_path); + } show_new_archive_dialog (window, archive_name); + g_free (utf8_path); g_free (folder); } @@ -5884,12 +5900,19 @@ window->priv->progress_cid = gtk_statusbar_get_context_id (GTK_STATUSBAR (window->priv->statusbar), "progress"); statusbar = GTK_STATUSBAR (window->priv->statusbar); +#if GTK_CHECK_VERSION (2, 19, 1) + statusbar_box = gtk_statusbar_get_message_area (statusbar); + gtk_box_set_homogeneous (GTK_BOX (statusbar_box), FALSE); + gtk_box_set_spacing (GTK_BOX (statusbar_box), 4); + gtk_box_set_child_packing (GTK_BOX (statusbar_box), statusbar->label, TRUE, TRUE, 0, GTK_PACK_START ); +#else statusbar_box = gtk_hbox_new (FALSE, 4); g_object_ref (statusbar->label); gtk_container_remove (GTK_CONTAINER (statusbar->frame), statusbar->label); gtk_box_pack_start (GTK_BOX (statusbar_box), statusbar->label, TRUE, TRUE, 0); g_object_unref (statusbar->label); gtk_container_add (GTK_CONTAINER (statusbar->frame), statusbar_box); +#endif window->priv->progress_bar = gtk_progress_bar_new (); gtk_progress_bar_set_pulse_step (GTK_PROGRESS_BAR (window->priv->progress_bar), ACTIVITY_PULSE_STEP);