[vtk6] 01/02: Use wrap-and-sort.
Anton Gladky
gladk at moszumanska.debian.org
Tue Mar 24 21:31:37 UTC 2015
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch experimental
in repository vtk6.
commit 81218822a39c386e48025688012e8506ad27f4c1
Author: Anton Gladky <gladk at debian.org>
Date: Tue Mar 24 22:28:14 2015 +0100
Use wrap-and-sort.
---
debian/control | 115 +++++++++++++++++++++++----------------------
debian/copyright | 2 +-
debian/libvtk6-dev.install | 6 +--
debian/tcl-vtk6.install | 4 +-
4 files changed, 64 insertions(+), 63 deletions(-)
diff --git a/debian/control b/debian/control
index 728f92e..613e837 100644
--- a/debian/control
+++ b/debian/control
@@ -39,12 +39,10 @@ Build-Depends:
libosmesa6-dev,
libpng-dev,
libpq-dev,
- qtbase5-dev [!armel !armhf],
- libqt5webkit5-dev [!armel !armhf],
- libqt5opengl5-dev [!armel !armhf],
- qttools5-private-dev [!armel !armhf],
libqt4-dev [armel armhf],
libqt4-opengl-dev [armel armhf],
+ libqt5opengl5-dev [!armel !armhf],
+ libqt5webkit5-dev [!armel !armhf],
libqtwebkit-dev [armel armhf],
libsqlite3-dev,
libswscale-dev,
@@ -52,19 +50,21 @@ Build-Depends:
libtiff-dev,
libutfcpp-dev,
libx11-dev,
- libxml2-dev,
libxdmf-dev,
+ libxml2-dev,
libxpm-dev,
libxt-dev,
mpi-default-dev,
pkg-config,
- python-autobahn,
- python-six,
- python-twisted,
python-all-dev (<< 2.8),
python-all-dev (>= 2.7),
+ python-autobahn,
python-matplotlib,
python-mpi4py,
+ python-six,
+ python-twisted,
+ qtbase5-dev [!armel !armhf],
+ qttools5-private-dev [!armel !armhf],
r-base,
r-base-core,
r-base-dev,
@@ -85,45 +85,6 @@ Vcs-Git: git://anonscm.debian.org/debian-science/packages/vtk6.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/vtk6.git
XS-Testsuite: autopkgtest
-Package: libvtk6.2
-Architecture: any
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-Replaces:
- libvtk32,
- libvtk4,
- libvtk4c2,
- libvtk4c2a,
- libvtk5,
- libvtk5.8,
- libvtk6
-Conflicts:
- libvtk6 (>>6.0.0-7)
-Suggests:
- libvtk6-dev,
- mpi-default-bin,
- vtk6-doc,
- vtk6-examples
-Section: libs
-Description: Visualization Toolkit - A high level 3D visualization library - runtime
- The Visualization Toolkit (VTK) is an object oriented, high level
- library that allows one to easily write C++ programs, Tcl, Python and
- Java scripts that do 3D visualization.
- .
- VTK enables users to concentrate on their work by providing a large
- number of excellent and feature packed high level functions that do
- visualization. The library needs OpenGL to render the graphics and
- for Linux machines Mesa is necessary. The terms/copyright can be read
- in /usr/share/doc/vtk/README and README.html. VTK-Linux-HOWTO has
- information about using vtk, getting documentataion or help and
- instructions on building VTK.
- .
- This package provides the shared libraries needed to run C++ programs
- that use VTK.
- .
- To compile C++ code that uses VTK you have to install libvtk5-dev.
-
Package: libvtk6-dev
Architecture: any
Conflicts:
@@ -164,20 +125,20 @@ Depends:
libtiff-dev,
libvtk6.2 (= ${binary:Version}),
libx11-dev,
+ libxdmf-dev,
libxft-dev,
libxml2-dev,
- libxdmf-dev,
libxss-dev,
libxt-dev,
mpi-default-dev,
python-vtk6 (= ${binary:Version}),
- tcl-vtk6 (= ${binary:Version}),
+ python-zope.interface,
tcl-dev,
+ tcl-vtk6 (= ${binary:Version}),
tk8.6-dev,
vtk6 (= ${binary:Version}),
x11proto-core-dev,
zlib1g-dev,
- python-zope.interface,
${misc:Depends}
Suggests:
vtk6-doc,
@@ -191,19 +152,59 @@ Description: VTK header files for building C++ code
This package provides the VTK header files required to compile
C++ programs that use VTK to do 3D visualisation.
+Package: libvtk6.2
+Architecture: any
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Replaces:
+ libvtk32,
+ libvtk4,
+ libvtk4c2,
+ libvtk4c2a,
+ libvtk5,
+ libvtk5.8,
+ libvtk6
+Conflicts:
+ libvtk6 (>>6.0.0-7)
+Suggests:
+ libvtk6-dev,
+ mpi-default-bin,
+ vtk6-doc,
+ vtk6-examples
+Section: libs
+Description: Visualization Toolkit - A high level 3D visualization library - runtime
+ The Visualization Toolkit (VTK) is an object oriented, high level
+ library that allows one to easily write C++ programs, Tcl, Python and
+ Java scripts that do 3D visualization.
+ .
+ VTK enables users to concentrate on their work by providing a large
+ number of excellent and feature packed high level functions that do
+ visualization. The library needs OpenGL to render the graphics and
+ for Linux machines Mesa is necessary. The terms/copyright can be read
+ in /usr/share/doc/vtk/README and README.html. VTK-Linux-HOWTO has
+ information about using vtk, getting documentataion or help and
+ instructions on building VTK.
+ .
+ This package provides the shared libraries needed to run C++ programs
+ that use VTK.
+ .
+ To compile C++ code that uses VTK you have to install libvtk5-dev.
+
Package: python-vtk6
Architecture: any
-Conflicts: python-vtk
+Conflicts:
+ python-vtk
Depends:
libvtk6.2 (= ${binary:Version}),
- ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends},
- python-six,
- python-twisted,
python-autobahn,
python-mpi4py,
- python-zope.interface
+ python-six,
+ python-twisted,
+ python-zope.interface,
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
Suggests:
mayavi2,
vtk6-doc,
diff --git a/debian/copyright b/debian/copyright
index 208d268..1d7bad6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Source: http://www.vtk.org/
Upstream-Name: Visualization Toolkit
-Files-Excluded:
+Files-Excluded:
Web/*
Examples/GUI/Win32
ThirdParty/xdmf3
diff --git a/debian/libvtk6-dev.install b/debian/libvtk6-dev.install
index b2f31e0..076cd78 100644
--- a/debian/libvtk6-dev.install
+++ b/debian/libvtk6-dev.install
@@ -1,5 +1,6 @@
# add doxygen docs
# to get paraview debian/build properly on top of vtk
+/usr/lib/*/python2.7/site-packages/vtk/*
CMake/TopologicalSort.cmake usr/lib/cmake/vtk-6.2/
CMake/exportheader.cmake.in usr/lib/cmake/vtk-6.2/
CMake/vtkGroups.cmake usr/lib/cmake/vtk-6.2/
@@ -14,12 +15,11 @@ Testing/Core/vtkTesting*.h usr/include/vtk-6.2
Testing/Rendering/vtkRegressionTestImage.h usr/include/vtk-6.2/
Testing/Rendering/vtkTesting*.h usr/include/vtk-6.2
ThirdParty/ftgl/src/FTGL.h usr/include/vtk-6.2/
-debian/build/ThirdParty/netcdf/vtk_netcdf.h usr/include/vtk-6.2/
-debian/build/ThirdParty/netcdf/vtk_netcdfcpp.h usr/include/vtk-6.2/
Wrapping/Java/JavaDependencies.cmake.in usr/lib/cmake/vtk-6.2/
debian/build/ThirdParty/ftgl/vtkftglConfig.h usr/include/vtk-6.2/
+debian/build/ThirdParty/netcdf/vtk_netcdf.h usr/include/vtk-6.2/
+debian/build/ThirdParty/netcdf/vtk_netcdfcpp.h usr/include/vtk-6.2/
debian/build/lib/cmake/vtk-6.2/Modules/*-Headers.cmake usr/lib/cmake/vtk-6.2/Modules/
usr/include/vtk-6.2 usr/include
usr/lib/*/*.so
-/usr/lib/*/python2.7/site-packages/vtk/*
usr/lib/cmake/vtk-6.2
diff --git a/debian/tcl-vtk6.install b/debian/tcl-vtk6.install
index 2e62be5..1fd4e8f 100644
--- a/debian/tcl-vtk6.install
+++ b/debian/tcl-vtk6.install
@@ -1,5 +1,5 @@
usr/bin/vtkWrapTcl-6.2
usr/bin/vtkWrapTclInit-6.2
-usr/lib/tcltk
-usr/lib/lib*.so.*
usr/lib/lib*.so
+usr/lib/lib*.so.*
+usr/lib/tcltk
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vtk6.git
More information about the debian-science-commits
mailing list