Merge lp://staging/~tombeckmann/pantheon-photos/packaging-no-contract into lp://staging/~pantheon-photos/pantheon-photos/trunk
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~tombeckmann/pantheon-photos/packaging-no-contract |
| Merge into: | lp://staging/~pantheon-photos/pantheon-photos/trunk |
| Diff against target: |
1438 lines (+1310/-0) 24 files modified
debian/changelog (+5/-0) debian/compat (+1/-0) debian/control (+83/-0) debian/copyright (+433/-0) debian/docs (+2/-0) debian/install (+2/-0) debian/manpages (+2/-0) debian/menu (+2/-0) debian/pantheon-photos-common.install (+1/-0) debian/pantheon-photos-video-thumbnailer.1 (+13/-0) debian/pantheon-photos.1 (+14/-0) debian/pantheon-photos.lintian-overrides (+2/-0) debian/patches/02_desktop_translations.patch (+33/-0) debian/patches/hardening.patch (+25/-0) debian/patches/series (+2/-0) debian/rules (+17/-0) debian/source/format (+1/-0) debian/source/options (+2/-0) debian/tests/autopilot_tests/powershot-import.ioctl (+227/-0) debian/tests/autopilot_tests/powershot.umockdev (+340/-0) debian/tests/autopilot_tests/test_gphoto_import.py (+89/-0) debian/tests/control (+7/-0) debian/tests/import (+5/-0) debian/watch (+2/-0) |
| To merge this branch: | bzr merge lp://staging/~tombeckmann/pantheon-photos/packaging-no-contract |
| Related bugs: | |
| Related blueprints: |
Break Off Online Accounts Integration
(Undefined)
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Danielle Foré | Needs Information | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2014-08-19.
Commit message
remove the contract from deb packaging. It's shipped somewhere else now.
Description of the change
This removes the contract from deb packaging. It should instead be shipped via this branch https:/
| Danielle Foré (danrabbit) | # |
Unmerged revisions
- 11. By Tom Beckmann
-
remove contract
- 10. By Cody Garver
-
Enable parallel builds
- 9. By Cody Garver
-
Bump libgphoto2 dependency
- 8. By Sergey "Shnatsel" Davidoff
-
Migrate 'set as desktop background' contract here, since it uses Shotwell for translations
- 7. By Cody Garver
-
Add libgranite-dev >= 0.2.3 to dependencies
- 6. By Danielle Foré
-
Remove format string and UOA patches
- 5. By Cody Garver
-
Reduce version to 0.1 in compliance with the rebrand
- 4. By Cody Garver
-
Conflicts and replace shotwell
- 3. By Cody Garver
-
Rename dependency libgphoto2-6-dev to libgphoto2-dev
- 2. By Cody Garver
-
Rebrand as Photos/
pantheon- photos
This looks like a lot of additions instead of a removal. Wrong target branch?