Merge lp:~didrocks/dee/add_python_3 into lp:dee
| Status: | Merged |
|---|---|
| Approved by: | Didier Roche on 2012-11-08 |
| Approved revision: | 383 |
| Merged at revision: | 381 |
| Proposed branch: | lp:~didrocks/dee/add_python_3 |
| Merge into: | lp:dee |
| Prerequisite: | lp:~mterry/dee/modern-build |
| Diff against target: |
43 lines (+9/-2) 2 files modified
debian/changelog (+5/-0) debian/rules (+4/-2) |
| To merge this branch: | bzr merge lp:~didrocks/dee/add_python_3 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Needs Fixing on 2012-11-08 | |
| Michael Terry | 2012-11-08 | Approve on 2012-11-08 | |
|
Review via email:
|
|||
This proposal supersedes a proposal from 2012-11-08.
Commit Message
ensure python3 files are handled by dh_python3
Description of the Change
Have the python3 files really processed with dh_python3 instead of dh_python2
I tried to remove the already existing dh_python2 -pgir1.2-dee-1.0
W: dh_python2:334: Python 3.x location detected, please use dh_python3: debian/
Unfortunately, if we try to use dh_python2 debian/
(explicit in dh_python2 code if a path is provided). Also, -X ".*python3.*" doesn't work. So living with the warning for now.
| Michael Terry (mterry) wrote : | # |
| Michael Terry (mterry) wrote : | # |
You should drop the empty override for dh_python2. But besides that it looks fine.
| Michael Terry (mterry) wrote : | # |
Whoops, also you should add python3 to Build-Depends
| Michael Terry (mterry) wrote : | # |
Guh, nevermind, I'm an idiot. It's already there.
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Autolanding.
No commit message was specified.
Looks like you forgot to set the pre-requisite branch, so your changes appear with mine.