Ubuntu
pytrainer package

Merge lp:~lfaraone/ubuntu/lucid/pytrainer/1.7.1-merge into lp:ubuntu/lucid/pytrainer

  1. Lucid (10.04)
  2. 1.7.1-merge
  3. Merge into lucid
Proposed by Luke Faraone
Status: Merged
Merged at revision: not available
Proposed branch: lp:~lfaraone/ubuntu/lucid/pytrainer/1.7.1-merge
Merge into: lp:ubuntu/lucid/pytrainer
Diff against target: 111 lines (+38/-4)
6 files modified
debian/changelog (+28/-0)
debian/control (+2/-2)
debian/rules (+2/-2)
import/file_garmintools.py (+2/-0)
plugins/garmintools/garmintools.py (+2/-0)
plugins/garmintools_full/garmintools_full.py (+2/-0)
To merge this branch: bzr merge lp:~lfaraone/ubuntu/lucid/pytrainer/1.7.1-merge
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Ubuntu branches Pending
Review via email: mp+21447@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Uploaded. Thanks. It should be sitting in the queue.

review: Approve

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 2010-02-04 06:07:11 +0000
3+++ debian/changelog 2010-03-16 13:57:22 +0000
4@@ -1,3 +1,31 @@
5+pytrainer (1.7.1-1.1ubuntu1) lucid; urgency=low
6+
7+ * Merge from debian testing, remaining changes
8+ - debian/control:
9+ + Replace Depends on iceweasel with firefox | abrowser.
10+ - Drop dependency on python-glade2 (libglade -> gtkbuilder transition).
11+
12+ -- Luke Faraone <luke@faraone.cc> Tue, 16 Mar 2010 09:14:39 -0400
13+
14+pytrainer (1.7.1-1.1) unstable; urgency=low
15+
16+ * Non-maintainer upload, to prepare for Python 2.6 transition
17+ * debian/rules
18+ - added '--install-layout=deb' parameter to setup.py install call; thanks to
19+ Jakub Wilk for the report; Closes: #530526
20+ * debian/control
21+ - set b-d on python (instead of p-dev) and bump version to '>= 2.5.3-1~', to
22+ support install-layout
23+ * debian/{control, rules}
24+ - added python-support, to byte-compiling and properly handle Python
25+ module; thanks to Luca Falavigna for the report; Closes: #566046
26+ * plugins/{garmintools/garmintools.py, garmintools_full/garmintools_full.py},
27+ import/file_garmintools.py
28+ - patched to explicitly import the "with" statement; thanks to Jonathan
29+ Wiltshire for the report; Closes: #568781
30+
31+ -- Sandro Tosi <morph@debian.org> Thu, 04 Mar 2010 15:00:30 +0100
32+
33 pytrainer (1.7.1-1ubuntu1) lucid; urgency=low
34
35 * Merge from debian testing, remaining changes:
36
37=== modified file 'debian/control'
38--- debian/control 2010-02-04 06:07:11 +0000
39+++ debian/control 2010-03-16 13:57:22 +0000
40@@ -3,8 +3,8 @@
41 Priority: optional
42 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
43 XSBC-Original-Maintainer: Noèl Köthe <noel@debian.org>
44-Build-Depends-Indep: python-dev (>= 2.6.1-0ubuntu1)
45-Build-Depends: debhelper (>= 5.0.38)
46+Build-Depends-Indep: python (>= 2.5.3-1~), python-support (>= 1.0.0)
47+Build-Depends: debhelper (>= 5.0.0)
48 Standards-Version: 3.8.3
49 Homepage: http://sourceforge.net/projects/pytrainer/
50
51
52=== modified file 'debian/rules'
53--- debian/rules 2010-02-04 06:07:11 +0000
54+++ debian/rules 2010-03-16 13:57:22 +0000
55@@ -28,7 +28,7 @@
56 dh_testroot
57 dh_clean -k
58 dh_installdirs
59- python setup.py install --no-compile --prefix $(CURDIR)/debian/pytrainer/usr --install-layout=DEB
60+ python setup.py install --no-compile --prefix $(CURDIR)/debian/pytrainer/usr --install-layout=deb
61 mv $(CURDIR)/debian/pytrainer/usr/bin/pytrainer $(CURDIR)/debian/pytrainer/usr/bin/pytr
62 cp $(CURDIR)/debian/mozpytrainer.sh $(CURDIR)/debian/pytrainer/usr/bin/pytrainer
63
64@@ -48,7 +48,7 @@
65 dh_strip
66 dh_compress
67 dh_fixperms
68-# dh_pysupport
69+ dh_pysupport
70 dh_installdeb
71 dh_shlibdeps
72 dh_gencontrol
73
74=== modified file 'import/file_garmintools.py'
75--- import/file_garmintools.py 2010-01-24 20:54:37 +0000
76+++ import/file_garmintools.py 2010-03-16 13:57:22 +0000
77@@ -17,6 +17,8 @@
78 #along with this program; if not, write to the Free Software
79 #Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
80
81+from __future__ import with_statement
82+
83 import logging
84 import os
85 import StringIO
86
87=== modified file 'plugins/garmintools/garmintools.py'
88--- plugins/garmintools/garmintools.py 2010-01-24 20:54:37 +0000
89+++ plugins/garmintools/garmintools.py 2010-03-16 13:57:22 +0000
90@@ -17,6 +17,8 @@
91 #along with this program; if not, write to the Free Software
92 #Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
93
94+from __future__ import with_statement
95+
96 import logging
97 import os
98 import StringIO
99
100=== modified file 'plugins/garmintools_full/garmintools_full.py'
101--- plugins/garmintools_full/garmintools_full.py 2010-01-24 20:54:37 +0000
102+++ plugins/garmintools_full/garmintools_full.py 2010-03-16 13:57:22 +0000
103@@ -17,6 +17,8 @@
104 #along with this program; if not, write to the Free Software
105 #Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
106
107+from __future__ import with_statement
108+
109 import os
110 import sys
111 import logging

Subscribers

People subscribed via source and target branches

to all changes: