Merge lp:~saiarcot895/ubuntu/utopic/openscenegraph/fix-dev-depends into lp:ubuntu/utopic/openscenegraph

Proposed by Saikrishna Arcot
Status: Merged
Merge reported by: Dmitry Shachnev
Merged at revision: not available
Proposed branch: lp:~saiarcot895/ubuntu/utopic/openscenegraph/fix-dev-depends
Merge into: lp:ubuntu/utopic/openscenegraph
Diff against target: 28 lines (+9/-1)
2 files modified
debian/changelog (+7/-0)
debian/control (+2/-1)
To merge this branch: bzr merge lp:~saiarcot895/ubuntu/utopic/openscenegraph/fix-dev-depends
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+232801@code.launchpad.net

Description of the change

The current version of libopenscenegraph-dev depends on libgl1-mesa-dev on all architectures, including on armhf, where it is built using libgles2-mesa-dev. Considering that only GLES is supported on Ubuntu armhf, and considering that the library wasn't built with libgl1-mesa-dev, the dependency should be changed to libgles2-mesa-dev.

To post a comment you must log in.
Revision history for this message
Dmitry Shachnev (mitya57) wrote :

Thanks, uploaded.

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 2014-08-06 17:41:46 +0000
3+++ debian/changelog 2014-08-30 23:56:58 +0000
4@@ -1,3 +1,10 @@
5+openscenegraph (3.2.0~rc1-5.1ubuntu2) utopic; urgency=low
6+
7+ * Change Depends of libopenscenegraph-dev for armhf from libgl1-mesa-
8+ dev to libgles2-mesa-dev (LP: #1363529)
9+
10+ -- Saikrishna Arcot <saiarcot895@gmail.com> Sat, 30 Aug 2014 19:51:40 -0400
11+
12 openscenegraph (3.2.0~rc1-5.1ubuntu1) utopic; urgency=low
13
14 * Add support for building on armhf by building with OpenGL ES 2.0
15
16=== modified file 'debian/control'
17--- debian/control 2014-08-06 17:41:46 +0000
18+++ debian/control 2014-08-30 23:56:58 +0000
19@@ -73,7 +73,8 @@
20 Architecture: any
21 Depends: ${misc:Depends},
22 libopenthreads-dev,
23- libgl1-mesa-dev | libgl-dev,
24+ libgl1-mesa-dev [!armhf] | libgl-dev [!armhf],
25+ libgles2-mesa-dev [armhf],
26 libglu-dev,
27 libopenscenegraph99 (= ${binary:Version})
28 Suggests: openscenegraph-doc,

Subscribers

People subscribed via source and target branches