~ubuntu-branches/ubuntu/saucy/caret/saucy-proposed

Viewing all changes in revision 9.

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-12-20 01:14:47 UTC
  • mfrom: (4.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20101220011447-litzpg93pnt0duve
Tags: 5.6.1.3~dfsg.1-4ubuntu1
* Fix FTBFS due to indirect linking
  - Add explicit linking against Zlib to caret_qmake_include.pro and
    caret_qmake_include_linux64.pro
  - Add zlib1g-dev to build-depends
* Merge from debian unstable.  Remaining changes:
  - Add libqtassistantclient-dev build-dep for Qt Assistant transition

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: