lp:~davewalker/ubuntu/oneiric/diff-ext/831230

Created by Dave Walker and last modified
Get this branch:
bzr branch lp:~davewalker/ubuntu/oneiric/diff-ext/831230
Only Dave Walker can upload to this branch. If you are Dave Walker please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Dave Walker
Status:
Development

Recent revisions

10. By Dave Walker

diff-ext/src/main.c: Remove get_toolbar_items usage, which was removed in
Nautilus 3, fixes FTBFS. (LP: #831230)

9. By Andrea Veri

* Acknowledge NMU, thanks Luk Claes for the patch!
* debian/control:
  - updating my e-mail since my old address is no longer
    available. (Closes: #630818)
  - Bumped Standards-Version to latest 3.8.4.

8. By Luk Claes

* Non-maintainer upload.
* Don't ship .la files (Closes: #621192).

7. By Andrea Veri

* New upstream release.
  - diff-ext do *not* silently fail when a diff tool is
    missing anymore. (Closes: #475586)
* debian/control:
  - diff-ext now recommends meld instead of kdiff
  - libgconf2-dev updated to >= 2.14 as per configure.ac
    requirements.
  - libgnomevfs2-dev updated to >= 2.14 as per configure.ac
    requirements.
  - added a B-D on libgtk2.0-dev as per configure.ac requirements.
  - added a B-D on libglib2.0-dev >= 2.14.0 as per configure.ac
    requirements.
  - added a B-D on intltool preventing a FTBFS cause missing intltool
    scripts.
* debian/compat:
  - bumped to reflect dh level.
* debian/rules:
  - dh_clean -k moved to dh_prep preventing a lintian warning.

6. By Andrew Starr-Bochicchio

* debian/patches/use_meld_by_default.patch:
 - The package already Recommends meld so should use it by default.
   Also changing the Reccommend to kdiff3 would pull in QT/KDE stuff
   for a Nautilus extension. Thanks to PomCompot. (LP: #412382)
* debian/{control, rules, README.source}: Add quilt magic.

5. By Cesare Tirabassi

* Use gconf-2.0 and gnome-vfs-2.0 modules when building (LP: #219121)
  Thanks to Andreas Henriksson <email address hidden> (DBTS 475236)
* debian/control:
  - Add explicit build-dependencies on libgconf2-dev and libgnomevfs2-dev
  - Add meld as a recommends
  - Modify Maintainer value to match the DebianMaintainerField
    specification.

4. By Andrea Veri

* debian/rules:
  - removed --with-gconf-source configure variable (seems to be not
    compatible on some build machines having a not-writable home dir)
    adding a --disable-schemas-install instead. Now schemas won't be
    installed during the build run but *after* using the shipped postinst
    file added in the previous revision. Fixes the FTBFS on amd64, powerpc,
    s390, ia64, m68k, sparc archs. (Closes: #451897)
* debian/copyright:
  - updated upstream's download URL to point to diff-ext's sf project
    downloads page.
* other changes I forgot to add in the 0.2.3-2 changelog's entry are:
  - debian/control:
    - diff-ext now directly depends on gconf2. Lintian warning fixed.
  - debian/rules:
    - make distclean rule updated using the one suggested by lintian.
      Lintian warning fixed.
  - config.sub, config.guess:
    - both updated using the examples provided by the autotools-dev package.
      Lintian won't complain about old config.* files in the upstream tree
      more.

3. By Andrea Veri

* The "*finally* we have a working diff-ext package again" release
* debian/rules:
  - added --with-gconf-source configure option to prevent a
    failing gconf schemas installation causing odd crashes
    on nautilus when diff-ext is installed. (*Really* Closes: #431692)
  - cleaned up a bit deleting useless debhelper autogenerated
    comments.
  - adding a rule to delete de.png file installed by makefiles
    in the wrong policy directory. Using this way preventing
    an autotools run (too big diff file) after an eventual
    Makefile.am change.
  - added an install rule for the new de.xpm file to point
    correctly to /usr/share/pixmaps.
* debian/postinst:
  - added for registering diff-ext's gconf schemas correctly.
* debian/prerm:
  - added for un-registering diff-ext's gconf schemas correctly.
* diff-ext.desktop.in:
  - removed every deprecated field and cleaned it up a bit.
    Desktop-file-validate seems to be happy again now.
* /diff-ext/src/main.c:
  - finally removed the second erroneus g_object_unref line. It was
    helping diff-ext to crash nautilus when installed.
* debian/control:
  - Homepage field has been moved from Description space to his own
    field (new debian policy). Updated Bzr field to point to Xs-Bzr
    instead of old Xs-Vcs-Bzr.
* debian/de.xpm:
  - added and pointed to /usr/share/pixmaps dir. Finally .desktop file
    will be redirected to a working icon path.

2. By Andrea Veri

New upstream release, which fixes "nautilus crashes
when diff-ext is installed" odd bug that made diff-ext unable to
be used ending up with a crash. Bug was forwarded upstream and can
be found on sf.net diff-ext's bug tracker. (1799127 bug number). (Closes: #431692)

1. By Andrea Veri

Import upstream version 0.2.3

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:ubuntu/oneiric/diff-ext
This branch contains Public information 
Everyone can see this information.

Subscribers