Ubuntu
meld package

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

  1. Natty (11.04)
  2. meld-sru
  3. Merge into natty
Proposed by Julian Taylor
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~jtaylor/ubuntu/natty/meld/meld-sru
Merge into: lp:ubuntu/natty/meld
Diff against target: 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)
To merge this branch: bzr merge lp:~jtaylor/ubuntu/natty/meld/meld-sru
Reviewer Review Type Date Requested Status
Marc Deslauriers Approve
Chase Douglas (community) Approve
Ubuntu branches Pending
Review via email: mp+72410@code.launchpad.net

Description of the change

SRU update for meld.
fixes a couple very annoying bugs.
All fixes are applied in oneiric with version 1.5.2

To post a comment you must log in.
Revision history for this message
Chase Douglas (chasedouglas) wrote :

The proposed changes look good all around. A small issue is that the changelog should have UNRELEASED as the distro instead of natty-proposed unless it will be uploaded as is. Given the changelog email address, I doubt that's the case :). Whoever uploads the changes will be the one to flip it from UNRELEASED to natty-proposed.

The bug reports need proper SRU modifications. Please see https://wiki.ubuntu.com/StableReleaseUpdates?action=show&redirect=SRU#Procedure. In particular, a discussion of the regression potential of each fix is needed.

review: Needs Fixing
Revision history for this message
Julian Taylor (jtaylor) wrote :

thanks for taking a look.
I added some notes on the regression potentials to the bugs.
I consider it quite low for all issues. I have been using versions with the fixes since natty release as nattys meld is so broken.

Revision history for this message
Chase Douglas (chasedouglas) wrote :

The bugs look ok to me now. It would be nice to have the distro flipped back to UNRELEASED in this branch, but it can also be fixed by whoever is merging the branch. Thus, I'm approving the proposal.

review: Approve
lp:~jtaylor/ubuntu/natty/meld/meld-sru updated
31. By Julian Taylor

change distro target to UNRELEASED

Revision history for this message
Marc Deslauriers (mdeslaur) wrote :

I've uploaded the package to natty-proposed, and have subscribed ubuntu-sru to the bugs.

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2011-01-19 14:50:11 +0000
+++ debian/changelog 2011-08-22 19:07:25 +0000
@@ -1,3 +1,16 @@
1meld (1.5.0-0ubuntu1.1) UNRELEASED; urgency=low
2
3 * debian/patches/fix_iteration.patch
4 - Fix hangup when comparing some files (LP: #774265)
5 * debian/patches/fix-786134.patch
6 - Fix another hangup when comparing some files (LP: #786134)
7 * debian/patches/fix-svn-external-crash.patch
8 - Fix crash when svn wc contains externals (LP: #787831)
9 * debian/patches/fix-vcs-cwd.patch
10 - allow opening vcs diff from outside of vcs-dir (LP: #770549)
11
12 -- Julian Taylor <jtaylor.debian@googlemail.com> Mon, 22 Aug 2011 13:17:43 +0200
13
1meld (1.5.0-0ubuntu1) natty; urgency=low14meld (1.5.0-0ubuntu1) natty; urgency=low
215
3 * New upstream release16 * New upstream release
417
=== modified file 'debian/control'
--- debian/control 2011-01-19 14:50:11 +0000
+++ debian/control 2011-08-22 19:07:25 +0000
@@ -6,7 +6,8 @@
6Source: meld6Source: meld
7Section: gnome7Section: gnome
8Priority: optional8Priority: optional
9Maintainer: Ross Burton <ross@debian.org>9Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
10XSBC-Original-Maintainer: Ross Burton <ross@debian.org>
10Build-Depends: debhelper (>= 5),11Build-Depends: debhelper (>= 5),
11 cdbs,12 cdbs,
12 gnome-pkg-tools13 gnome-pkg-tools
1314
=== modified file 'debian/control.in'
--- debian/control.in 2011-01-19 14:50:11 +0000
+++ debian/control.in 2011-08-22 19:07:25 +0000
@@ -1,7 +1,8 @@
1Source: meld1Source: meld
2Section: gnome2Section: gnome
3Priority: optional3Priority: optional
4Maintainer: Ross Burton <ross@debian.org>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Ross Burton <ross@debian.org>
5Build-Depends: debhelper (>= 5),6Build-Depends: debhelper (>= 5),
6 cdbs,7 cdbs,
7 gnome-pkg-tools8 gnome-pkg-tools
89
=== added file 'debian/patches/fix-786134.patch'
--- debian/patches/fix-786134.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/fix-786134.patch 2011-08-22 19:07:25 +0000
@@ -0,0 +1,18 @@
1Description: fix handup when comparing certain files
2Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/meld/+bug/786134
3Origin: http://git.gnome.org/browse/meld/commit/?id=8c5a45f4308d05c74b2d54c4ca936b6f09fad5da
4Applied-Upstream: 1.5.2
5
6Index: meld/meld/filediff.py
7===================================================================
8--- meld.orig/meld/filediff.py 2011-08-22 13:18:55.963064767 +0200
9+++ meld/meld/filediff.py 2011-08-22 13:18:56.693064771 +0200
10@@ -897,7 +897,7 @@
11 nextbit = "\r" + nextbit
12 t.was_cr = False
13 if len(nextbit):
14- if (nextbit[-1] == "\r"):
15+ if nextbit[-1] == "\r" and len(nextbit) > 1:
16 t.was_cr = True
17 nextbit = nextbit[0:-1]
18 t.buf.insert( t.buf.get_end_iter(), nextbit )
019
=== added file 'debian/patches/fix-svn-external-crash.patch'
--- debian/patches/fix-svn-external-crash.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/fix-svn-external-crash.patch 2011-08-22 19:07:25 +0000
@@ -0,0 +1,21 @@
1Description: fix crash when svn externals exist
2Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/meld/+bug/787831
3Origin: http://git.gnome.org/browse/meld/commit/?id=8d7e4aff715a933957a9cec99175fd15fec846a6
4Applied-Upstream: 1.5.1
5
6diff --git a/meld/vc/svn.py b/meld/vc/svn.py
7index 3652f84..07a4a2c 100644
8--- a/meld/vc/svn.py
9+++ b/meld/vc/svn.py
10@@ -91,7 +91,7 @@ class Vc(_vc.Vc):
11 if item == "":
12 continue
13 rev = None
14- if item != "unversioned":
15+ if "revision" in status.attrib:
16 rev = status.attrib["revision"]
17 matches.append((path, item, rev))
18
19--
201.7.5.4
21
022
=== added file 'debian/patches/fix-vcs-cwd.patch'
--- debian/patches/fix-vcs-cwd.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/fix-vcs-cwd.patch 2011-08-22 19:07:25 +0000
@@ -0,0 +1,122 @@
1Description: allow opening vcs diff from outside of vcs-dir
2Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/meld/+bug/770549
3Origin: http://git.gnome.org/browse/meld/commit/?id=9da095e9c1d330e5e78474633c76c7efcbb4693b
4Applied-Upstream: 1.5.2
5
6diff --git a/meld/vc/bzr.py b/meld/vc/bzr.py
7index 777a74f..e9e8626 100644
8--- a/meld/vc/bzr.py
9+++ b/meld/vc/bzr.py
10@@ -67,7 +67,7 @@ class Vc(_vc.CachedVc):
11 def resolved_command(self):
12 return [self.CMD] + self.CMDARGS + ["resolve"]
13 def valid_repo(self):
14- if _vc.call([self.CMD, "check"]):
15+ if _vc.call([self.CMD, "check"], cwd=self.root):
16 return False
17 else:
18 return True
19diff --git a/meld/vc/cvs.py b/meld/vc/cvs.py
20index 14071e0..151abe3 100644
21--- a/meld/vc/cvs.py
22+++ b/meld/vc/cvs.py
23@@ -50,7 +50,7 @@ class Vc(_vc.Vc):
24 def revert_command(self):
25 return [self.CMD,"update","-C"]
26 def valid_repo(self):
27- if _vc.call([self.CMD, "version"]):
28+ if _vc.call([self.CMD, "version"], cwd=self.root):
29 return False
30 else:
31 return True
32diff --git a/meld/vc/darcs.py b/meld/vc/darcs.py
33index 6c1070c..5224d75 100644
34--- a/meld/vc/darcs.py
35+++ b/meld/vc/darcs.py
36@@ -71,7 +71,7 @@ class Vc(_vc.CachedVc):
37 return [self.CMD, "resolve"]
38
39 def valid_repo(self):
40- if _vc.call([self.CMD, "query", "tags"]):
41+ if _vc.call([self.CMD, "query", "tags"], cwd=self.root):
42 return False
43 else:
44 return True
45diff --git a/meld/vc/git.py b/meld/vc/git.py
46index 82c6c23..23cb7a8 100644
47--- a/meld/vc/git.py
48+++ b/meld/vc/git.py
49@@ -67,7 +67,7 @@ class Vc(_vc.CachedVc):
50 def revert_command(self):
51 return [self.CMD,"checkout"]
52 def valid_repo(self):
53- if _vc.call([self.CMD, "branch"]):
54+ if _vc.call([self.CMD, "branch"], cwd=self.root):
55 return False
56 else:
57 return True
58@@ -82,7 +82,8 @@ class Vc(_vc.CachedVc):
59 try:
60 # Update the index before getting status, otherwise we could
61 # be reading stale status information
62- _vc.popen(["git", "update-index", "--refresh"])
63+ _vc.popen(["git", "update-index", "--refresh"],
64+ cwd=self.location)
65
66 # Get the status of files that are different in the "index" vs
67 # the HEAD of the git repository
68diff --git a/meld/vc/mercurial.py b/meld/vc/mercurial.py
69index 77665cc..49860b6 100644
70--- a/meld/vc/mercurial.py
71+++ b/meld/vc/mercurial.py
72@@ -60,7 +60,7 @@ class Vc(_vc.Vc):
73 def revert_command(self):
74 return [self.CMD,"revert"]
75 def valid_repo(self):
76- if _vc.call([self.CMD, "root"]):
77+ if _vc.call([self.CMD, "root"], cwd=self.root):
78 return False
79 else:
80 return True
81diff --git a/meld/vc/monotone.py b/meld/vc/monotone.py
82index 7d504c8..5867bc0 100644
83--- a/meld/vc/monotone.py
84+++ b/meld/vc/monotone.py
85@@ -144,7 +144,7 @@ class Vc(_vc.CachedVc):
86 def resolved_command(self):
87 return [self.CMD,"resolved"]
88 def valid_repo(self):
89- if _vc.call([self.CMD, "list", "tags"]):
90+ if _vc.call([self.CMD, "list", "tags"], cwd=self.root):
91 return False
92 else:
93 return True
94diff --git a/meld/vc/svn.py b/meld/vc/svn.py
95index 07a4a2c..3de56ef 100644
96--- a/meld/vc/svn.py
97+++ b/meld/vc/svn.py
98@@ -61,7 +61,7 @@ class Vc(_vc.Vc):
99 def resolved_command(self):
100 return [self.CMD,"resolved"]
101 def valid_repo(self):
102- if _vc.call([self.CMD, "info"]):
103+ if _vc.call([self.CMD, "info"], cwd=self.root):
104 return False
105 else:
106 return True
107diff --git a/meld/vc/tla.py b/meld/vc/tla.py
108index 82744a0..d3c01d7 100644
109--- a/meld/vc/tla.py
110+++ b/meld/vc/tla.py
111@@ -86,7 +86,7 @@ class Vc(_vc.CachedVc):
112 return [self.CMD, "undo", "--"]
113
114 def valid_repo(self):
115- if _vc.call([self.CMD, "tree-version"]):
116+ if _vc.call([self.CMD, "tree-version"], cwd=self.root):
117 return False
118 else:
119 return True
120--
1211.7.5.4
122
0123
=== added file 'debian/patches/fix_iteration.patch'
--- debian/patches/fix_iteration.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/fix_iteration.patch 2011-08-22 19:07:25 +0000
@@ -0,0 +1,18 @@
1Subject: Fix hangup when comparing some files
2Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/meld/+bug/774265
3Origin: http://git.gnome.org/browse/meld/commit/?id=0e7cc5202895acbe5c23ca964e2962ea2d3cec2a
4Applied-Upstream: 1.5.1
5
6Index: meld/meld/filediff.py
7===================================================================
8--- meld.orig/meld/filediff.py 2011-05-04 22:57:18.953377056 +0200
9+++ meld/meld/filediff.py 2011-05-04 22:57:22.683377055 +0200
10@@ -115,6 +115,8 @@
11 return lines
12
13 def __getitem__(self, i):
14+ if i > len(self):
15+ raise IndexError
16 line_start = get_iter_at_line_or_eof(self.buf, i)
17 line_end = line_start.copy()
18 if not line_end.ends_line():
019
=== modified file 'debian/patches/series'
--- debian/patches/series 2011-01-19 14:50:11 +0000
+++ debian/patches/series 2011-08-22 19:07:25 +0000
@@ -1,3 +1,7 @@
1sourceview-package.patch1sourceview-package.patch
2python-path.patch2python-path.patch
3diff_tree_store.patch3diff_tree_store.patch
4fix_iteration.patch
5fix-786134.patch
6fix-svn-external-crash.patch
7fix-vcs-cwd.patch

Subscribers

People subscribed via source and target branches

to all changes: