imediff (2.6-1) unstable; urgency=medium

  * Fix bug in git-ime for diff split a file into many files ( >8)

 -- Osamu Aoki <osamu@debian.org>  Sun, 06 Feb 2022 08:25:12 +0900

imediff (2.5-1) unstable; urgency=medium

  * Match lines with whitespace changes.
  * Match lines with partial head or tail string.
  * Fix bug in 3-way merge.
  * Better debug logging.
  * Drop unused i18n/gettext code for the ease of portability

 -- Osamu Aoki <osamu@debian.org>  Tue, 26 Oct 2021 16:00:06 +0900

imediff (2.4-6) unstable; urgency=medium

  * Disable automatic tagging during git-rebase.

 -- Osamu Aoki <osamu@debian.org>  Tue, 14 Sep 2021 14:15:49 +0900

imediff (2.4-5) unstable; urgency=medium

  * More CI-test codes.
  * Automatic tagging for git-ime.

 -- Osamu Aoki <osamu@debian.org>  Tue, 14 Sep 2021 13:41:05 +0900

imediff (2.4-4) unstable; urgency=medium

  * Update description of git-ime.
  * Update documentation for non-Debian/Ubuntu system.

 -- Osamu Aoki <osamu@debian.org>  Sun, 15 Aug 2021 16:49:12 +0900

imediff (2.4-3) unstable; urgency=medium

  * Fix regression caused by refactoring 1810b81 (2021-06-03)
    commit which caused broken -t option.

 -- Osamu Aoki <osamu@debian.org>  Wed, 21 Jul 2021 10:57:53 +0900

imediff (2.4-2) unstable; urgency=medium

  * Fix main.py -> __main__.py change left over.

 -- Osamu Aoki <osamu@debian.org>  Sat, 03 Jul 2021 22:32:58 +0900

imediff (2.4-1) unstable; urgency=medium

  * Fix git-ime bug for the handling of moved file.

 -- Osamu Aoki <osamu@debian.org>  Sat, 03 Jul 2021 16:39:55 +0900

imediff (2.3-1) unstable; urgency=medium

  [ Debian Janitor ]
  * Trim trailing whitespace.
  * Set upstream metadata fields: Bug-Database, Bug-Submit.
  * Update standards version to 4.5.0, no changes needed.

  [ Osamu Aoki ]
  * Bump upstream version to 2.3.
  * dgit compatible git branch tree.
  * Modern static setup.cfg and pyproject.toml with setuptools.
  * Move module source under src/
  * imediff: factor out create_template
  * imediff: remove tailing spaces in imediff/*
  * imediff: refine UI for non-clean save etc.
  * imediff: update test scripts
  * git-ime: lint with shellcheck
  * git-ime: reorganized to address commit with multiple files
  * doc: update manpage, update README.md
  * Update standards version to 4.5.1 and debhelper-compat to 13.

 -- Osamu Aoki <osamu@debian.org>  Tue, 29 Jun 2021 13:02:40 +0900

imediff (2.2-1.1) unstable; urgency=medium

  * Non maintainer upload by the Reproducible Builds team.
  * No source change upload to rebuild on buildd with .buildinfo files.

 -- Holger Levsen <holger@debian.org>  Sun, 03 Jan 2021 17:52:53 +0100

imediff (2.2-1) unstable; urgency=medium

  * Refactor code and refine "g" key command.
  * Use REVERSE for mode "g" for readability.
  * Ensure clean save and add --sloppy option.
  * Bump policy to 4.3.0 and compat to 12.

 -- Osamu Aoki <osamu@debian.org>  Sun, 03 Mar 2019 21:15:46 +0900

imediff (2.1-1) unstable; urgency=medium

  * Adjust package dependency for smooth transition from imediff2.

 -- Osamu Aoki <osamu@debian.org>  Sat, 16 Feb 2019 13:08:00 +0900

imediff (2.0-1) unstable; urgency=medium

  * New upstream release in python3 with diff3 support etc. as imediff.
    Closes: #920810
  * Add autopkgtest support.

 -- Osamu Aoki <osamu@debian.org>  Wed, 30 Jan 2019 00:01:23 +0900

imediff2 (1.1.2.1-2) unstable; urgency=medium

  * Ship git-ime and git-ime.1.

 -- Osamu Aoki <osamu@debian.org>  Sun, 21 Oct 2018 02:45:03 +0900

imediff2 (1.1.2.1-1) unstable; urgency=medium

  * New upstream release by DD with configurable key bindings.
  * Salvage upload.
  * Add safe guards to the 'q' command.  Closes: #799865
  * Update manpage XML source and rebuild it.  Closes: #860351
  * Use source/format 3.0 (quilt)
  * Use "dh $@" in debian/rules.

 -- Osamu Aoki <osamu@debian.org>  Sun, 21 Oct 2018 01:54:49 +0900

imediff2 (1.1.2-3) unstable; urgency=medium

  * Add dh-python, python-setuptools and python-all-dev to Build-Depends.
  * Correct typo in bug number reference in previous version (1.1.2-2)
    of changelog.  Closes: #831966.

 -- Kevin Coyner <kcoyner@debian.org>  Wed, 12 Oct 2016 16:22:53 -0400

imediff2 (1.1.2-2) unstable; urgency=medium

  * debian/rules:
    + Changed build architecture line to fix RC bug FTBFS binary build with no
      binary artifacts found. Closes: #831966.
    + Changed call to dh_clean -k to dh_prep.
    + Added build commands to build-arch build-indep.
  * debian/control:
    + Bumped Standards-Version to 3.9.8. No changes.
    + Bumped debhelper to >= 9.
    + Add ${misc:Depends}.
  * Bumped debian/compat to 9.

 -- Kevin Coyner <kcoyner@debian.org>  Tue, 11 Oct 2016 06:46:12 -0400

imediff2 (1.1.2-1.1) unstable; urgency=low

  * Non-maintainer upload.
  * Convert to dh_python2 (Closes: #616847).
  * Define homepage field (Closes: #615420).

 -- Luca Falavigna <dktrkranz@debian.org>  Thu, 30 May 2013 20:25:45 +0200

imediff2 (1.1.2-1) unstable; urgency=low

  * New upstream release.
  * New maintainer. Closes: #425240.
  * Changed debian/copyright to include standard paragraph about GPL.
  * debian/control:
    + Bumped Standards-Version to 3.7.2. No changes.
    + Bumped debhelper to >= 5.0.38.
    + Added homepage.
    + Changed Build-Depends-Indep to Build-Depends.
    + Added Build-Depends on python-central and python-all-dev.
    + Added XB-Python-Version and XS-Python-Version.
  * Bumped debian/compat to 5.
  * Edited debian/watch to look for current versioning style in upstream. Also
    updated to version 3.
  * debian/rules:
    + Changed to dh_pycentral.
    + Removed dh_python.
    + Cleaned up cruft.
  * Added debian/pycompat.

 -- Kevin Coyner <kcoyner@debian.org>  Thu, 16 Aug 2007 21:02:40 -0400

imediff2 (1.1.1-2) unstable; urgency=low

  * Orphaning the package.

 -- Jarno Elonen <elonen@debian.org>  Fri, 18 May 2007 12:18:09 +0300

imediff2 (1.1.1-1) unstable; urgency=low

  * New upstream release
    - Applied some patches by Wolfram Sang. Thank you!
      + Adds '--new-file' option (like 'diff')
      + Better error messages
      + KEY_BACKSPACE goes to previous chunk
      + '-o file' is not required anymore (for preview, no saving)
      + help screen shows which color means which file

 -- Jarno Elonen <elonen@debian.org>  Fri, 10 Feb 2006 19:13:57 +0200

imediff2 (1.1.0+20041113-1) unstable; urgency=low

  * New upstream release (from SVN)
    - typo correction in help file

  * Changed watch file to point to Alioth

 -- Jarno Elonen <elonen@debian.org>  Sat, 13 Nov 2004 01:18:42 +0200

imediff2 (1.1.0-1) unstable; urgency=low

  * New upstream release
    - launch external editor with 'e'
    - more effective keyboard commands
    - documentation license changed from
      GFDL to Public Domain

 -- Jarno Elonen <elonen@debian.org>  Fri, 22 Oct 2004 22:27:04 +0300

imediff2 (1.0.2-1) unstable; urgency=low

  * New upstream release

  * Added a watch file

 -- Jarno Elonen <elonen@debian.org>  Sun, 10 Oct 2004 02:44:39 +0300

imediff2 (1.0.1-2) unstable; urgency=low

  * Added a watch file

 -- Jarno Elonen <elonen@debian.org>  Sun, 10 Oct 2004 01:57:17 +0300

imediff2 (1.0.1-1) unstable; urgency=low

  * New upstream release.
    - Fix some screen (re)size problems (closes: #250627)

  * _Really_ changed maintainer email address

 -- Jarno Elonen <elonen@debian.org>  Mon, 24 May 2004 21:16:53 +0300

imediff2 (1.0-3) unstable; urgency=low

  * Copyright update
  * Changed maintainer email address

 -- Jarno Elonen <elonen@debian.org>  Fri, 16 Jan 2004 11:41:41 +0200

imediff2 (1.0-2) unstable; urgency=low

  * Support for the alternatives system ('/usr/bin/merge2')

  * Use the packaging automation provided by dh_python

  * First upload to Main (closes: #221135)

 -- Jarno Elonen <elonen@iki.fi>  Sat, 15 Nov 2003 14:46:34 +0200

imediff2 (1.0-1) unstable; urgency=low

  * Initial Release.

 -- Jarno Elonen <elonen@iki.fi>  Sun, 27 Apr 2003 02:11:31 +0300
