~ubuntu-branches/ubuntu/natty/meld/natty

Committer: Bazaar Package Importer
Author(s): Emilio Pozuelo Monfort
Date: 2009-09-01 20:16:33 UTC
Revision ID: james.westby@ubuntu.com-20090901201633-ce8j5fkn5k4ur0na

Tags: 1.3.0-2

http://bugs.debian.org/541557

http://bugs.debian.org/533748

* debian/control.in:
  - Stop recommending python-gnome2-desktop, meld doesn't use any module
    from python-gnome-desktop. Closes: #541557.
  - Stop depending on python-gnome2, recommend it since meld may use
    the gnomevfs module, and recommend python-gconf for the config.
    Closes: #533748.
  - Standards-Version is 3.8.3, no changes needed.
  - Remove dh_scrollkeeper call, it's deprecated now.
  - Build depend on python rather than python-dev.

files modified:
debian/changelog

debian/control

debian/control.in

debian/rules

Show diffs side-by-side

added added

removed removed

debian/control

Build-Depends: debhelper (>= 5),

cdbs,

gnome-pkg-tools

Build-Depends-Indep: python-dev,

Build-Depends-Indep: python,

python-support (>= 0.4.0),

intltool,

scrollkeeper

Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Loic Minier <lool@dooz.org>

Standards-Version: 3.8.0

Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Loic Minier <lool@dooz.org>

Standards-Version: 3.8.3

XS-Python-Version: >= 2.3

Package: meld

Depends: ${python:Depends},

${misc:Depends},

python-gtk2 (>= 2.4),

python-glade2 (>= 2.4),

python-gnome2

Recommends: python-gnome2-desktop, yelp

python-glade2 (>= 2.4)

Recommends: yelp,

python-gnome2,

python-gconf

XB-Python-Version: ${python:Versions}

Description: graphical tool to diff and merge files

Meld is a tool which allows the user to see the changes in, and merge between,

Older »