[med-svn] [Git][med-team/vtk-dicom][master] 19 commits: eliminate merge conflicts

[Gert Wollny]

Gert Wollny pushed to branch master at Debian Med / vtk-dicom


Commits:
98aad394 by Gert Wollny at 2016-10-01T21:55:24+02:00
eliminate merge conflicts

- - - - -
a60ac6fb by Gert Wollny at 2018-04-22T14:08:42+02:00
d/control: Prepare vor version 0.8 based on vtk7
d/control, d/compat: update to dephelper 11

- - - - -
5e3c2e3f by Gert Wollny at 2018-04-22T14:11:20+02:00
d/* update packages for v0.8 and python3

- - - - -
5a36aace by Gert Wollny at 2018-04-22T14:12:14+02:00
New upstream version 0.8.7
- - - - -
fc1e167e by Gert Wollny at 2018-04-22T14:12:21+02:00
Update upstream source from tag 'upstream/0.8.7'

Update to upstream version '0.8.7'
with Debian dir c1e7b37306fb52be938704324d9806df3453a6a7
- - - - -
9adbbeca by Gert Wollny at 2018-04-22T14:13:06+02:00
Update changelog

- - - - -
754eadd1 by Gert Wollny at 2018-04-22T14:16:51+02:00
Refresh patches

- - - - -
d9400b09 by Gert Wollny at 2018-04-22T14:17:42+02:00
Correct python3 dep

- - - - -
659a854b by Gert Wollny at 2018-04-22T14:37:09+02:00
rename patches

- - - - -
4d58b3bc by Gert Wollny at 2018-04-22T14:43:09+02:00
Fix changelog

- - - - -
ec58168b by Gert Wollny at 2018-04-22T14:48:21+02:00
d/p/03: run test with python3

- - - - -
29a8b3a1 by Gert Wollny at 2018-04-22T14:54:00+02:00
d/rules: Update python version

- - - - -
49e8a792 by Gert Wollny at 2018-04-22T15:12:13+02:00
d/p/03: Update patch for testing

- - - - -
1f4f2f89 by Gert Wollny at 2018-04-22T15:15:05+02:00
d/control: Update my uploader address

- - - - -
f9635b4c by Gert Wollny at 2018-04-22T15:16:25+02:00
d/control: Update VCS url

- - - - -
8c49a092 by Gert Wollny at 2018-04-22T15:17:23+02:00
Update changelog

- - - - -
b887bbed by Gert Wollny at 2018-04-22T15:25:59+02:00
Update python depends

- - - - -
9d8543e3 by Gert Wollny at 2018-04-22T15:31:43+02:00
Correct python dependencies

- - - - -
8795da34 by Gert Wollny at 2018-04-22T15:33:29+02:00
Correct python dependencies

- - - - -


30 changed files:

- CMake/DICOMConfig.cmake.in
- CMake/vtkDICOMConfig.h.in
- CMake/vtkDICOMModule.h.in
- CMake/vtkWrapHierarchy.cmake
- CMakeLists.txt
- Copyright.txt
- DicomCli/mainmacro.h
- DicomCli/progress.cxx
- DicomCli/progress.h
- DicomCli/readquery.cxx
- DicomCli/readquery.h
- DicomCli/vtkConsoleOutputWindow.cxx
- DicomCli/vtkConsoleOutputWindow.h
- + Documents/Attributes.md
- + Documents/Directories.md
- + Documents/ImageDisplay.md
- + Documents/ImageOrientation.md
- + Documents/ImageReader.md
- + Documents/ImageWriter.md
- + Documents/Installation.md
- + Documents/License.md
- + Documents/Main.md
- Examples/CMakeLists.txt
- Examples/TestDICOMCompiler.cxx
- Examples/TestDICOMDirectory.cxx
- Examples/TestDICOMDisplay.cxx
- Examples/TestDICOMFileSorter.cxx
- + Examples/TestDICOMOverlay.cxx
- Examples/TestDICOMParser.cxx
- Examples/TestDICOMReader.cxx


The diff was not included because it is too large.


View it on GitLab: https://salsa.debian.org/med-team/vtk-dicom/compare/41d5ddd59fad05347e72eb07d6dafcc9aaef9699...8795da344dcc43e762f4fefea0b3f7e1e6905510

---
View it on GitLab: https://salsa.debian.org/med-team/vtk-dicom/compare/41d5ddd59fad05347e72eb07d6dafcc9aaef9699...8795da344dcc43e762f4fefea0b3f7e1e6905510
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20180422/52adfb00/attachment.html>