lp:~mterry/meld/ubuntu-1.4.0

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #622065: Error in Chinese translation causes Meld to not start

Medium

Fix Released

Link a bug report

Related blueprints

24. By Michael Terry on 2010-09-27

* debian/patches/fix-chinese-translation.patch:
  - Dropped, applied upstream

23. By Michael Terry on 2010-09-27

New upstream release.

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.

19. By Mackenzie Morgan on 2010-05-05

Merging shared upstream rev into target branch.

18. By MattJ on 2010-03-13

* Backport fix from upstream GIT for UI glitches (LP: #505285)
  - 01-invisible-merge-arrows-base.patch: changes required by next patch
  - 02-invisible-merge-arrows.patch: fix missing arrows in a 3 way comparison

17. By Emilio Pozuelo Monfort <email address hidden> on 2009-09-01

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

16. By Ross Burton on 2009-06-02

* 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

15. By Michael Terry on 2009-05-07

[ Michael Terry ]
* Merge from debian unstable (LP: #373388), remaining changes:
  - debian/control.in: Add patch as a dependency
  - debian/copyright: Update email address of maintainer
  - debian/patches/only-ignore-fully-blank-changes.patch
* debian/patches/escape-paths.patch:
  - Removed, fixed upstream.

[ James Westby ]
* debian/patches/fix-fr-help-makefile.patch
  - Removed as the directory now exists.
* Added patch tags to the remaining Ubuntu patch.