codetree

Merge lp:~stub/codetree/py3-packaging into lp:codetree

  1. py3-packaging
  2. Merge into trunk
Proposed by Stuart Bishop
Status: Merged
Approved by: Tom Haddon
Approved revision: 118
Merged at revision: 112
Proposed branch: lp:~stub/codetree/py3-packaging
Merge into: lp:codetree
Diff against target: 42 lines (+7/-7)
2 files modified
debian/control (+4/-1)
debian/rules (+3/-6)
To merge this branch: bzr merge lp:~stub/codetree/py3-packaging
Reviewer Review Type Date Requested Status
Tom Haddon Approve
Canonical IS Reviewers Pending
Review via email: mp+382566@code.launchpad.net

Commit message

Packaging updates to get builds Trusty->Focal working

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Tom Haddon (mthaddon) wrote :

LGTM

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 112

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2020-04-20 06:38:12 +0000
3+++ debian/control 2020-04-20 09:36:36 +0000
4@@ -10,10 +10,13 @@
5
6 Package: python-codetree
7 Architecture: all
8-Depends: ${misc:Depends}, ${python:Depends}, python-requests, python-yaml, python-concurrent.futures, git, rsync, unzip, bzr
9+Depends: ${misc:Depends}, ${python:Depends},
10+ python-requests, python-yaml, python-concurrent.futures, git, rsync, unzip, bzr
11 Description: A code tree builder
12+Conflicts: python3-codetree
13
14 Package: python3-codetree
15 Architecture: all
16 Depends: ${misc:Depends}, ${python:Depends}, python3-requests, python3-yaml, git, rsync, unzip, bzr
17 Description: A code tree builder
18+Conflicts: python-codetree
19
20=== modified file 'debian/rules'
21--- debian/rules 2020-04-20 06:38:12 +0000
22+++ debian/rules 2020-04-20 09:36:36 +0000
23@@ -5,16 +5,13 @@
24
25
26 export PYBUILD_NAME=codetree
27-
28+export LC_ALL=C
29
30 %:
31- dh $@ --with python2 --with python3 --buildsystem=pybuild
32-
33+ dh $@ --buildsystem=python_distutils --with=`dh --list | grep -e "python[2-3]\?$$" | paste -d, -s -`
34
35 override_dh_builddeb:
36 dh_builddeb -- -Zgzip
37
38 override_dh_auto_test:
39- # debhelper tests disabled due to weird symlinks used by
40- # codetree tests.
41- make test
42+ echo Tests disabled in package builds due to cross version problems

Subscribers

People subscribed via source and target branches