Merge lp:~robru/qtmir/inline-gles into lp:qtmir
| Status: | Superseded |
|---|---|
| Proposed branch: | lp:~robru/qtmir/inline-gles |
| Merge into: | lp:qtmir |
| Diff against target: |
130 lines (+116/-0) 3 files modified
debian/bileto_convert_to_gles (+16/-0) debian/control.gles (+71/-0) debian/rules.gles (+29/-0) |
| To merge this branch: | bzr merge lp:~robru/qtmir/inline-gles |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Gerry Boland | tentative | 2016-03-11 | Approve on 2016-03-24 |
| Unity8 CI Bot | continuous-integration | Needs Fixing on 2016-03-24 | |
| Robert Bruce Park (community) | Approve on 2016-03-21 | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2016-03-24.
Commit Message
Inline GLES packaging.
Description of the Change
Experimenting with having GLES debian/ dir inlined in same trunk, and experimenting with train building gles package for you.
control.gles and rules.gles are copied verbatim from lp:qtmir/gles
- 454. By Robert Bruce Park on 2016-03-11
-
Drop changelog because train will handle that.
| Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:454
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 455. By Robert Bruce Park on 2016-03-11
-
Dedupe some debian-gles stuff.
- 456. By Robert Bruce Park on 2016-03-11
-
Drop old gles stuff.
| Unity8 CI Bot (unity8-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:455
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| Unity8 CI Bot (unity8-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:456
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 457. By Robert Bruce Park on 2016-03-11
-
Try some nefarious stuff.
- 458. By Robert Bruce Park on 2016-03-11
-
Even more malicious.
- 459. By Robert Bruce Park on 2016-03-11
-
Fix script ;-)
| Unity8 CI Bot (unity8-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:457
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| Unity8 CI Bot (unity8-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:459
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 460. By Robert Bruce Park on 2016-03-12
-
Move hook script.
| Unity8 CI Bot (unity8-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:460
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| Gerry Boland (gerboland) wrote : | # |
+sed --in-place 's/qtmir/
this will edit more than just the package names in the changelog. Example:
- * Depend on same-version qtmir-{
+ * Depend on same-version qtmir-gles-
- * Migration of qtmir from the legacy Mir API
+ * Migration of qtmir-gles from the legacy Mir API
Could you make the sed replace a bit more strict, to prevent this?
I'm also a giant fan of explaining non-obvious things with a comment or readme - please add a readme to explain the purpose of the *.gles and bileto scripts.
Also, is editing "debian/copyright" necessary? Upstream name always being "qtmir" strikes me as more correct.
Looks fine to me otherwise.
| Robert Bruce Park (robru) wrote : | # |
On Mon, Mar 21, 2016 at 7:55 AM, Gerry Boland
<email address hidden> wrote:
> Could you make the sed replace a bit more strict, to prevent this?
Can do.
> I'm also a giant fan of explaining non-obvious things with a comment or readme - please add a readme to explain the purpose of the *.gles and bileto scripts.
On it.
> Also, is editing "debian/copyright" necessary? Upstream name always being "qtmir" strikes me as more correct.
Well I wrote the script to minimize the diff against the existing
qtmir-gles package, eg, the existing qtmir-gles already defines
"Upstream-Name: qtmir-gles" in its debian/copyright.
Now that you mention it, since the field is called "Upstream" Name, it
does seem more correct to leave it as just qtmir, but that will
introduce a packaging diff when this code goes live.
--
robru
- 461. By Robert Bruce Park on 2016-03-21
-
Fixes as per gerboland.
| Robert Bruce Park (robru) wrote : | # |
Ok fixed sed, let me know if the comment is clear enough.
This is safe to merge as-is however the train implementation of this isn't in production yet so you have to keep maintaining lp:qtmir/gles for the time being.
| Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:461
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:461
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
| Gerry Boland (gerboland) wrote : | # |
Tentative approval. Approach is good.
Already the build dependencies here are out of date, so this will need refreshing at land-time.
Would be cool to auto-generate the control.gles file from the control file, as build-dep changes are something easily forgotten in the gles file. But this will as first step.
| Robert Bruce Park (robru) wrote : | # |
Yeah it's difficult for me to identify which differences are because lp:qtmir/gles is languishing and which are the necessary changes for gles to actually work.
I like saviq's idea to use a patch instead of duplicating the files but i don't have enough knowledge of gles to produce the correct patch. This branch currently is just "merge lp:qtmir/gles into here" and doesn't make any attempt at reducing the delta.
FAILED: Continuous integration, rev:453
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/