Merge lp://staging/~joshbrown/photostory/packaging into lp://staging/~photostory/photostory/trunk
Proposed by
Josh Brown
| Status: | Merged |
|---|---|
| Merged at revision: | 15 |
| Proposed branch: | lp://staging/~joshbrown/photostory/packaging |
| Merge into: | lp://staging/~photostory/photostory/trunk |
| Diff against target: |
118 lines (+97/-0) 4 files modified
MANIFEST (+9/-0) install.diff (+48/-0) photostory.desktop (+9/-0) setup.py (+31/-0) |
| To merge this branch: | bzr merge lp://staging/~joshbrown/photostory/packaging |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Joel Auterson | Approve | ||
|
Review via email:
|
|||
Description of the change
It still needs a bit of work but it should be okay for a basic installation. Eventually the setup.py can be used to create a .deb: https:/
And more on setup.py here: http://
You don't necessarily have to merge the branch, I can do that. Just wanted your approval before making a major change like this.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This needs to be fixed so it will merge properly with the latest 'no-pic' revision.
Once you've done that it should be fine, provided you're sure it works! :P