Merge lp://staging/~roadmr/ubuntu/oneiric/checkbox/0.12.7-0ubuntu1 into lp://staging/ubuntu/oneiric/checkbox

Proposed by Daniel Manrique
Status: Work in progress
Proposed branch: lp://staging/~roadmr/ubuntu/oneiric/checkbox/0.12.7-0ubuntu1
Merge into: lp://staging/ubuntu/oneiric/checkbox
Diff against target: 21 lines (+7/-0)
1 file modified
debian/changelog (+7/-0)
To merge this branch: bzr merge lp://staging/~roadmr/ubuntu/oneiric/checkbox/0.12.7-0ubuntu1
Reviewer Review Type Date Requested Status
Daniel Holbach Needs Information
Review via email: mp+75817@code.staging.launchpad.net

Description of the change

Some files under scripts/, that were created and/or renamed for checkbox 0.12.7, have incorrect permissions, lacking the executable bit. This is present only in lp:ubuntu/checkbox, not in upstream (lp:checkbox).

This branch fixes the permissions, thus solving bug 852138 which was experienced by a tester in the field.

It's the first time I submit a change only to the Ubuntu branch, without a matching change in trunk, so please let me know if either the procedure I followed or the version number should be different.

Thanks!

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Can I change 0.12.7ubuntu1 to 0.12.8?

review: Needs Information
Revision history for this message
Daniel Manrique (roadmr) wrote :

Hi Daniel,

The reason we chose 0.12.7-0ubuntu1 is that the changes in this branch apply only to the Ubuntu version, as the problem is not present in upstream (checkbox 0.12.7). So -0ubuntu1 meaning there's no debian package (0) and this is the first ubuntu-specific package (ubuntu1). It's the first time we use this naming scheme, as before we'd always matched an upstream release with the Ubuntu release, and we weren't too sure it was the right thing to do.

Also, we will probably submit 0.12.8 from upstream in a few days, as we have a few critical bugs we need to fix. So we were wondering what would happen if you change the Ubuntu version to 0.12.8 and then upstream puts out 0.12.8.

What I could suggest, if it helps in any way, is to hold off on 0.12.7-0ubuntu1, and we could roll the permission changes when 0.12.8 is out. That way we kill two birds with one stone (the permissions thing, plus the bugs fixed in 0.12.8 proper).

Thanks for your help!

Revision history for this message
Daniel Holbach (dholbach) wrote :

<version>-<debian/ubuntu revision> (note the '-') is only used if the package is non-native, which means that a tarball, which was released upstream (without the packaging) is used as the basis for the packaging, ie: upstream releases 1.2.3, debian packages it, uploads a second revision, we apply a fix: 1.2.3-2ubuntu1.

I'd suggest to either go with 0.12.8 or make it 0.12.7.1 or something.

Revision history for this message
Daniel Manrique (roadmr) wrote :

Hi Daniel,

I discussed it with the Checkbox team and, since we will be submitting a 0.12.8 release in a few days, we agreed to hold these changes until then, we believe this generates less work for everyone involved. These permission changes are relatively minor and can be rolled along with other fixes on 0.12.8.

So if it's OK with you, we can kill this merge proposal.

Thanks again for your quick reply to our merge requests :)

Unmerged revisions

35. By Daniel Manrique

Fix executable permissions on some scripts that were lacking them.
(LP: #852138).

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