| 1 |
imediff (3.4.2-1) unstable; urgency=medium |
| 2 |
|
| 3 |
* Fix Lintian tag: old-fsf-address-in-copyright-file |
| 4 |
* Update LICENSE file |
| 5 |
* Update project.license style |
| 6 |
* List Python 3.14 |
| 7 |
* Allow rename to a new directory |
| 8 |
|
| 9 |
-- Osamu Aoki <[email protected]> Mon, 30 Mar 2026 16:15:40 +0900 |
| 10 |
|
| 11 |
imediff (3.4.1-1) unstable; urgency=medium |
| 12 |
|
| 13 |
* Add "git ime --delete" feature. |
| 14 |
* Bump copyright to 2025. |
| 15 |
|
| 16 |
-- Osamu Aoki <[email protected]> Fri, 29 Aug 2025 13:17:17 +0900 |
| 17 |
|
| 18 |
imediff (3.4.0-1) unstable; urgency=medium |
| 19 |
|
| 20 |
* Redesign logging of imediff as an optional behavior to address |
| 21 |
https://github.com/osamuaoki/imediff/issues/11 |
| 22 |
* Redesign short command options of imediff for consistency. |
| 23 |
* Update documentation (tutorial, manpage). |
| 24 |
* Update test scripts. |
| 25 |
* Fixed bug for END/9. |
| 26 |
|
| 27 |
-- Osamu Aoki <[email protected]> Tue, 04 Feb 2025 20:05:11 +0900 |
| 28 |
|
| 29 |
imediff (3.3.2-1) unstable; urgency=medium |
| 30 |
|
| 31 |
* Update git-ime since TUI has no line limitation. |
| 32 |
|
| 33 |
-- Osamu Aoki <[email protected]> Thu, 14 Nov 2024 23:53:30 +0900 |
| 34 |
|
| 35 |
imediff (3.3.1-1) unstable; urgency=medium |
| 36 |
|
| 37 |
* Fix python warning for \s etc. Closes: #1087234 |
| 38 |
|
| 39 |
-- Osamu Aoki <[email protected]> Sun, 10 Nov 2024 21:24:16 +0900 |
| 40 |
|
| 41 |
imediff (3.3-1) unstable; urgency=medium |
| 42 |
|
| 43 |
* Program version bump. |
| 44 |
|
| 45 |
-- Osamu Aoki <[email protected]> Sun, 10 Nov 2024 17:21:15 +0900 |
| 46 |
|
| 47 |
imediff (3.2-1) unstable; urgency=medium |
| 48 |
|
| 49 |
* UI consistency with SPACE (scroll or exit). |
| 50 |
|
| 51 |
-- Osamu Aoki <[email protected]> Sun, 10 Nov 2024 17:08:21 +0900 |
| 52 |
|
| 53 |
imediff (3.1-1) unstable; urgency=medium |
| 54 |
|
| 55 |
* Fixed imediff minor bugs |
| 56 |
* Add pypi-support scripts |
| 57 |
* Add test/00_local_imediff.sh dev-helper scripts |
| 58 |
* Add sample/00_local_imediff_diff3.sh and results |
| 59 |
* Drop outdated reminder on file size limitation |
| 60 |
* Add /WHITE support feature |
| 61 |
* Reasonable -a, -b, -c, -d starting behavior for diff3 |
| 62 |
* Refine Tutorial text. |
| 63 |
|
| 64 |
-- Osamu Aoki <[email protected]> Sat, 09 Nov 2024 21:39:48 +0900 |
| 65 |
|
| 66 |
imediff (3.0-1) unstable; urgency=medium |
| 67 |
|
| 68 |
* Embed version in git-ime. |
| 69 |
* Rewite code to avoid hitting curses library limitations. |
| 70 |
|
| 71 |
-- Osamu Aoki <[email protected]> Thu, 07 Nov 2024 22:13:19 +0900 |
| 72 |
|
| 73 |
imediff (2.11-1) unstable; urgency=medium |
| 74 |
|
| 75 |
* Fix major git-ime regression for changes on a single file. |
| 76 |
* Improve git-ime to cope with renames and deletes. |
| 77 |
* Stop using relative path import for imediff and clean up code. |
| 78 |
* Simplify Debian packaging using quasi-native with auto-commit. |
| 79 |
|
| 80 |
-- Osamu Aoki <[email protected]> Sun, 06 Oct 2024 17:03:25 +0900 |
| 81 |
|
| 82 |
imediff (2.10-1) unstable; urgency=medium |
| 83 |
|
| 84 |
* Update to new upstream version 2.10. |
| 85 |
* revise documentation |
| 86 |
* remove unused function in git-ime |
| 87 |
|
| 88 |
-- Osamu Aoki <[email protected]> Wed, 14 Aug 2024 14:18:48 +0900 |
| 89 |
|
| 90 |
imediff (2.9-1) unstable; urgency=medium |
| 91 |
|
| 92 |
* Updated git-ime |
| 93 |
|
| 94 |
-- Osamu Aoki <[email protected]> Wed, 14 Aug 2024 00:33:17 +0900 |
| 95 |
|
| 96 |
imediff (2.8-1) unstable; urgency=medium |
| 97 |
|
| 98 |
* Update src/imediff/* |
| 99 |
* Update test/* |
| 100 |
* Shuffle files for Linux |
| 101 |
* pyproject.toml migration |
| 102 |
* Update debian/* |
| 103 |
* Don't use setuptools_scm for Debian |
| 104 |
* Remove imediff_install for Debian |
| 105 |
|
| 106 |
-- Osamu Aoki <[email protected]> Sat, 10 Feb 2024 23:26:09 +0900 |
| 107 |
|
| 108 |
imediff (2.7-1) unstable; urgency=medium |
| 109 |
|
| 110 |
* More logging before curses-related crash |
| 111 |
* Update README.md to address curses-related crash |
| 112 |
* Enhance git-ime to use --auto for large file to avoid crash |
| 113 |
* Add and enhance test cases (word diff) |
| 114 |
* Add pybuild-plugin-pyproject |
| 115 |
|
| 116 |
-- Osamu Aoki <[email protected]> Sun, 28 Jan 2024 17:44:25 +0900 |
| 117 |
|
| 118 |
imediff (2.6-1) unstable; urgency=medium |
| 119 |
|
| 120 |
* Fix bug in git-ime for diff split a file into many files ( >8) |
| 121 |
|
| 122 |
-- Osamu Aoki <[email protected]> Sun, 06 Feb 2022 08:25:12 +0900 |
| 123 |
|
| 124 |
imediff (2.5-1) unstable; urgency=medium |
| 125 |
|
| 126 |
* Match lines with whitespace changes. |
| 127 |
* Match lines with partial head or tail string. |
| 128 |
* Fix bug in 3-way merge. |
| 129 |
* Better debug logging. |
| 130 |
* Drop unused i18n/gettext code for the ease of portability |
| 131 |
|
| 132 |
-- Osamu Aoki <[email protected]> Tue, 26 Oct 2021 16:00:06 +0900 |
| 133 |
|
| 134 |
imediff (2.4-6) unstable; urgency=medium |
| 135 |
|
| 136 |
* Disable automatic tagging during git-rebase. |
| 137 |
|
| 138 |
-- Osamu Aoki <[email protected]> Tue, 14 Sep 2021 14:15:49 +0900 |
| 139 |
|
| 140 |
imediff (2.4-5) unstable; urgency=medium |
| 141 |
|
| 142 |
* More CI-test codes. |
| 143 |
* Automatic tagging for git-ime. |
| 144 |
|
| 145 |
-- Osamu Aoki <[email protected]> Tue, 14 Sep 2021 13:41:05 +0900 |
| 146 |
|
| 147 |
imediff (2.4-4) unstable; urgency=medium |
| 148 |
|
| 149 |
* Update description of git-ime. |
| 150 |
* Update documentation for non-Debian/Ubuntu system. |
| 151 |
|
| 152 |
-- Osamu Aoki <[email protected]> Sun, 15 Aug 2021 16:49:12 +0900 |
| 153 |
|
| 154 |
imediff (2.4-3) unstable; urgency=medium |
| 155 |
|
| 156 |
* Fix regression caused by refactoring 1810b81 (2021-06-03) |
| 157 |
commit which caused broken -t option. |
| 158 |
|
| 159 |
-- Osamu Aoki <[email protected]> Wed, 21 Jul 2021 10:57:53 +0900 |
| 160 |
|
| 161 |
imediff (2.4-2) unstable; urgency=medium |
| 162 |
|
| 163 |
* Fix main.py -> __main__.py change left over. |
| 164 |
|
| 165 |
-- Osamu Aoki <[email protected]> Sat, 03 Jul 2021 22:32:58 +0900 |
| 166 |
|
| 167 |
imediff (2.4-1) unstable; urgency=medium |
| 168 |
|
| 169 |
* Fix git-ime bug for the handling of moved file. |
| 170 |
|
| 171 |
-- Osamu Aoki <[email protected]> Sat, 03 Jul 2021 16:39:55 +0900 |
| 172 |
|
| 173 |
imediff (2.3-1) unstable; urgency=medium |
| 174 |
|
| 175 |
[ Debian Janitor ] |
| 176 |
* Trim trailing whitespace. |
| 177 |
* Set upstream metadata fields: Bug-Database, Bug-Submit. |
| 178 |
* Update standards version to 4.5.0, no changes needed. |
| 179 |
|
| 180 |
[ Osamu Aoki ] |
| 181 |
* Bump upstream version to 2.3. |
| 182 |
* dgit compatible git branch tree. |
| 183 |
* Modern static setup.cfg and pyproject.toml with setuptools. |
| 184 |
* Move module source under src/ |
| 185 |
* imediff: factor out create_template |
| 186 |
* imediff: remove tailing spaces in imediff/* |
| 187 |
* imediff: refine UI for non-clean save etc. |
| 188 |
* imediff: update test scripts |
| 189 |
* git-ime: lint with shellcheck |
| 190 |
* git-ime: reorganized to address commit with multiple files |
| 191 |
* doc: update manpage, update README.md |
| 192 |
* Update standards version to 4.5.1 and debhelper-compat to 13. |
| 193 |
|
| 194 |
-- Osamu Aoki <[email protected]> Tue, 29 Jun 2021 13:02:40 +0900 |
| 195 |
|
| 196 |
imediff (2.2-1.1) unstable; urgency=medium |
| 197 |
|
| 198 |
* Non maintainer upload by the Reproducible Builds team. |
| 199 |
* No source change upload to rebuild on buildd with .buildinfo files. |
| 200 |
|
| 201 |
-- Holger Levsen <[email protected]> Sun, 03 Jan 2021 17:52:53 +0100 |
| 202 |
|
| 203 |
imediff (2.2-1) unstable; urgency=medium |
| 204 |
|
| 205 |
* Refactor code and refine "g" key command. |
| 206 |
* Use REVERSE for mode "g" for readability. |
| 207 |
* Ensure clean save and add --sloppy option. |
| 208 |
* Bump policy to 4.3.0 and compat to 12. |
| 209 |
|
| 210 |
-- Osamu Aoki <[email protected]> Sun, 03 Mar 2019 21:15:46 +0900 |
| 211 |
|
| 212 |
imediff (2.1-1) unstable; urgency=medium |
| 213 |
|
| 214 |
* Adjust package dependency for smooth transition from imediff2. |
| 215 |
|
| 216 |
-- Osamu Aoki <[email protected]> Sat, 16 Feb 2019 13:08:00 +0900 |
| 217 |
|
| 218 |
imediff (2.0-1) unstable; urgency=medium |
| 219 |
|
| 220 |
* New upstream release in python3 with diff3 support etc. as imediff. |
| 221 |
Closes: #920810 |
| 222 |
* Add autopkgtest support. |
| 223 |
|
| 224 |
-- Osamu Aoki <[email protected]> Wed, 30 Jan 2019 00:01:23 +0900 |
| 225 |
|
| 226 |
imediff2 (1.1.2.1-2) unstable; urgency=medium |
| 227 |
|
| 228 |
* Ship git-ime and git-ime.1. |
| 229 |
|
| 230 |
-- Osamu Aoki <[email protected]> Sun, 21 Oct 2018 02:45:03 +0900 |
| 231 |
|
| 232 |
imediff2 (1.1.2.1-1) unstable; urgency=medium |
| 233 |
|
| 234 |
* New upstream release by DD with configurable key bindings. |
| 235 |
* Salvage upload. |
| 236 |
* Add safe guards to the 'q' command. Closes: #799865 |
| 237 |
* Update manpage XML source and rebuild it. Closes: #860351 |
| 238 |
* Use source/format 3.0 (quilt) |
| 239 |
* Use "dh $@" in debian/rules. |
| 240 |
|
| 241 |
-- Osamu Aoki <[email protected]> Sun, 21 Oct 2018 01:54:49 +0900 |
| 242 |
|
| 243 |
imediff2 (1.1.2-3) unstable; urgency=medium |
| 244 |
|
| 245 |
* Add dh-python, python-setuptools and python-all-dev to Build-Depends. |
| 246 |
* Correct typo in bug number reference in previous version (1.1.2-2) |
| 247 |
of changelog. Closes: #831966. |
| 248 |
|
| 249 |
-- Kevin Coyner <[email protected]> Wed, 12 Oct 2016 16:22:53 -0400 |
| 250 |
|
| 251 |
imediff2 (1.1.2-2) unstable; urgency=medium |
| 252 |
|
| 253 |
* debian/rules: |
| 254 |
+ Changed build architecture line to fix RC bug FTBFS binary build with no |
| 255 |
binary artifacts found. Closes: #831966. |
| 256 |
+ Changed call to dh_clean -k to dh_prep. |
| 257 |
+ Added build commands to build-arch build-indep. |
| 258 |
* debian/control: |
| 259 |
+ Bumped Standards-Version to 3.9.8. No changes. |
| 260 |
+ Bumped debhelper to >= 9. |
| 261 |
+ Add ${misc:Depends}. |
| 262 |
* Bumped debian/compat to 9. |
| 263 |
|
| 264 |
-- Kevin Coyner <[email protected]> Tue, 11 Oct 2016 06:46:12 -0400 |
| 265 |
|
| 266 |
imediff2 (1.1.2-1.1) unstable; urgency=low |
| 267 |
|
| 268 |
* Non-maintainer upload. |
| 269 |
* Convert to dh_python2 (Closes: #616847). |
| 270 |
* Define homepage field (Closes: #615420). |
| 271 |
|
| 272 |
-- Luca Falavigna <[email protected]> Thu, 30 May 2013 20:25:45 +0200 |
| 273 |
|
| 274 |
imediff2 (1.1.2-1) unstable; urgency=low |
| 275 |
|
| 276 |
* New upstream release. |
| 277 |
* New maintainer. Closes: #425240. |
| 278 |
* Changed debian/copyright to include standard paragraph about GPL. |
| 279 |
* debian/control: |
| 280 |
+ Bumped Standards-Version to 3.7.2. No changes. |
| 281 |
+ Bumped debhelper to >= 5.0.38. |
| 282 |
+ Added homepage. |
| 283 |
+ Changed Build-Depends-Indep to Build-Depends. |
| 284 |
+ Added Build-Depends on python-central and python-all-dev. |
| 285 |
+ Added XB-Python-Version and XS-Python-Version. |
| 286 |
* Bumped debian/compat to 5. |
| 287 |
* Edited debian/watch to look for current versioning style in upstream. Also |
| 288 |
updated to version 3. |
| 289 |
* debian/rules: |
| 290 |
+ Changed to dh_pycentral. |
| 291 |
+ Removed dh_python. |
| 292 |
+ Cleaned up cruft. |
| 293 |
* Added debian/pycompat. |
| 294 |
|
| 295 |
-- Kevin Coyner <[email protected]> Thu, 16 Aug 2007 21:02:40 -0400 |
| 296 |
|
| 297 |
imediff2 (1.1.1-2) unstable; urgency=low |
| 298 |
|
| 299 |
* Orphaning the package. |
| 300 |
|
| 301 |
-- Jarno Elonen <[email protected]> Fri, 18 May 2007 12:18:09 +0300 |
| 302 |
|
| 303 |
imediff2 (1.1.1-1) unstable; urgency=low |
| 304 |
|
| 305 |
* New upstream release |
| 306 |
- Applied some patches by Wolfram Sang. Thank you! |
| 307 |
+ Adds '--new-file' option (like 'diff') |
| 308 |
+ Better error messages |
| 309 |
+ KEY_BACKSPACE goes to previous chunk |
| 310 |
+ '-o file' is not required anymore (for preview, no saving) |
| 311 |
+ help screen shows which color means which file |
| 312 |
|
| 313 |
-- Jarno Elonen <[email protected]> Fri, 10 Feb 2006 19:13:57 +0200 |
| 314 |
|
| 315 |
imediff2 (1.1.0+20041113-1) unstable; urgency=low |
| 316 |
|
| 317 |
* New upstream release (from SVN) |
| 318 |
- typo correction in help file |
| 319 |
|
| 320 |
* Changed watch file to point to Alioth |
| 321 |
|
| 322 |
-- Jarno Elonen <[email protected]> Sat, 13 Nov 2004 01:18:42 +0200 |
| 323 |
|
| 324 |
imediff2 (1.1.0-1) unstable; urgency=low |
| 325 |
|
| 326 |
* New upstream release |
| 327 |
- launch external editor with 'e' |
| 328 |
- more effective keyboard commands |
| 329 |
- documentation license changed from |
| 330 |
GFDL to Public Domain |
| 331 |
|
| 332 |
-- Jarno Elonen <[email protected]> Fri, 22 Oct 2004 22:27:04 +0300 |
| 333 |
|
| 334 |
imediff2 (1.0.2-1) unstable; urgency=low |
| 335 |
|
| 336 |
* New upstream release |
| 337 |
|
| 338 |
* Added a watch file |
| 339 |
|
| 340 |
-- Jarno Elonen <[email protected]> Sun, 10 Oct 2004 02:44:39 +0300 |
| 341 |
|
| 342 |
imediff2 (1.0.1-2) unstable; urgency=low |
| 343 |
|
| 344 |
* Added a watch file |
| 345 |
|
| 346 |
-- Jarno Elonen <[email protected]> Sun, 10 Oct 2004 01:57:17 +0300 |
| 347 |
|
| 348 |
imediff2 (1.0.1-1) unstable; urgency=low |
| 349 |
|
| 350 |
* New upstream release. |
| 351 |
- Fix some screen (re)size problems (closes: #250627) |
| 352 |
|
| 353 |
* _Really_ changed maintainer email address |
| 354 |
|
| 355 |
-- Jarno Elonen <[email protected]> Mon, 24 May 2004 21:16:53 +0300 |
| 356 |
|
| 357 |
imediff2 (1.0-3) unstable; urgency=low |
| 358 |
|
| 359 |
* Copyright update |
| 360 |
* Changed maintainer email address |
| 361 |
|
| 362 |
-- Jarno Elonen <[email protected]> Fri, 16 Jan 2004 11:41:41 +0200 |
| 363 |
|
| 364 |
imediff2 (1.0-2) unstable; urgency=low |
| 365 |
|
| 366 |
* Support for the alternatives system ('/usr/bin/merge2') |
| 367 |
|
| 368 |
* Use the packaging automation provided by dh_python |
| 369 |
|
| 370 |
* First upload to Main (closes: #221135) |
| 371 |
|
| 372 |
-- Jarno Elonen <[email protected]> Sat, 15 Nov 2003 14:46:34 +0200 |
| 373 |
|
| 374 |
imediff2 (1.0-1) unstable; urgency=low |
| 375 |
|
| 376 |
* Initial Release. |
| 377 |
|
| 378 |
-- Jarno Elonen <[email protected]> Sun, 27 Apr 2003 02:11:31 +0300 |