Merge lp:~software-center-developers/piston-mini-client/ubuntu-oneiric-with-py3 into lp:~software-store-developers/piston-mini-client/packaging

Proposed by Michael Vogt
Status: Merged
Merged at revision: 12
Proposed branch: lp:~software-center-developers/piston-mini-client/ubuntu-oneiric-with-py3
Merge into: lp:~software-store-developers/piston-mini-client/packaging
Diff against target: 55 lines (+24/-2)
4 files modified
debian/control (+3/-1)
debian/python-piston-mini-client.install (+1/-0)
debian/python3-piston-mini-client.install (+1/-0)
debian/rules (+19/-1)
To merge this branch: bzr merge lp:~software-center-developers/piston-mini-client/ubuntu-oneiric-with-py3
Reviewer Review Type Date Requested Status
software-store-developers Pending
Review via email: mp+70859@code.launchpad.net

Description of the change

This requires the merge of lp:~mvo/piston-mini-client/setup2to3 first.

To post a comment you must log in.

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 2011-08-09 11:50:10 +0000
3+++ debian/control 2011-08-09 11:56:52 +0000
4@@ -4,7 +4,9 @@
5 Maintainer: Michael Vogt <mvo@ubuntu.com>
6 Build-Depends: debhelper (>= 7.3),
7 python-all,
8- python-setuptools
9+ python3-all,
10+ python-setuptools,
11+ python3-setuptools
12 Standards-Version: 3.9.1
13 Homepage: https://launchpad.net/piston-mini-client
14 Vcs-Bzr: lp:piston-mini-client
15
16=== added file 'debian/python-piston-mini-client.install'
17--- debian/python-piston-mini-client.install 1970-01-01 00:00:00 +0000
18+++ debian/python-piston-mini-client.install 2011-08-09 11:56:52 +0000
19@@ -0,0 +1,1 @@
20+usr/lib/python2.*
21
22=== added file 'debian/python3-piston-mini-client.install'
23--- debian/python3-piston-mini-client.install 1970-01-01 00:00:00 +0000
24+++ debian/python3-piston-mini-client.install 2011-08-09 11:56:52 +0000
25@@ -0,0 +1,1 @@
26+usr/lib/python3.*
27\ No newline at end of file
28
29=== modified file 'debian/rules'
30--- debian/rules 2011-08-09 11:50:10 +0000
31+++ debian/rules 2011-08-09 11:56:52 +0000
32@@ -1,5 +1,23 @@
33 #!/usr/bin/make -f
34
35 %:
36- dh --with=python2 $@
37+ dh $@ --with=python2,python3
38+
39+
40+override_dh_auto_clean:
41+ dh_auto_clean
42+ rm -rf build *.egg-info po/aptdaemon.pot
43+
44+override_dh_auto_build:
45+ dh_auto_build
46+ set -ex; for python in $(shell py3versions -r); do \
47+ $$python setup.py build; \
48+ done;
49+
50+override_dh_auto_install:
51+ dh_auto_install
52+ set -ex; for python in $(shell py3versions -r); do \
53+ $$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
54+ done;
55+
56

Subscribers

People subscribed via source and target branches