~ubuntu-branches/ubuntu/wily/xmakemol/wily

Viewing all changes in revision 12.

  • Committer: Bazaar Package Importer
  • Author(s): Bhavani Shankar
  • Date: 2010-11-06 11:07:34 UTC
  • mfrom: (3.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20101106110734-qlzvqn8eo4uqgbrn
Tags: 5.16-5ubuntu1
* Merge from debian unstable(LP: #592328). Remaining changes:
  - Don't build a GL-enabled version (lesstif isn't in main, so the GL
    libraries aren't built with it):
    + debian/control: Don't build-depend on libgl1-mesa-swx11-dev or
      freeglut3-dev.
    + debian/rules: Don't build the OpenGL-enabled version.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: