Merge lp:~gary-lasker/software-center/update-vcs-bzr-link-for-5.2 into lp:software-center/5.2

Proposed by Gary Lasker
Status: Merged
Merged at revision: 3048
Proposed branch: lp:~gary-lasker/software-center/update-vcs-bzr-link-for-5.2
Merge into: lp:software-center/5.2
Diff against target: 29 lines (+6/-2)
2 files modified
debian/changelog (+5/-1)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~gary-lasker/software-center/update-vcs-bzr-link-for-5.2
Reviewer Review Type Date Requested Status
Michael Vogt Approve
Review via email: mp+109235@code.launchpad.net

Description of the change

Super-trivial branch that simply updates the Vcs-Bzr link in debian/control to https://code.launchpad.net/~software-store-developers/software-center/5.2. I was intending to just commit the change but then I realized that as long as we continue to do the 5.2 fix merges into trunk it will be annoying to have to revert this field each time (and we'd likely forget, I think I remember this happening in the past).

So, I'll just leave this MP as a reminder and we'll do this when we are no longer doing the 5.2 -> trunk merges.

Many thanks!

To post a comment you must log in.
Michael Vogt (mvo) wrote :

Thanks for this branch.

I merged it into 5.2 now. Please note that trivial branches like this are fine to commit directly, no
need for a explicit MP.

review: Approve
Michael Vogt (mvo) wrote :

Ups, sorry, I should have read the description more carefully.

Its fine to have this in 5.2 now because bzr is smart and will only apply this change once to trunk. So during
the merge from 5.2 to trunk we can just revert this one debian/control change and commit. For subsequent
branch merges from 5.2 to trunk bzr will not try to apply this change again.

Gary Lasker (gary-lasker) wrote :

Ah! I did not realize that. Pretty cool, bzr ftw! Thanks for the merge, mvo.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-06-06 05:02:21 +0000
3+++ debian/changelog 2012-06-07 20:26:20 +0000
4@@ -11,7 +11,11 @@
5 - fix unicode error crash for people running with the
6 LANGUAGE=zh_CN.UTF-8 or zh_TW.UTF-8 (LP: #967036)
7
8- -- Gary Lasker <gary.lasker@canonical.com> Wed, 06 Jun 2012 01:00:18 -0400
9+ [ Gary Lasker ]
10+ * debian/control:
11+ - update vcs link to point to the 5.2 branch
12+
13+ -- Gary Lasker <gary.lasker@canonical.com> Thu, 07 Jun 2012 16:13:41 -0400
14
15 software-center (5.2.3) precise-proposed; urgency=low
16
17
18=== modified file 'debian/control'
19--- debian/control 2012-05-22 12:23:07 +0000
20+++ debian/control 2012-06-07 20:26:20 +0000
21@@ -14,7 +14,7 @@
22 python-scour
23 Standards-Version: 3.8.4
24 X-Python-Version: >= 2.7
25-Vcs-Bzr: https://code.launchpad.net/~software-store-developers/software-center/trunk
26+Vcs-Bzr: https://code.launchpad.net/~software-store-developers/software-center/5.2
27 Homepage: https://launchpad.net/software-center
28
29 Package: software-center

Subscribers

People subscribed via source and target branches