Hello community, here is the log from the commit of package caja-dropbox for openSUSE:Factory checked in at 2015-11-11 10:30:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/caja-dropbox (Old) and /work/SRC/openSUSE:Factory/.caja-dropbox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "caja-dropbox" Changes: -------- --- /work/SRC/openSUSE:Factory/caja-dropbox/caja-dropbox.changes 2015-10-30 13:43:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.caja-dropbox.new/caja-dropbox.changes 2015-11-11 10:30:17.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Nov 5 20:43:01 UTC 2015 - sor.ale...@meowr.ru + +- Update to 1.12.0: + * Adjust the default caja extensions dir. + * Include autogen.sh in tarball. +- Rename package to caja-extension-dropbox. +- Drop dropbox binary from package and rely on dropbox package. +- Add caja-dropbox_no-dropbox-bin.patch. + +------------------------------------------------------------------- @@ -5 +14,0 @@ - Old: ---- caja-dropbox-1.10.0.tar.xz New: ---- caja-dropbox-1.12.0.tar.xz caja-dropbox_no-dropbox-bin.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ caja-dropbox.spec ++++++ --- /var/tmp/diff_new_pack.trTAxU/_old 2015-11-11 10:30:18.000000000 +0100 +++ /var/tmp/diff_new_pack.trTAxU/_new 2015-11-11 10:30:18.000000000 +0100 @@ -16,23 +16,23 @@ # -%define _version 1.10 +%define _version 1.12 Name: caja-dropbox -Version: 1.10.0 +Version: 1.12.0 Release: 0 -License: GPL-3.0+ Summary: Dropbox client integrated into Caja -Url: https://github.com/mate-desktop/caja-dropbox +License: GPL-3.0+ Group: System/GUI/Other +Url: http://mate-desktop.org/ Source: http://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz -BuildRequires: mate-common >= 1.9.0 -BuildRequires: pkgconfig(libcaja-extension) >= 1.9.0 -BuildRequires: python-gtk -BuildRequires: python-docutils +# PATCH-FIX-OPENSUSE caja-dropbox_no-dropbox-bin.patch sor.ale...@meowr.ru -- Strip dropbox binary installation. +Patch0: caja-dropbox_no-dropbox-bin.patch BuildRequires: hicolor-icon-theme +BuildRequires: mate-common >= %{_version} +BuildRequires: python-docutils +BuildRequires: python-gtk BuildRequires: update-desktop-files -Requires: dropbox -Requires: caja >= 1.9.0 +BuildRequires: pkgconfig(libcaja-extension) >= %{_version} %description Dropbox is a free service that lets you bring your photos, docs, and videos @@ -40,8 +40,24 @@ This package integrates dropbox seamless into caja. +%package -n caja-extension-dropbox +Summary: Dropbox client integrated into Caja +Group: System/GUI/Other +Requires: caja >= %{_version} +Requires: dropbox +# caja-dropbox is last seen in openSUSE Leap 42.1. +Provides: caja-dropbox = %{version} +Obsoletes: caja-dropbox < %{version} + +%description -n caja-extension-dropbox +Dropbox is a free service that lets you bring your photos, docs, and videos +anywhere and share them easily. Never email yourself a file again! + +This package integrates dropbox seamless into caja. + %prep %setup -q +%patch0 -p1 %build NOCONFIGURE=1 mate-autogen @@ -50,26 +66,19 @@ %install %make_install - %suse_update_desktop_file -r caja-dropbox Network FileTransfer -%post +%post -n caja-extension-dropbox %desktop_database_post %icon_theme_cache_post -%postun +%postun -n caja-extension-dropbox %desktop_database_postun %icon_theme_cache_postun -%files +%files -n caja-extension-dropbox %defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING NEWS README -%{_bindir}/caja-dropbox +%doc AUTHORS COPYING NEWS README %{_libdir}/caja/extensions-2.0/libcaja-dropbox.* -%{_datadir}/applications/caja-dropbox.desktop -%{_datadir}/caja-dropbox/ -%{_datadir}/caja/extensions/libcaja-dropbox.caja-extension -%{_datadir}/icons/hicolor/*/apps/caja-dropbox.png -%{_mandir}/man1/caja-dropbox.1%{?ext_man} %changelog ++++++ caja-dropbox-1.10.0.tar.xz -> caja-dropbox-1.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-dropbox-1.10.0/ChangeLog new/caja-dropbox-1.12.0/ChangeLog --- old/caja-dropbox-1.10.0/ChangeLog 2015-05-05 11:13:34.000000000 +0200 +++ new/caja-dropbox-1.12.0/ChangeLog 2015-11-04 14:49:45.000000000 +0100 @@ -1,5 +1,51 @@ # Generated by Makefile. Do not edit. +commit d1a267c3c0313d71cde3ba4d5781ba3aad495279 +Author: Clement Lefebvre <clement.lefeb...@linuxmint.com> +Date: Tue Nov 3 15:07:00 2015 +0000 + + 1.12.0 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7aaa741f662a1b177564da0e1b54b915b5ae62b4 +Author: monsta <mon...@inbox.ru> +Date: Fri Oct 30 14:35:14 2015 +0300 + + update NEWS for 1.12 + + NEWS | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit cfd42ab9264243e719c990308b8bd7d29cb210a1 +Author: raveit65 <chat-to...@raveit.de> +Date: Tue Oct 6 19:28:29 2015 +0200 + + pre-bump version to 1.11.0 + + NEWS | 3 +++ + configure.ac | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit cb83ff2b71f4cfc5ddc3719fb7c7cc4b806b7eda +Author: Monsta <mon...@inbox.ru> +Date: Sun Jun 14 18:53:14 2015 +0300 + + adjust the default caja extensions dir + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2506dbebb7b9c03d7fea6fa7b4018004776fb9f8 +Author: Stefano Karapetsas <stef...@karapetsas.com> +Date: Fri Jun 12 12:49:36 2015 +0200 + + Include autogen.sh in tarball + + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit 24ac2134e352bc5bbdd50a6a1327c431a6c4f87f Author: Stefano Karapetsas <stef...@karapetsas.com> Date: Tue May 5 11:12:13 2015 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-dropbox-1.10.0/Makefile.am new/caja-dropbox-1.12.0/Makefile.am --- old/caja-dropbox-1.10.0/Makefile.am 2014-07-17 15:06:31.000000000 +0200 +++ new/caja-dropbox-1.12.0/Makefile.am 2015-10-06 19:26:51.000000000 +0200 @@ -2,7 +2,7 @@ bin_SCRIPTS = caja-dropbox CLEANFILES = $(bin_SCRIPTS) caja-dropbox.1 caja-dropbox.txt -EXTRA_DIST = caja-dropbox.in serializeimages.py caja-dropbox.txt.in docgen.py rst2man.py +EXTRA_DIST = caja-dropbox.in serializeimages.py caja-dropbox.txt.in docgen.py rst2man.py autogen.sh man_MANS = caja-dropbox.1 caja-dropbox: caja-dropbox.in serializeimages.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-dropbox-1.10.0/Makefile.in new/caja-dropbox-1.12.0/Makefile.in --- old/caja-dropbox-1.10.0/Makefile.in 2015-05-05 11:13:30.000000000 +0200 +++ new/caja-dropbox-1.12.0/Makefile.in 2015-11-04 14:49:27.000000000 +0100 @@ -357,7 +357,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} bin_SCRIPTS = caja-dropbox CLEANFILES = $(bin_SCRIPTS) caja-dropbox.1 caja-dropbox.txt -EXTRA_DIST = caja-dropbox.in serializeimages.py caja-dropbox.txt.in docgen.py rst2man.py +EXTRA_DIST = caja-dropbox.in serializeimages.py caja-dropbox.txt.in docgen.py rst2man.py autogen.sh man_MANS = caja-dropbox.1 SUBDIRS = data src all: config.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-dropbox-1.10.0/NEWS new/caja-dropbox-1.12.0/NEWS --- old/caja-dropbox-1.10.0/NEWS 2015-05-05 11:10:33.000000000 +0200 +++ new/caja-dropbox-1.12.0/NEWS 2015-11-04 14:42:46.000000000 +0100 @@ -1,3 +1,9 @@ +caja-dropbox 1.12.0 +========================== + + * Adjust the default caja extensions dir + * Include autogen.sh in tarball + caja-dropbox 1.10.0 ========================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-dropbox-1.10.0/aclocal.m4 new/caja-dropbox-1.12.0/aclocal.m4 --- old/caja-dropbox-1.10.0/aclocal.m4 2015-05-05 11:13:29.000000000 +0200 +++ new/caja-dropbox-1.12.0/aclocal.m4 2015-11-04 14:49:24.000000000 +0100 @@ -318,9 +318,10 @@ # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl -# Expand $ac_aux_dir to an absolute path. -am_aux_dir=`cd "$ac_aux_dir" && pwd` +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` ]) # AM_CONDITIONAL -*- Autoconf -*- @@ -787,8 +788,7 @@ END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi -]) +fi]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-dropbox-1.10.0/autogen.sh new/caja-dropbox-1.12.0/autogen.sh --- old/caja-dropbox-1.10.0/autogen.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/caja-dropbox-1.12.0/autogen.sh 2015-10-06 19:26:51.000000000 +0200 @@ -0,0 +1,25 @@ +#!/bin/sh +# Run this to generate all the initial makefiles, etc. + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +PKG_NAME="caja-dropbox" + +(test -f $srcdir/configure.ac) || { + echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" + echo " top-level $PKG_NAME directory" + exit 1 +} + +which mate-autogen || { + echo "You need to install mate-common from the MATE Git" + exit 1 +} + +REQUIRED_AUTOMAKE_VERSION=1.9 +USE_MATE2_MACROS=1 +USE_COMMON_DOC_BUILD=yes + +. mate-autogen + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-dropbox-1.10.0/config.sub new/caja-dropbox-1.12.0/config.sub --- old/caja-dropbox-1.10.0/config.sub 2015-05-05 11:13:30.000000000 +0200 +++ new/caja-dropbox-1.12.0/config.sub 2015-11-04 14:49:27.000000000 +0100 @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2014-09-11' +timestamp='2014-07-28' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -302,7 +302,6 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | riscv32 | riscv64 \ | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ @@ -1017,7 +1016,7 @@ ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-dropbox-1.10.0/configure new/caja-dropbox-1.12.0/configure --- old/caja-dropbox-1.10.0/configure 2015-05-05 11:13:29.000000000 +0200 +++ new/caja-dropbox-1.12.0/configure 2015-11-04 14:49:25.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for caja-dropbox 1.10.0. +# Generated by GNU Autoconf 2.69 for caja-dropbox 1.12.0. # # Report bugs to <http://www.mate-desktop.org/>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='caja-dropbox' PACKAGE_TARNAME='caja-dropbox' -PACKAGE_VERSION='1.10.0' -PACKAGE_STRING='caja-dropbox 1.10.0' +PACKAGE_VERSION='1.12.0' +PACKAGE_STRING='caja-dropbox 1.12.0' PACKAGE_BUGREPORT='http://www.mate-desktop.org/' PACKAGE_URL='' @@ -1333,7 +1333,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 caja-dropbox 1.10.0 to adapt to many kinds of systems. +\`configure' configures caja-dropbox 1.12.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1403,7 +1403,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of caja-dropbox 1.10.0:";; + short | recursive ) echo "Configuration of caja-dropbox 1.12.0:";; esac cat <<\_ACEOF @@ -1520,7 +1520,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -caja-dropbox configure 1.10.0 +caja-dropbox configure 1.12.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1798,7 +1798,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by caja-dropbox $as_me 1.10.0, which was +It was created by caja-dropbox $as_me 1.12.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2348,8 +2348,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# Expand $ac_aux_dir to an absolute path. -am_aux_dir=`cd "$ac_aux_dir" && pwd` +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -2662,7 +2662,7 @@ # Define the identity of the package. PACKAGE='caja-dropbox' - VERSION='1.10.0' + VERSION='1.12.0' cat >>confdefs.h <<_ACEOF @@ -2874,7 +2874,6 @@ - ac_config_headers="$ac_config_headers config.h" @@ -4810,8 +4809,7 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len" && \ - test undefined != "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -5212,6 +5210,10 @@ fi ;; +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -5250,11 +5252,11 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -6348,19 +6350,12 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in - *x86-64*) - LD="${LD-ld} -m elf32_x86_64" - ;; - *) - LD="${LD-ld} -m elf_i386" - ;; - esac + LD="${LD-ld} -m elf_i386" ;; - powerpc64le-*) + powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" ;; - powerpc64-*) + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -6379,10 +6374,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*) + powerpcle-*linux*) LD="${LD-ld} -m elf64lppc" ;; - powerpc-*) + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -8190,7 +8185,7 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -8668,9 +8663,6 @@ openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - link_all_deplibs=no - ;; esac ld_shlibs=yes @@ -8892,7 +8884,7 @@ fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -9069,7 +9061,6 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@ -9523,7 +9514,7 @@ link_all_deplibs=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -10360,6 +10351,17 @@ esac ;; +gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -10476,7 +10478,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -10525,10 +10527,14 @@ # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -10540,18 +10546,6 @@ dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -12107,7 +12101,7 @@ CAJA_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libcaja-extension` fi if test -z "$CAJA_EXTENSION_DIR"; then - CAJA_EXTENSION_DIR='${exec_prefix}/lib/caja/extension-1.0' + CAJA_EXTENSION_DIR='${exec_prefix}/lib/caja/extensions-2.0' fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${CAJA_EXTENSION_DIR}" >&5 @@ -12677,7 +12671,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by caja-dropbox $as_me 1.10.0, which was +This file was extended by caja-dropbox $as_me 1.12.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12743,7 +12737,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -caja-dropbox config.status 1.10.0 +caja-dropbox config.status 1.12.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-dropbox-1.10.0/configure.ac new/caja-dropbox-1.12.0/configure.ac --- old/caja-dropbox-1.10.0/configure.ac 2015-05-05 11:10:29.000000000 +0200 +++ new/caja-dropbox-1.12.0/configure.ac 2015-11-04 14:42:46.000000000 +0100 @@ -1,6 +1,6 @@ # Initialization -AC_INIT([caja-dropbox], [1.10.0], [http://www.mate-desktop.org/]) +AC_INIT([caja-dropbox], [1.12.0], [http://www.mate-desktop.org/]) AM_INIT_AUTOMAKE([1.9 tar-ustar dist-xz foreign no-dist-gzip]) @@ -88,7 +88,7 @@ CAJA_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libcaja-extension` fi if test -z "$CAJA_EXTENSION_DIR"; then - CAJA_EXTENSION_DIR='${exec_prefix}/lib/caja/extension-1.0' + CAJA_EXTENSION_DIR='${exec_prefix}/lib/caja/extensions-2.0' fi AC_MSG_RESULT([${CAJA_EXTENSION_DIR}]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-dropbox-1.10.0/ltmain.sh new/caja-dropbox-1.12.0/ltmain.sh --- old/caja-dropbox-1.10.0/ltmain.sh 2015-05-05 11:13:27.000000000 +0200 +++ new/caja-dropbox-1.12.0/ltmain.sh 2015-11-04 14:49:21.000000000 +0100 @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.11 +# $progname: (GNU libtool) 2.4.2 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1.11" +VERSION=2.4.2 TIMESTAMP="" package_revision=1.3337 @@ -6124,10 +6124,7 @@ case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; - link) - libs="$deplibs %DEPLIBS%" - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; + link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi if test "$linkmode,$pass" = "lib,dlpreopen"; then @@ -6447,19 +6444,19 @@ # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps ; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done continue fi # $pass = conv @@ -7352,9 +7349,6 @@ revision="$number_minor" lt_irix_increment=no ;; - *) - func_fatal_configuration "$modename: unknown library version type \`$version_type'" - ;; esac ;; no) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-dropbox-1.10.0/m4/libtool.m4 new/caja-dropbox-1.12.0/m4/libtool.m4 --- old/caja-dropbox-1.10.0/m4/libtool.m4 2015-05-05 11:13:28.000000000 +0200 +++ new/caja-dropbox-1.12.0/m4/libtool.m4 2015-11-04 14:49:22.000000000 +0100 @@ -1324,19 +1324,12 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in - *x86-64*) - LD="${LD-ld} -m elf32_x86_64" - ;; - *) - LD="${LD-ld} -m elf_i386" - ;; - esac + LD="${LD-ld} -m elf_i386" ;; - powerpc64le-*) + powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" ;; - powerpc64-*) + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1355,10 +1348,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*) + powerpcle-*linux*) LD="${LD-ld} -m elf64lppc" ;; - powerpc-*) + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1701,8 +1694,7 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len" && \ - test undefined != "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -2526,6 +2518,17 @@ esac ;; +gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -2642,7 +2645,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -2672,10 +2675,14 @@ # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2687,18 +2694,6 @@ dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -3258,6 +3253,10 @@ fi ;; +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3296,11 +3295,11 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4048,7 +4047,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4112,7 +4111,7 @@ ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4347,7 +4346,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -4589,9 +4588,6 @@ ;; esac ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4654,9 +4650,6 @@ openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4878,7 +4871,7 @@ fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5055,7 +5048,6 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -5360,7 +5352,7 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -6240,6 +6232,9 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; + gnu*) + ;; + haiku*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -6401,7 +6396,7 @@ _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler ++++++ caja-dropbox_no-dropbox-bin.patch ++++++ --- a/Makefile.am +++ b/Makefile.am @@ -1,19 +1,9 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -bin_SCRIPTS = caja-dropbox -CLEANFILES = $(bin_SCRIPTS) caja-dropbox.1 caja-dropbox.txt +CLEANFILES = caja-dropbox.txt EXTRA_DIST = caja-dropbox.in serializeimages.py caja-dropbox.txt.in docgen.py rst2man.py autogen.sh -man_MANS = caja-dropbox.1 -caja-dropbox: caja-dropbox.in serializeimages.py - python serializeimages.py $(PACKAGE_VERSION) $(datadir)/applications < caja-dropbox.in > caja-dropbox - chmod +x caja-dropbox - -caja-dropbox.1: caja-dropbox.txt.in caja-dropbox docgen.py - python docgen.py $(PACKAGE_VERSION) caja-dropbox.txt.in caja-dropbox.txt - $(RST2MAN) caja-dropbox.txt > caja-dropbox.1 - -SUBDIRS = data src +SUBDIRS = src dist-hook: @if test -d "$(srcdir)/.git"; \
