dee

Merge lp:~didrocks/dee/add_python_3 into lp:dee

  1. add_python_3
  2. Merge into trunk
Proposed by Didier Roche-Tolomelli
Status: Merged
Approved by: Didier Roche-Tolomelli
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
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Michael Terry Approve
Review via email: mp+133491@code.launchpad.net

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/gir1.2-dee-1.0/usr/lib/python3

Unfortunately, if we try to use dh_python2 debian/gir1.2-dee-1.0/usr/lib/python2.7, the pyshared and overriden directories are not created.
(explicit in dh_python2 code if a path is provided). Also, -X ".*python3.*" doesn't work. So living with the warning for now.

To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote : Posted in a previous version of this proposal

Looks like you forgot to set the pre-requisite branch, so your changes appear with mine.

Revision history for this message
Michael Terry (mterry) wrote :

You should drop the empty override for dh_python2. But besides that it looks fine.

review: Needs Fixing
Revision history for this message
Michael Terry (mterry) wrote :

+1

review: Approve
Revision history for this message
Michael Terry (mterry) wrote :

Whoops, also you should add python3 to Build-Depends

Revision history for this message
Michael Terry (mterry) wrote :

Guh, nevermind, I'm an idiot. It's already there.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
No commit message was specified.

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-11-08 14:47:32 +0000
3+++ debian/changelog 2012-11-08 14:47:32 +0000
4@@ -1,10 +1,15 @@
5 dee (1.0.14-0ubuntu2) UNRELEASED; urgency=low
6
7+ [ Michael Terry ]
8 * debian/control:
9 - Update Vcs-Bzr
10 * debian/rules:
11 - Update to dh9 and enable tests
12
13+ [ Didier Roche ]
14+ * debian/rules:
15+ - Call dh_python3 for python3 suppport
16+
17 -- Michael Terry <mterry@ubuntu.com> Mon, 05 Nov 2012 15:28:38 -0500
18
19 dee (1.0.14-0ubuntu1) quantal; urgency=low
20
21=== modified file 'debian/rules'
22--- debian/rules 2012-11-08 14:47:32 +0000
23+++ debian/rules 2012-11-08 14:47:32 +0000
24@@ -5,7 +5,7 @@
25 #export DH_VERBOSE=1
26
27 %:
28- dh $@ --with python2,autoreconf
29+ dh $@ --with python2,python3,autoreconf
30
31 override_dh_autoreconf:
32 NOCONFIGURE=1 dh_autoreconf ./autogen.sh
33@@ -21,7 +21,9 @@
34 rm debian/tmp/usr/lib/python*/dist-packages/gi/overrides/*.pyc
35 rm debian/tmp/usr/lib/python*/dist-packages/gi/overrides/*.pyo
36 dh_install --fail-missing
37- dh_python2 -pgir1.2-dee-1.0
38+
39+override_dh_python3:
40+ dh_python3 debian/gir1.2-dee-1.0/usr/lib/python3
41
42 override_dh_gencontrol:
43 dh_girepository

Subscribers

People subscribed via source and target branches