[med-svn] [camitk] 02/08: Fix some conflicts due to previous unadded files

[Emmanuel Promayon]

This is an automated email from the git hooks/post-receive script.

promayon-guest pushed a commit to branch master
in repository camitk.

commit 0e8d158bb8cfdeea59a92bb0ce5040c01d4aec48
Merge: 97ff05b dd2ebb5
Author: Emmanuel Promayon <Emmanuel.Promayon at imag.fr>
Date:   Sun Apr 24 17:16:36 2016 +0200

    Fix some conflicts due to previous unadded files

 debian/changelog |  9 ++++++++-
 debian/control   | 12 +++++++++---
 debian/copyright |  2 +-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index c221e46,25eac67..6082476
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,10 +1,16 @@@
- camitk (4.0.0-1) UNRELEASED; urgency=low
+ camitk (4.0.0~beta-1) UNRELEASED; urgency=low
  
    [ Emmanuel Promayon ]
 -  * New upstream release.
 -  * make the build reproducible (patch reproducible-build-bug-794740.diff)
 -    Closes: #794740
 -
 +  * New major version upstream release (updating Build-Depends).
 +  * camitk 4 now depends on vtk6
 +    Closes: #798167
 +  * camitk 4 now depends on Qt5
 +    Closes: #816805 
 +  * Fixed debian/rules to run test only for architecture any
 +    Closes: #817163
 +  * Fixed reproducibility: using SOURCE_DATE_EPOCH when available
 +    Closes: #794740 
 +  
    [ Andreas Tille ]
    * Moved packaging from SVN to Git
  
diff --cc debian/control
index 09fa84a,9297179..c336c07
--- a/debian/control
+++ b/debian/control
@@@ -6,18 -7,20 +6,24 @@@ Section: scienc
  Priority: optional
  Build-Depends: debhelper (>= 9),
                 cmake,
-                xsdcxx,
+                libvtk6-dev,
                 qtbase5-dev,
+                libvtk6-qt-dev,
+                xsdcxx,
+                libinsighttoolkit4-dev,
 -               libxerces-c-dev,
 -               libxml2-dev,
 -               libgdcm2-dev,
 +               libqt5xmlpatterns5-dev,
 +               qttools5-dev,
 +               qttools5-dev-tools,
 +               libvtk6-dev,
 +               libhdf5-mpi-dev,
 +               libvtk6-qt-dev,
 +               libinsighttoolkit4-dev,
                 libfftw3-dev,
 -               libqtwebkit-dev,
 +               libgdcm2-dev,
                 libvtkgdcm2-dev,
+                libqt5opengl5-dev,
+                libqt5xmlpatterns5-dev,
+                qttools5-dev-tools,
                 xvfb,
                 xauth
  Build-Depends-Indep: doxygen,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/camitk.git