tags 523505 +pending thanks Hi,
The attached file is the diff for my diff-ext 0.2.3-3.1 NMU. The
associated changelog entry is:
diff-ext (0.2.3-3.1) unstable; urgency=medium
* Non-maintainer upload.
* Add missing Build-Depends on libgconf2-dev and libgnomevfs2-dev to
fix FTBFS. Thanks to Chris Taylor <ch...@code-monkeys.org> for
testing. (Closes: #523505)
.
[Andreas Henriksson]
* 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.
It will be uploaded to DELAYED/2. Please let me know ASAP if you wish
me to cancel it (or simply upload your own fix).
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org
`-
diff -Nru diff-ext-0.2.3/configure.ac diff-ext-0.2.3/configure.ac --- diff-ext-0.2.3/configure.ac 2007-10-03 22:45:33.000000000 +0200 +++ diff-ext-0.2.3/configure.ac 2009-07-30 18:56:39.000000000 +0200 @@ -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) diff -Nru diff-ext-0.2.3/debian/changelog diff-ext-0.2.3/debian/changelog --- diff-ext-0.2.3/debian/changelog 2009-07-30 18:56:39.000000000 +0200 +++ diff-ext-0.2.3/debian/changelog 2009-07-30 18:56:39.000000000 +0200 @@ -1,3 +1,24 @@ +diff-ext (0.2.3-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add missing Build-Depends on libgconf2-dev and libgnomevfs2-dev to fix + FTBFS. Thanks to Chris Taylor <ch...@code-monkeys.org> for testing. + (Closes: #523505) + + [Andreas Henriksson] + * 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. + + -- Chris Lamb <la...@debian.org> Thu, 30 Jul 2009 18:51:21 +0200 + diff-ext (0.2.3-3) unstable; urgency=medium * debian/rules: diff -Nru diff-ext-0.2.3/debian/control diff-ext-0.2.3/debian/control --- diff-ext-0.2.3/debian/control 2009-07-30 18:56:39.000000000 +0200 +++ diff-ext-0.2.3/debian/control 2009-07-30 18:56:39.000000000 +0200 @@ -2,7 +2,7 @@ Section: utils Priority: optional Maintainer: Andrea Veri <bluek...@ubuntu.com> -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, libgconf2-dev, libgnomevfs2-dev 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)
signature.asc
Description: PGP signature
