tags 475236 + patch thanks The attached debdiff fixes the extension to work together with nautilus 2.22.x (which is available in experimental).
-- Regards, Andreas Henriksson
diff -u diff-ext-0.2.3/debian/control diff-ext-0.2.3/debian/control --- diff-ext-0.2.3/debian/control +++ diff-ext-0.2.3/debian/control @@ -2,7 +2,7 @@ Section: utils Priority: optional Maintainer: Andrea Veri <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5), libxml-parser-perl, pkg-config, libnautilus-extension-dev, docbook-to-man, libtool +Build-Depends: debhelper (>= 5), libxml-parser-perl, pkg-config, libnautilus-extension-dev (>= 2.22.0), docbook-to-man, libtool Homepage: http://diff-ext.sourceforge.net/ Standards-Version: 3.7.2 Vcs-Bzr: https://code.launchpad.net/~bluekuja/diff-ext/debian.source @@ -10,6 +10,7 @@ Package: diff-ext Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, gconf2 +Recommends: kdiff3 Description: File manager context menu extension to launch comparison tools This shell extension (compatible with nautilus only) makes it possible to launch file comparison tool for 2 or 3 files (depending on the tool) diff -u diff-ext-0.2.3/debian/changelog diff-ext-0.2.3/debian/changelog --- diff-ext-0.2.3/debian/changelog +++ diff-ext-0.2.3/debian/changelog @@ -1,3 +1,19 @@ +diff-ext (0.2.3-3.1) experimental; urgency=low + + * Non-maintainer upload. + * configure.ac, configure: + - Check and use gconf-2.0 and gnome-vfs-2.0 modules when building, since + it's not possible to rely on nautilus dragging these in since 2.22.0. + (Closes: #475236) + * debian/control: + - Add version >= 2.22.0 to libnautilus-extension-dev build-dependency to + make sure this experimental upload gets built against the experimental + version of the library. + - Recommend kdiff3, as this is the default diff tool and diff-ext silently + fails if it can't launch the diff tool. + + -- Andreas Henriksson <[EMAIL PROTECTED]> Fri, 11 Apr 2008 22:01:48 +0200 + diff-ext (0.2.3-3) unstable; urgency=medium * debian/rules: only in patch2: unchanged: --- diff-ext-0.2.3.orig/configure +++ diff-ext-0.2.3/configure @@ -20198,12 +20198,12 @@ pkg_cv_DIFF_EXT_CFLAGS="$DIFF_EXT_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= 2.14.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "libnautilus-extension >= 2.14.0") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= 2.14.0 gconf-2.0 >= 2.14.0 gnome-vfs-2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "libnautilus-extension >= 2.14.0 gconf-2.0 >= 2.14.0 gnome-vfs-2.0") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_DIFF_EXT_CFLAGS=`$PKG_CONFIG --cflags "libnautilus-extension >= 2.14.0" 2>/dev/null` + pkg_cv_DIFF_EXT_CFLAGS=`$PKG_CONFIG --cflags "libnautilus-extension >= 2.14.0 gconf-2.0 >= 2.14.0 gnome-vfs-2.0" 2>/dev/null` else pkg_failed=yes fi @@ -20216,12 +20216,12 @@ pkg_cv_DIFF_EXT_LIBS="$DIFF_EXT_LIBS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= 2.14.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "libnautilus-extension >= 2.14.0") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= 2.14.0 gconf-2.0 >= 2.14.0 gnome-vfs-2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "libnautilus-extension >= 2.14.0 gconf-2.0 >= 2.14.0 gnome-vfs-2.0") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_DIFF_EXT_LIBS=`$PKG_CONFIG --libs "libnautilus-extension >= 2.14.0" 2>/dev/null` + pkg_cv_DIFF_EXT_LIBS=`$PKG_CONFIG --libs "libnautilus-extension >= 2.14.0 gconf-2.0 >= 2.14.0 gnome-vfs-2.0" 2>/dev/null` else pkg_failed=yes fi @@ -20240,14 +20240,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DIFF_EXT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnautilus-extension >= 2.14.0"` + DIFF_EXT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnautilus-extension >= 2.14.0 gconf-2.0 >= 2.14.0 gnome-vfs-2.0"` else - DIFF_EXT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnautilus-extension >= 2.14.0"` + DIFF_EXT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnautilus-extension >= 2.14.0 gconf-2.0 >= 2.14.0 gnome-vfs-2.0"` fi # Put the nasty error message in config.log where it belongs echo "$DIFF_EXT_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (libnautilus-extension >= 2.14.0) were not met: + { { echo "$as_me:$LINENO: error: Package requirements (libnautilus-extension >= 2.14.0 gconf-2.0 >= 2.14.0 gnome-vfs-2.0) were not met: $DIFF_EXT_PKG_ERRORS @@ -20258,7 +20258,7 @@ and DIFF_EXT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements (libnautilus-extension >= 2.14.0) were not met: +echo "$as_me: error: Package requirements (libnautilus-extension >= 2.14.0 gconf-2.0 >= 2.14.0 gnome-vfs-2.0) were not met: $DIFF_EXT_PKG_ERRORS only in patch2: unchanged: --- diff-ext-0.2.3.orig/configure.ac +++ diff-ext-0.2.3/configure.ac @@ -15,7 +15,7 @@ AC_CHECK_FUNCS(nautilus_menu_new) -PKG_CHECK_MODULES(DIFF_EXT, [libnautilus-extension >= 2.14.0]) +PKG_CHECK_MODULES(DIFF_EXT, [libnautilus-extension >= 2.14.0 gconf-2.0 >= 2.14.0 gnome-vfs-2.0]) AC_SUBST(DIFF_EXT_CFLAGS) AC_SUBST(DIFF_EXT_LIBS)
