Merge lp:~cyphermox/ubuntu/lucid/atheist/ftbfs-lp506240 into lp:ubuntu/lucid/atheist

Proposed by Mathieu Trudel-Lapierre
Status: Merged
Merged at revision: not available
Proposed branch: lp:~cyphermox/ubuntu/lucid/atheist/ftbfs-lp506240
Merge into: lp:ubuntu/lucid/atheist
Diff against target: 36 lines (+9/-2)
2 files modified
debian/changelog (+6/-0)
debian/control (+3/-2)
To merge this branch: bzr merge lp:~cyphermox/ubuntu/lucid/atheist/ftbfs-lp506240
Reviewer Review Type Date Requested Status
Registry Administrators Pending
Review via email: mp+17228@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

See LP# 506240

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 2009-12-04 19:35:01 +0000
3+++ debian/changelog 2010-01-12 13:49:11 +0000
4@@ -1,3 +1,9 @@
5+atheist (0.20091130-1ubuntu1) lucid; urgency=low
6+
7+ * Fix FTBFS: also build for python versions after 2.5 (LP: #506240)
8+
9+ -- Mathieu Trudel <mathieu-tl@ubuntu.com> Mon, 11 Jan 2010 18:11:25 -0500
10+
11 atheist (0.20091130-1) unstable; urgency=low
12
13 * Changelog rule deleted.
14
15=== modified file 'debian/control'
16--- debian/control 2009-12-04 19:35:01 +0000
17+++ debian/control 2010-01-12 13:49:11 +0000
18@@ -1,7 +1,8 @@
19 Source: atheist
20 Section: devel
21 Priority: optional
22-Maintainer: Cleto Martin Angelina <cleto.martin@gmail.com>
23+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
24+XSBC-Original-Maintainer: Cleto Martin Angelina <cleto.martin@gmail.com>
25 Uploaders: Francisco Moya <paco@debian.org>
26 Homepage: https://savannah.nongnu.org/projects/atheist/
27 Build-Depends: cdbs, debhelper (>= 7), python-sphinx (>= 0.6.2),
28@@ -9,7 +10,7 @@
29 texlive-latex-base, texlive-latex-extra, texlive-latex-recommended,
30 texlive-fonts-recommended
31 Standards-Version: 3.8.3
32-XS-Python-Version: 2.5
33+XS-Python-Version: >=2.5
34
35 Package: atheist
36 Architecture: all

Subscribers

People subscribed via source and target branches