Merge lp://staging/~sil2100/unity-lens-files/upstream_bump into lp://staging/unity-lens-files

Proposed by Łukasz Zemczak
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 250
Merged at revision: 249
Proposed branch: lp://staging/~sil2100/unity-lens-files/upstream_bump
Merge into: lp://staging/unity-lens-files
Diff against target: 23 lines (+7/-1)
2 files modified
configure.ac (+1/-1)
debian/changelog (+6/-0)
To merge this branch: bzr merge lp://staging/~sil2100/unity-lens-files/upstream_bump
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
PS Jenkins bot continuous-integration Pending
Unity Team Pending
Review via email: mp+150795@code.staging.launchpad.net

Commit message

Change the upstream version to 7.0.

Description of the change

COMMENT NEEDED!
Is such a bump correct? What should I put in the changelog entry?

- Problem:

So, we currently still use 6.6.0 as the upstream version for raring. Trunk is marked as 7.0, so we should use 7.0 as the upstream version.

- Fix:

Bump the upstream version with a new changelog entry. Also, bump the configure.ac version number.

Why 7.0 and not 7.0.0? The DailyRelease/FAQ states that the upstream version should be best smallest as possible. Since we have a daily release scheme and no tarballs, we don't need the micro version now. We could even get rid of the minor version too, but let's keep it to be safe.

- Tests:

N/A

To post a comment you must log in.
250. By Łukasz Zemczak

7.0 is not ready yet, let's use 7.0~ instead!

Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

excellent! approving :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches