Merge lp://staging/~mterry/quickly/arb into lp://staging/quickly
Proposed by
Michael Terry
| Status: | Merged |
|---|---|
| Approved by: | Didier Roche-Tolomelli |
| Approved revision: | 692 |
| Merged at revision: | 685 |
| Proposed branch: | lp://staging/~mterry/quickly/arb |
| Merge into: | lp://staging/quickly |
| Prerequisite: | lp://staging/~mterry/quickly/overwrite |
| Diff against target: |
442 lines (+84/-135) 16 files modified
data/templates/ubuntu-application/help/tutorial.xml (+1/-1) data/templates/ubuntu-application/internal/packaging.py (+0/-92) data/templates/ubuntu-application/project_root/bin/project_name (+4/-3) data/templates/ubuntu-application/project_root/python/Aboutcamel_case_nameDialog.py (+1/-3) data/templates/ubuntu-application/project_root/python/Preferencescamel_case_nameDialog.py (+1/-3) data/templates/ubuntu-application/project_root/python/__init__.py (+1/-3) data/templates/ubuntu-application/project_root/python/camel_case_nameWindow.py (+1/-3) data/templates/ubuntu-application/project_root/python_lib/helpers.py (+1/-3) data/templates/ubuntu-application/project_root/python_lib/python_nameconfig.py (+1/-3) data/templates/ubuntu-application/project_root/setup.py (+54/-10) data/templates/ubuntu-application/test/extras.sh (+5/-3) data/templates/ubuntu-application/upgrade.py (+10/-0) data/templates/ubuntu-cli/project_root/python/__init__.py (+1/-3) data/templates/ubuntu-cli/project_root/python/python_nameconfig.py (+1/-3) quickly/quicklyconfig.py (+1/-1) setup.py (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~mterry/quickly/arb |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Didier Roche-Tolomelli | Approve | ||
|
Review via email:
|
|||
Description of the change
This branch lets us drop all the craziness I put into debian/rules for --extras packages. We put those there because for the SRU, we wanted to reduce the surface of the changes.
But now we can put them back into the user bin wrapper and setup.py like they should have been all along.
Note that this branch relies on the overwrite branch, so only a little bit of it (the gettext->locale stuff) needs to have explicit upgrade.py support.
To post a comment you must log in.
Revision history for this message
| Michael Terry (mterry) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
\o/
The changes are looking good to me (and way better than the packaging insanity).
Some comments:
299 + print ("ERROR: Can't find", filepath)
you missed a %s or at least a space after "find" ;)
370 +print (project_version, template_version)
Is that a leftover?
379 + print("running", "find %s -name '*.py' -exec %s {} \;" % (python_name, sedline))
Hum, same here about print(a, b), this return a tuple, like print("bar", "foo")
('bar', 'foo')
not a friendly one line message, isn't it?
230 -import gettext
231 -from gettext import gettext as _
232 -gettext.
233 +from locale import gettext as _
-> is it better? I have both in OneConf because of some UTF-8 errors and a fallback to the other one. If you have some info on that just for the info, I'll take them gladely :)
Thanks for adding the Exec=foo bar baz test case btw!
Approving (but I would appreciate some answers on my minor quesions before) ;) However, look at the pre-requisite branch which needs a little bit more work IMHO.