OpenLP

Merge lp:~raoul-snyman/openlp/bug-899487 into lp:openlp

  1. bug-899487
  2. Merge into trunk
Proposed by Raoul Snyman
Status: Merged
Approved by: Tim Bentley
Approved revision: 1813
Merged at revision: 1813
Proposed branch: lp:~raoul-snyman/openlp/bug-899487
Merge into: lp:openlp
Diff against target: 15 lines (+3/-2)
1 file modified
resources/debian/debian/control (+3/-2)
To merge this branch: bzr merge lp:~raoul-snyman/openlp/bug-899487
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Review via email: mp+84362@code.launchpad.net

Description of the change

Fixes bug #899487. Added a missing dependency.

To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'resources/debian/debian/control'
2--- resources/debian/debian/control 2011-08-26 12:14:21 +0000
3+++ resources/debian/debian/control 2011-12-03 11:47:25 +0000
4@@ -10,8 +10,9 @@
5 Package: openlp
6 Architecture: all
7 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-qt4,
8- python-qt4-phonon, python-sqlalchemy, python-chardet, python-beautifulsoup,
9- python-lxml, python-sqlite, python-enchant, python-mako, python-migrate
10+ python-qt4-phonon, python-qt4-gl, python-sqlalchemy, python-chardet,
11+ python-beautifulsoup, python-lxml, python-sqlite, python-enchant,
12+ python-mako, python-migrate
13 Conflicts: python-openlp
14 Description: Church lyrics projection application
15 OpenLP is free church presentation software, or lyrics projection software,