Merge lp:~jtaylor/ubuntu/oneiric/bittornado/dh_python2 into lp:ubuntu/oneiric/bittornado

Proposed by Julian Taylor
Status: Merged
Merged at revision: 8
Proposed branch: lp:~jtaylor/ubuntu/oneiric/bittornado/dh_python2
Merge into: lp:ubuntu/oneiric/bittornado
Diff against target: 114 lines (+22/-18)
6 files modified
debian/bittornado-gui.install (+2/-1)
debian/bittornado.install (+1/-1)
debian/bittornado.pyinstall (+2/-0)
debian/changelog (+9/-0)
debian/control (+2/-2)
debian/rules (+6/-14)
To merge this branch: bzr merge lp:~jtaylor/ubuntu/oneiric/bittornado/dh_python2
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+71121@code.launchpad.net
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/bittornado-gui.install'
2--- debian/bittornado-gui.install 2007-04-22 13:56:24 +0000
3+++ debian/bittornado-gui.install 2011-08-10 22:51:42 +0000
4@@ -1,2 +1,3 @@
5-usr/bin/*gui*
6+usr/bin/*gui*.bittornado
7+usr/bin/btmaketorrentgui
8 usr/share/pixmaps
9
10=== modified file 'debian/bittornado.install'
11--- debian/bittornado.install 2006-10-27 15:46:48 +0000
12+++ debian/bittornado.install 2011-08-10 22:51:42 +0000
13@@ -10,4 +10,4 @@
14 usr/bin/btsethttpseeds
15 usr/bin/btshowmetainfo.bittornado
16 usr/bin/bttrack.bittornado
17-usr/share/python-support/bittornado
18+usr/lib/python2*
19
20=== added file 'debian/bittornado.pyinstall'
21--- debian/bittornado.pyinstall 1970-01-01 00:00:00 +0000
22+++ debian/bittornado.pyinstall 2011-08-10 22:51:42 +0000
23@@ -0,0 +1,2 @@
24+debian/tmp/usr/bin/btmakemetafile.py BitTornado
25+debian/tmp/usr/bin/btcompletedir.py BitTornado
26
27=== modified file 'debian/changelog'
28--- debian/changelog 2011-01-24 17:27:47 +0000
29+++ debian/changelog 2011-08-10 22:51:42 +0000
30@@ -1,3 +1,12 @@
31+bittornado (0.3.18-10ubuntu2) oneiric; urgency=low
32+
33+ * switch to dh_python2 (LP: #788514)
34+ - install btmakemetafile.py and btcompletedir.py via pyinstall
35+ - add build depend on python-all
36+ - bump debhelper depend to 7 for dh_auto_install
37+
38+ -- Julian Taylor <jtaylor.debian@googlemail.com> Wed, 10 Aug 2011 23:02:19 +0200
39+
40 bittornado (0.3.18-10ubuntu1) natty; urgency=low
41
42 * debian/patches/32_use_hashlib_for_sha.patch:
43
44=== modified file 'debian/control'
45--- debian/control 2011-01-24 17:27:47 +0000
46+++ debian/control 2011-08-10 22:51:42 +0000
47@@ -3,8 +3,8 @@
48 Priority: optional
49 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
50 XSBC-Original-Maintainer: Cameron Dale <camrdale@gmail.com>
51-Build-Depends: debhelper (>= 5.0.37.2)
52-Build-Depends-Indep: python, python-support (>= 0.5.4), docbook-to-man
53+Build-Depends: debhelper (>= 7)
54+Build-Depends-Indep: python-all (>= 2.6.6-3~), docbook-to-man
55 Standards-Version: 3.8.4
56 Vcs-Svn: svn://svn.debian.org/pkg-bittornado/bittornado/trunk
57 Vcs-Browser: http://svn.debian.org/wsvn/pkg-bittornado/bittornado/trunk/
58
59=== modified file 'debian/rules'
60--- debian/rules 2010-03-21 14:36:30 +0000
61+++ debian/rules 2011-08-10 22:51:42 +0000
62@@ -31,23 +31,14 @@
63 dh_installdirs
64
65 # Add here commands to install the package into debian/bittornado.
66- chmod +x ./setup.py
67- ./setup.py install --prefix=$(CURDIR)/debian/tmp/usr --install-lib=$(CURDIR)/debian/tmp/usr/share/python-support/bittornado
68+ dh_auto_install -- --root=$(CURDIR)/debian/tmp
69
70 install -d debian/tmp/usr/share/mimelnk/application
71
72 install -D -m644 debian/bittornado.desktop debian/bittornado-gui/usr/share/applications/bittornado.desktop
73 install -D -m644 debian/bittornado.xpm debian/tmp/usr/share/pixmaps/bittornado.xpm
74 install -d debian/tmp/usr/share/bittorrent
75- chmod 755 debian/tmp/usr/share/python-support/bittornado/BitTornado/launchmanycore.py
76- cp debian/tmp/usr/bin/btmakemetafile.py debian/tmp/usr/share/python-support/bittornado/BitTornado
77- cp debian/tmp/usr/bin/btcompletedir.py debian/tmp/usr/share/python-support/bittornado/BitTornado
78
79- # Remove the generated .pyc files
80- ( cd debian/tmp/usr/share/python-support/bittornado/BitTornado && \
81- rm -f *.pyc && \
82- cd BT1 && \
83- rm -f *.pyc )
84
85 # Build architecture-independent files here.
86 binary-indep: build install
87@@ -59,14 +50,15 @@
88 dh_installmime
89 dh_installman
90
91- # Remove the .py from the end of each of these and add .bittornado
92- # so that the alternatives system can work
93+ # create versions with .bittornado suffix so that the alternatives
94+ # system can work. the .py extensions are not installed.
95+ # btmakemetafile.py and btcompletedir.py is needed for pyinstall
96 ( cd debian/tmp/usr/bin && \
97 for i in btdownloadgui btdownloadheadless bttrack btmakemetafile \
98 btlaunchmany btcompletedir btcompletedirgui \
99 btdownloadcurses btlaunchmanycurses btreannounce btrename \
100 btshowmetainfo; \
101- do mv $$i.py $$i.bittornado || exit 1 ; done )
102+ do cp $$i.py $$i.bittornado || exit 1 ; done )
103
104 # Remove the .py from the end of each of these, the following are not
105 # included in bittorrent, so they are not renamed to having the
106@@ -80,7 +72,7 @@
107 dh_link
108 dh_compress
109 dh_fixperms
110- dh_pysupport
111+ dh_python2
112 dh_installdeb
113 dh_shlibdeps
114 dh_gencontrol

Subscribers

People subscribed via source and target branches

to all changes: