meld (1.5.3-1ubuntu1) precise; urgency=low

  * cherrypick patches from upstream git:
    - Fix-refresh-action-to-not-reset-modified-flags-close.patch (619de18270)
    - Improve-popup-right-click-behaviour-in-tree-views-cl.patch (fbbb890013)

 -- Julian Taylor <jtaylor@ubuntu.com>  Sun, 25 Mar 2012 20:55:39 +0200

meld (1.5.3-1) experimental; urgency=low

  [ Balint Reczey ]
  * New upstream development release
    - remove AUTHORS file
  * debian/control.in:
    - Added the new homepage
  * debian/rules
    - Don't ship NEWS file as changelog, too

  [ Josselin Mouette ]
  * Replace python-gobject by python-gobject-2.

 -- Balint Reczey <balint@balintreczey.hu>  Sat, 28 Jan 2012 15:50:48 -0700

meld (1.5.2-1) experimental; urgency=low

  [ Balint Reczey ]
  * New upstream development release (Closes: #635303)
  * debian/control.in:
    - Standards-Version is 3.9.2, no changes needed.
    - Allow DM uploads
  * transition from dh_pysupport to dh_python2 (Closes: #635936)
  * depend on Python >= 2.6
  * update debian/watch to check *.tar.xz

  [ Josselin Mouette ]
  * Add missing dependency on patch. Closes: #629824.

 -- Balint Reczey <balint@balintreczey.hu>  Thu, 07 Apr 2011 19:28:14 +0200

meld (1.5.1-1) experimental; urgency=low

  * New upstream development release (Closes: #619078)
    - Start file chooser dialogs from last location (Closes: #388343)
    - Add support for the Fossil SCM

 -- Balint Reczey <balint@balintreczey.hu>  Tue, 22 Mar 2011 17:23:15 +0100

meld (1.5.0-1) experimental; urgency=low

  * New upstream release
    - Use TextBuffer instead of maintaining duplicate copy of text
      (Closes: #602988)
    - Use Subversion's XML status output (Closes: #545359)
    - Use bzr 'short' status for more robust parsing (Closes: #565253)
    - Add a man page (Peter Tyser)
    - Require Python 2.5, Gtk+/PyGtk 2.14, PyGtkSourceView 2.4 (optional)
  * bump version of dependencies
  * depend on python-gobject
  * drop Debian specific man page

 -- Balint Reczey <balint@balintreczey.hu>  Thu, 30 Dec 2010 15:11:35 +0100

meld (1.4.0-1) experimental; urgency=low

  * New upstream release
  * Drop fix-chinese-translation.patch as it has been integrated upstream

 -- Balint Reczey <balint@balintreczey.hu>  Tue, 28 Sep 2010 14:29:19 +0200

meld (1.3.2-2) unstable; urgency=low

  [ Balint Reczey ]
  * debian/control.in:
    - Standards-Version is 3.9.1, no changes needed.

  [Adam Collard]
  * fix-chinese-translation.patch: stolen from upstream's GIT. Fix a crash
    when launching meld in a zh_CN environment. (Closes: #595025)

 -- Balint Reczey <balint@balintreczey.hu>  Wed, 04 Aug 2010 16:56:52 +0200

meld (1.3.2-1) unstable; urgency=low

  [ Josselin Mouette ]
  * vcs-crash.patch: stolen upstream. Fix a crash when using CVS, svn or
    git. Closes: #584554.

  [ Balint Reczey ]
  * New upstream release
    - Added support for diffing a file and a directory (Closes: #567340)
    - Translation updates (Thanks to Holger Wansing) (Closes: #313985)
    - vcs-crash.patch: removed, included upstream.
  * run meld using /usr/bin/python instead of env python (Closes: #551189)

 -- Balint Reczey <balint@balintreczey.hu>  Thu, 24 Jun 2010 23:54:27 +0200

meld (1.3.1-1) unstable; urgency=low

  [ Balint Reczey ]
  * New upstream release (Closes: #562989)
    - Speed up file comparisons and highlighting, significantly improving
      interactive editing performance (Closes: #309070)
    - Modifier keys not reset when focus change (Closes: #470781)
    - Version control filter updates (Closes: #506386)
    - Warp the text cursor to the start of jumped-to diff chunks
      (Closes: #523571)
    - Add RCS support (Closes: #432928)
    - Make CTRL+D and CTRL+E position the cursor(Closes: #523572)
    - Don't stop comparing dirs on read permission error (Closes: #530496)
    - Make Save-on-exit dialog clearer (Closes: #392124)
  * Drop pythonpath.patch as it has been integrated upstream
  * debian/copyright:
    - Update email of the author (Closes: #531632)
  * debian/control.in:
    - Recommend python-gtksourceview2 (Closes: #544840)
    - Add Vcs-* fields
    - Standards-Version is 3.8.4, no changes needed.

  [ Emilio Pozuelo Monfort ]
  * debian/source/format,
    debian/patches/series,
    debian/rules:
    - Convert to source format 3.0 (quilt).
  * debian/patches/sourceview-package.patch:
    - Refreshed to apply cleanly.
  * debian/pycompat:
    - Removed, not needed.

 -- Balint Reczey <balint@balintreczey.hu>  Tue, 20 Apr 2010 00:27:49 +0200

meld (1.3.0-2) unstable; urgency=low

  * 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.

 -- Emilio Pozuelo Monfort <pochu@debian.org>  Tue, 01 Sep 2009 20:16:33 +0200

meld (1.3.0-1) unstable; urgency=low

  * New upstream release (Closes: #528327)
    - Copy/paste behaviour fixes (Closes: #523576)
    - Dotfiles and removals handled in darcs (Closes: #509069)
    - Can handle Mercurial repos (Closes: #428843)
    - Up/Down patch used to skip changes (Closes: #511027)
    - Handle last line when highlighting properly (Closes: #465804)
  * Update message and depends for new python-gtksourceview2 package
  * Resync makefile.patch
  * Remove python-gnome dependency

 -- Ross Burton <ross@debian.org>  Tue, 02 Jun 2009 10:00:20 +0100

meld (1.2.1-1) unstable; urgency=low

  * New upstream release (Closes: #513609, #500629, #473091, #456530, #473487)
  * Refresh makefile.patch
  * pythonpath.patch: prepend instead of append private path (Closes: #471154)
  * Fix menu section

 -- Ross Burton <ross@debian.org>  Wed, 18 Feb 2009 17:42:15 +0000

meld (1.1.5.1-2) unstable; urgency=low

  * Really change python-gnome2-extras to -desktop (Closes: #444350)
  * Also really recommend yelp.

 -- Ross Burton <ross@debian.org>  Fri, 28 Sep 2007 15:46:03 +0100

meld (1.1.5.1-1) unstable; urgency=low

  * New upstream release.
  * Add Recommends to Yelp so that help works (Closes: #421832)
  * When sourceview can't be found, tell the user what package to
    install (Closes: #415683)
  * Change python-gnome2-extras to python-gnome2-desktop

 -- Ross Burton <ross@debian.org>  Tue,  4 Sep 2007 09:20:43 +0100

meld (1.1.5-1) unstable; urgency=low

  * Add Debian GNOME Maintainers to Uploaders; build-dep on gnome-pkg-tools.
  * Cleanups.
  * Update URL in copyright.
  * Wrap build-deps and deps.
  * Use debian/meld.menu instead of debian/menu.
  * Drop dangerous empty postinst.
  * Install manpages via debian/meld.manpages instead of
    DEB_INSTALL_MANPAGES_meld.
  * Bump up Debhelper compatibility level to 5.
  * Update URL in watch file.
  * Add a get-orig-source target to retrieve the upstream source.
  * Add ${misc:Depends}.
  * Set Python compatibility version to 2; add XS and XB-Python-Version.
  * New upstream release.
    - Drop patch "plurals"; doesn't apply anymore and it seems to build fine
      without now.
    - Drop patch "scrollkeeper" and add a rule to drop installed scrollkeeper
      files; partially applied upstream and I don't understand what the
      reminder of the patch was meant to fix.

 -- Loic Minier <lool@dooz.org>  Sat, 09 Jun 2007 20:35:36 +0200

meld (1.1.4-1) unstable; urgency=low

  * Acknowledge NMU
  * New upstream release (Closes: #382055)
    - Tab width fixes (Closes: #372587)

 -- Ross Burton <ross@debian.org>  Fri, 27 Apr 2007 10:02:37 +0100

meld (1.1.3-1.2) unstable; urgency=medium

  * Non-maintainer upload to fix build failure.
  * Remove duplicate plurals for languages with only one nplurals;
    fixes build failure with newer gettext (Closes: #385177).

 -- Thijs Kinkhorst <thijs@debian.org>  Fri, 15 Sep 2006 14:09:05 +0200

meld (1.1.3-1.1) unstable; urgency=low

  * Non-maintainer upload.
  * Update package to the new python policy (Closes: #380868):
    + use dh_pysupport instead of dh_python.
    + remove custom postinst.
  * Bump Standards-Version to 3.7.2.
  * Fix B-D versus B-D-I for cdbs, and debhelper.

 -- Pierre Habouzit <madcoder@debian.org>  Thu, 10 Aug 2006 19:02:41 +0200

meld (1.1.3-1) unstable; urgency=low

  * New upstream release (closes: #355022)
  - remove fr.diff, fixed upstream
  - add scrollkeeper.diff, to fix up Scrollkeeper

 -- Ross Burton <ross@debian.org>  Fri,  3 Mar 2006 10:26:17 +0000

meld (1.1.2-1) unstable; urgency=low

  * New upstream release (closes: #341184)

 -- Ross Burton <ross@debian.org>  Thu,  8 Dec 2005 11:25:19 +0000

meld (1.1.1-2) unstable; urgency=low

  * debian/copyright: Fix FSF address.
  * debian/rules: Package upstream changelog (closes: #337665)

 -- Ross Burton <ross@debian.org>  Sun,  6 Nov 2005 13:13:40 +0000

meld (1.1.1-1) unstable; urgency=low

  * New upstream release.
  * Increase Standards Version.
  
 -- Ross Burton <ross@debian.org>  Sat, 29 Oct 2005 14:33:08 +0100

meld (1.0.0-1) unstable; urgency=low

  * New upstream release (closes: #329628)
  * Recommend python-gnome2-extras for pygtksourceview (closes: #310808)
  * debian/patches/fr.diff: from upstream to fix French translation
  
 -- Ross Burton <ross@debian.org>  Fri, 23 Sep 2005 14:13:58 +0100

meld (0.9.4.1+20050125-4) unstable; urgency=low

  * Add debian/watch
  * Fix typo in man page (closes: #298732)

 -- Ross Burton <ross@debian.org>  Thu, 31 Mar 2005 11:18:16 +0100

meld (0.9.4.1+20050125-3) unstable; urgency=low

  * Build-dep on scrollkeeper (closes: #292950)

 -- Ross Burton <ross@debian.org>  Mon, 31 Jan 2005 15:39:44 +0000

meld (0.9.4.1+20050125-2) unstable; urgency=low

  * Don't install meld.applications, GNOME currently doesn't support
    registering against directory MIME types (closes: #292805)

 -- Ross Burton <ross@debian.org>  Sun, 30 Jan 2005 14:44:27 +0000

meld (0.9.4.1+20050125-1) unstable; urgency=low

  * Snapshot from CVS (closes: #291914)
    - Depends on new libglade (closes: #287167)
  * Move to CDBS
  * Lower-case the synopsis
  
 -- Ross Burton <ross@debian.org>  Fri, 13 Aug 2004 18:31:01 +0100

meld (0.9.4.1-1) unstable; urgency=low

  * New upstream release (closes: #262632)

 -- Ross Burton <ross@debian.org>  Wed, 11 Aug 2004 08:10:28 +0100

meld (0.9.3-1) unstable; urgency=low

  * New upstream release (closes: #253113)
  * Handles both_horiz and -horiz (closes: #218045)

 -- Ross Burton <ross@debian.org>  Mon,  7 Jun 2004 10:57:36 +0100

meld (0.9.2.1-2) unstable; urgency=low

  * Add Build-Depend on intltool (closes: #235090)

 -- Ross Burton <ross@debian.org>  Mon,  1 Mar 2004 12:15:44 +0000

meld (0.9.2.1-1) unstable; urgency=low

  * New upstream release
  * debian/rules: rewrite now upstream makefile uses $DISTDIR
  * debian/menu: add quotes

 -- Ross Burton <ross@debian.org>  Wed, 18 Feb 2004 08:57:29 +0000

meld (0.9.0-1) unstable; urgency=low

  * New upstream release
  * Install upstream changelog
  * Install documentation stylesheet

 -- Ross Burton <ross@debian.org>  Mon, 13 Oct 2003 17:37:08 +0100

meld (0.8.5-1) unstable; urgency=low

  * New upstream release

 -- Ross Burton <ross@debian.org>  Tue,  2 Sep 2003 19:01:26 +0100

meld (0.8.4-2) unstable; urgency=low

  * Rebuild for python 2.3 (closes: #204812)
  * Move to Standard 3.6.0.

 -- Ross Burton <ross@debian.org>  Mon, 11 Aug 2003 11:18:17 +0100

meld (0.8.4-1) unstable; urgency=low

  * New upstream release
  * Cut/Copy/Paste shortcuts now work (closes: #184290)

 -- Ross Burton <ross@debian.org>  Thu, 31 Jul 2003 12:42:08 +0100

meld (0.8.2-1) unstable; urgency=low

  * New upstream release

 -- Ross Burton <ross@debian.org>  Tue, 24 Jun 2003 08:58:17 +0100

meld (0.8.1-1) unstable; urgency=low

  * New upstream release

 -- Ross Burton <ross@debian.org>  Tue, 20 May 2003 15:38:33 +0100

meld (0.7.1-2) unstable; urgency=low

  * debian/control: Move to section 'gnome'.

 -- Ross Burton <ross@debian.org>  Tue, 29 Apr 2003 12:38:42 +0100

meld (0.7.1-1) unstable; urgency=low

  * New upstream release
  * Updated debian/* for new debian.org email address.

 -- Ross Burton <ross@debian.org>  Tue, 29 Apr 2003 11:24:28 +0100

meld (0.7.0-1) unstable; urgency=low

  * New upstream release

 -- Ross Burton <ross@burtonini.com>  Thu, 27 Mar 2003 17:38:03 +0000

meld (0.6.6-2) unstable; urgency=low

  * Move Python code to /usr/lib/meld.
  * Remove /usr/share/meld/*.py[co] in postinst.

 -- Ross Burton <ross@burtonini.com>  Fri, 28 Feb 2003 09:22:19 +0000

meld (0.6.6-1) unstable; urgency=low

  * New upstream release.
  * Bump to debhelper version 4, Standards 3.5.8.
  * Use dh_python.

 -- Ross Burton <ross@burtonini.com>  Fri, 14 Feb 2003 08:55:01 +0000

meld (0.6.4-1) unstable; urgency=low

  * New upstream release

 -- Ross Burton <ross@burtonini.com>  Thu, 30 Jan 2003 11:25:00 +0000

meld (0.6.3-2) unstable; urgency=low

  * Fix directory diff with a patch from upstream. (closes: #169875)

 -- Ross Burton <ross@burtonini.com>  Sat, 21 Dec 2002 15:18:12 +0000

meld (0.6.3-1) unstable; urgency=low

  * New upstream release
  * Require a specific version of python-gtk2, as we expect the new
    layout. (closes: #172048)

 -- Ross Burton <ross@burtonini.com>  Sun, 15 Dec 2002 16:55:56 +0000

meld (0.6.2-1) unstable; urgency=low

  * New upstream release (closes: #171018)
  * This release has included some missing images (closes: #169875)

 -- Ross Burton <ross@burtonini.com>  Wed, 27 Nov 2002 12:37:17 +0000

meld (0.6.1-1) unstable; urgency=low

  * Initial Release. (closes: #163421)

 -- Ross Burton <ross@burtonini.com>  Wed, 13 Nov 2002 08:31:18 +0000
