lp:ubuntu/oneiric/meld

Branch merges

Propose for merging

1 branch proposed for merging into this one.

No branches dependent on this one.

Related source package recipes

1 recipe using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

29. By Julian Taylor on 2011-10-06

* cherrypick a patch from upstream git:
  - Fix-newline-disagreement-on-otherwise-empty-lines.patch (d03a77c805)

28. By Julian Taylor on 2011-09-28

* cherrypick two patches from upstream git:
  - fix-modified-indicator.patch (5f94be6667)
  - fix-save-after-undo.patch (7cf7d4f663)

Merged branch lp:~jtaylor/ubuntu/oneiric/meld/fix-two-undo-bugs

27. By Balint Reczey on 2011-04-07

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

26. By Balint Reczey on 2011-03-22

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

25. By Robert Ancell on 2011-01-19

* New upstream release

[ Iain Buclaw ]
* debian/patches/diff_tree_store.patch:
  - Fix crash trying to insert integers into a text column (LP: #703603)

24. By Balint Reczey on 2010-09-28

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

23. By Balint Reczey on 2010-08-04

[ 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)

22. By Adam Collard on 2010-09-06

fix-chinese-translation.patch: stolen from upstream's GIT. Fix a crash
when launching meld in a zh_CN environment. (LP: #622065)

21. By Balint Reczey on 2010-06-24

[ 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)

20. By Mackenzie Morgan on 2010-05-05

* Merge meld 1.3.1 from Debian Unstable (LP: #417369)
* 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.
* 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.