lp:~jtaylor/ubuntu/natty/meld/meld-sru

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/natty/meld

Marc Deslauriers: Approve on 2011-08-26

Chase Douglas (community): Approve on 2011-08-22

Ubuntu branches: Pending requested 2011-08-22

Diff: 259 lines (+200/-2)

8 files modified

debian/changelog (+13/-0)
debian/control (+2/-1)
debian/control.in (+2/-1)
debian/patches/fix-786134.patch (+18/-0)
debian/patches/fix-svn-external-crash.patch (+21/-0)
debian/patches/fix-vcs-cwd.patch (+122/-0)
debian/patches/fix_iteration.patch (+18/-0)
debian/patches/series (+4/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #770549: meld /path/to/folder doesn't work	Undecided	Fix Released
Bug #774265: [natty] meld hangs comparing attached files	Medium	Fix Released
Bug #786134: Meld chokes on file comparison	Undecided	Fix Released
Bug #787831: Meld crashes if svn working dir contains svn externals dirs	Undecided	Fix Released

Link a bug report

Related blueprints

31. By Julian Taylor on 2011-08-22

change distro target to UNRELEASED

30. By Julian Taylor on 2011-08-22

update maintainer

29. By Julian Taylor on 2011-08-22

* debian/patches/fix-vcs-cwd.patch
  - allow opening vcs diff from outside of vcs-dir (LP: #770549)

28. By Julian Taylor on 2011-08-22

* debian/patches/fix-svn-external-crash.patch
  - Fix crash when svn wc contains externals (LP: #787831)

27. By Julian Taylor on 2011-08-22

* debian/patches/fix-786134.patch
  - Fix another hangup when comparing some files (LP: #786134)

26. By Julian Taylor on 2011-08-22

* debian/patches/fix_iteration.patch
  - Fix hangup when comparing some files (LP: #774265)

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)