Merge lp://staging/~dholbach/software-center/software-center-aptdaemon-plugins into lp://staging/software-center
Proposed by
Daniel Holbach
| Status: | Rejected |
|---|---|
| Rejected by: | Kiwinote |
| Proposed branch: | lp://staging/~dholbach/software-center/software-center-aptdaemon-plugins |
| Merge into: | lp://staging/software-center |
| Diff against target: |
349 lines (+299/-0) (has conflicts) 9 files modified
debian/changelog (+60/-0) debian/compat (+1/-0) debian/control (+26/-0) debian/copyright (+16/-0) debian/dirs (+1/-0) debian/rules (+32/-0) helper/ubuntu-license-key-helper (+88/-0) setup.py (+14/-0) softwarecenter_aptd_plugins/add_license_key_plugin.py (+61/-0) Conflict adding file setup.py. Moved existing file to setup.py.moved. |
| To merge this branch: | bzr merge lp://staging/~dholbach/software-center/software-center-aptdaemon-plugins |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| software-store-developers | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| Kiwinote (kiwinote) wrote | # |
Unmerged revisions
- 19. By Daniel Holbach
-
debian/control: fix typo in description (LP: #1175101)
- 18. By Michael Vogt
-
releasing version 0.1.5
- 17. By Michael Vogt
-
build a utils/ubuntu-
license- key-helper as a python2 binary
as there is no python3-piston- mini-client yet - 16. By Michael Vogt
-
depend on python3-
piston- mini-client - 15. By Michael Vogt
-
add dependency for piston-mini-client
- 14. By Michael Vogt
-
fix helper location
- 13. By Michael Vogt
-
releasing version 0.1.3
- 12. By Michael Vogt
-
build for python3
- 11. By Michael Vogt
-
Open subprocesses with universal_
newlines= True when expecting to read
text from them. On Python 2, this only enables \r\n conversion and the
like, but on Python 3 this also causes subprocess-related file objects
to read str rather than bytes. - 10. By Michael Vogt
-
releasing version 0.1.2
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
merged into lp:~software-store-developers/software-center/software-center-aptdaemon-plugins - thanks!
(this merge proposal has the wrong target branch, so I'll set it as 'rejected' to close it, but the changes themselves are fine)