Ubuntu
caret package

Merge lp:~valavanisalex/ubuntu/maverick/caret/caret-fix-605202 into lp:ubuntu/maverick/caret

  1. Maverick (10.10)
  2. caret-fix-605202
  3. Merge into maverick
Proposed by Alex Valavanis
Status: Work in progress
Proposed branch: lp:~valavanisalex/ubuntu/maverick/caret/caret-fix-605202
Merge into: lp:ubuntu/maverick/caret
Diff against target: 40 lines (+12/-2)
2 files modified
debian/changelog (+8/-0)
debian/control (+4/-2)
To merge this branch: bzr merge lp:~valavanisalex/ubuntu/maverick/caret/caret-fix-605202
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Pending
Review via email: mp+30221@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

9. By Alex Valavanis

Updated changelog to account for Recommends change

8. By Alex Valavanis

* debian/control: Fix FTBFS with Qt 4.7 (LP: #605202)
  + Added Build-Depends: libqtassistantclient-dev

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 2010-03-25 09:08:10 +0000
3+++ debian/changelog 2010-07-18 19:26:38 +0000
4@@ -1,3 +1,11 @@
5+caret (5.6.1.3~dfsg.1-2ubuntu1) maverick; urgency=low
6+
7+ * debian/control: Fix FTBFS with Qt 4.7 (LP: #605202)
8+ + Added Build-Depends: libqtassistantclient-dev
9+ + Added Recommends: qt-assistant-compat
10+
11+ -- Alexander Valavanis <valavanisalex@googlemail.com> Sun, 18 Jul 2010 20:10:00 +0100
12+
13 caret (5.6.1.3~dfsg.1-2) unstable; urgency=low
14
15 * Add slightly modified patch to address FTBFS on kFreeBSD originally
16
17=== modified file 'debian/control'
18--- debian/control 2010-03-25 09:08:10 +0000
19+++ debian/control 2010-07-18 19:26:38 +0000
20@@ -1,9 +1,10 @@
21 Source: caret
22 Section: science
23 Priority: optional
24-Maintainer: Michael Hanke <michael.hanke@gmail.com>
25+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
26+XSBC-Original-Maintainer: Michael Hanke <michael.hanke@gmail.com>
27 Uploaders: Yaroslav Halchenko <debian@onerussian.com>
28-Build-Depends: debhelper (>= 5), libqt4-dev (>= 4.3), libqt4-opengl-dev | libqt4-dev (<< 4.4.0), libqwt5-qt4-dev, libvtk5-dev, libminc-dev
29+Build-Depends: debhelper (>= 5), libqt4-dev (>= 4.3), libqt4-opengl-dev | libqt4-dev (<< 4.4.0), libqwt5-qt4-dev, libvtk5-dev, libminc-dev, libqtassistantclient-dev
30 Standards-Version: 3.8.4
31 Homepage: http://brainvis.wustl.edu/wiki/index.php/Caret:About
32 Vcs-Browser: http://git.debian.org/?p=pkg-exppsy/caret.git
33@@ -13,6 +14,7 @@
34 Package: caret
35 Architecture: any
36 Depends: ${shlibs:Depends}, ${misc:Depends}
37+Recommends: qt-assistant-compat
38 Suggests: caret-data (>= 5.6~dfsg.1)
39 Description: Computerized Anatomical Reconstruction and Editing Toolkit
40 This software allows for creating, viewing and manipulating surface

Subscribers

People subscribed via source and target branches

to all changes: