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

Subscribers

People subscribed via source and target branches