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

[Alex Valavanis]

Unmerged revisions

9. By Alex Valavanis on 2010-07-18

Updated changelog to account for Recommends change

8. By Alex Valavanis on 2010-07-18

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

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