[SCM] Paraview packaging branch, master, updated. upstream/3.10.1-74-g0c267bd

Mathieu Malaterre mathieu.malaterre at gmail.com
Wed Sep 7 13:36:37 UTC 2011 

The following commit has been merged in the master branch:
commit 0c267bd8dee031082302b5de9c6d55e14dade2ce
Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
Date:   Wed Sep 7 13:36:11 2011 +0000

    Properly add B-D on libsqlite3-dev

diff --git a/debian/control b/debian/control
index c9fd9f8..51b1fca 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Christophe Prud'homme <prudhomm at debian.org>,
  Mathieu Malaterre <mathieu.malaterre at gmail.com>, 
  Anton Gladky <gladky.anton at gmail.com>
 Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-4), cmake (>= 2.6.3), 
- libqt4-dev (>= 4.3.3-2),
+ libqt4-dev (>= 4.3.3-2), libsqlite3-dev,
  qt4-dev-tools, libboost-all-dev, 
  libavformat-dev (>= 0.7.1),
  libavutil-dev, libavcodec-dev, libswscale-dev, python-dev, python-support, 
diff --git a/debian/paraview-dev.install b/debian/paraview-dev.install
index 565a6e7..40079d0 100644
--- a/debian/paraview-dev.install
+++ b/debian/paraview-dev.install
@@ -1,6 +1,9 @@
 usr/include
 usr/lib/paraview/*.so
-usr/lib/paraview/CMake/
+usr/lib/paraview/CMake/*.cmake
+usr/lib/paraview/CMake/*.in
+usr/lib/paraview/*.cmake
+usr/lib/paraview/hints
 usr/bin/vtkWrapClientServer
 usr/bin/vtkEncodeString
 usr/bin/smTestDriver
diff --git a/debian/paraview-python.pyinstall b/debian/paraview-python.pyinstall
index c59b50a..1640bd6 100644
--- a/debian/paraview-python.pyinstall
+++ b/debian/paraview-python.pyinstall
@@ -1,3 +1,3 @@
-debian/build/Utilities/VTKPythonWrapping/site-packages/paraview/*.py paraview
-debian/build/Utilities/VTKPythonWrapping/site-packages/paraview/demos/*.py paraview.demos
-debian/build/Utilities/VTKPythonWrapping/site-packages/paraview/vtk/*.py paraview.vtk
+debian/tmp/usr/lib/paraview/site-packages/paraview/*.py paraview
+debian/tmp/usr/lib/paraview/site-packages/paraview/demos/*.py paraview.demos
+debian/tmp/usr/lib/paraview/site-packages/paraview/vtk/*.py paraview.vtk
diff --git a/debian/paraview.install b/debian/paraview.install
index bf50e28..7c4093c 100644
--- a/debian/paraview.install
+++ b/debian/paraview.install
@@ -7,6 +7,7 @@ usr/bin/pvdataserver
 usr/bin/pvrenderserver
 usr/bin/pvserver
 usr/lib/paraview/*.so.*
+usr/lib/paraview/CMake/*.png
 usr/share
 usr/lib/paraview/vistrails/plugin/pgui/resources/images/* usr/share/doc/paraview/images/vistrails/pgui/images
 usr/lib/paraview/vistrails/plugin/app/resources/images/app_icon.png usr/share/doc/paraview/images/vistrails/app/images
diff --git a/debian/paraview.lintian-overrides b/debian/paraview.lintian-overrides
index c9c5b80..edc4839 100644
--- a/debian/paraview.lintian-overrides
+++ b/debian/paraview.lintian-overrides
@@ -1,4 +1,3 @@
 # These embedded libraries, seems, have different versions than in repository.
 # The code is incompatible with repo-versions.
 paraview binary: embedded-library usr/lib/paraview/libvtkftgl.so.pv3.10: ftgl
-paraview binary: embedded-library usr/lib/paraview/libvtksqlite.so.pv3.10: sqlite
diff --git a/debian/patches/removesqlite.patch b/debian/patches/removesqlite.patch
index 6c9f2c4..3dbc05d 100644
--- a/debian/patches/removesqlite.patch
+++ b/debian/patches/removesqlite.patch
@@ -1,7 +1,7 @@
 Index: paraview/VTK/IO/vtkSQLiteDatabase.cxx
 ===================================================================
---- paraview.orig/VTK/IO/vtkSQLiteDatabase.cxx	2011-09-07 08:29:38.000000000 +0000
-+++ paraview/VTK/IO/vtkSQLiteDatabase.cxx	2011-09-07 09:04:22.000000000 +0000
+--- paraview.orig/VTK/IO/vtkSQLiteDatabase.cxx	2011-09-07 09:55:32.000000000 +0000
++++ paraview/VTK/IO/vtkSQLiteDatabase.cxx	2011-09-07 09:55:35.000000000 +0000
 @@ -29,7 +29,7 @@
  #include <vtksys/ios/fstream>
  #include <vtksys/ios/sstream>
@@ -75,8 +75,8 @@ Index: paraview/VTK/IO/vtkSQLiteDatabase.cxx
  }
 Index: paraview/VTK/IO/vtkSQLiteQuery.cxx
 ===================================================================
---- paraview.orig/VTK/IO/vtkSQLiteQuery.cxx	2011-09-07 08:29:38.000000000 +0000
-+++ paraview/VTK/IO/vtkSQLiteQuery.cxx	2011-09-07 09:04:22.000000000 +0000
+--- paraview.orig/VTK/IO/vtkSQLiteQuery.cxx	2011-09-07 09:55:32.000000000 +0000
++++ paraview/VTK/IO/vtkSQLiteQuery.cxx	2011-09-07 09:55:35.000000000 +0000
 @@ -25,7 +25,7 @@
  #include "vtkVariant.h"
  #include "vtkVariantArray.h"
@@ -464,8 +464,8 @@ Index: paraview/VTK/IO/vtkSQLiteQuery.cxx
      errormessage << "sqlite_clear_bindings returned error: " << status;
 Index: paraview/VTK/IO/vtkSQLiteDatabase.h
 ===================================================================
---- paraview.orig/VTK/IO/vtkSQLiteDatabase.h	2011-09-07 08:29:38.000000000 +0000
-+++ paraview/VTK/IO/vtkSQLiteDatabase.h	2011-09-07 09:04:22.000000000 +0000
+--- paraview.orig/VTK/IO/vtkSQLiteDatabase.h	2011-09-07 09:55:32.000000000 +0000
++++ paraview/VTK/IO/vtkSQLiteDatabase.h	2011-09-07 09:55:35.000000000 +0000
 @@ -48,7 +48,7 @@
  class vtkSQLQuery;
  class vtkSQLiteQuery;
@@ -486,8 +486,8 @@ Index: paraview/VTK/IO/vtkSQLiteDatabase.h
    // should not be setting this for any reason
 Index: paraview/VTK/IO/vtkSQLiteQuery.h
 ===================================================================
---- paraview.orig/VTK/IO/vtkSQLiteQuery.h	2011-09-07 08:29:38.000000000 +0000
-+++ paraview/VTK/IO/vtkSQLiteQuery.h	2011-09-07 09:04:22.000000000 +0000
+--- paraview.orig/VTK/IO/vtkSQLiteQuery.h	2011-09-07 09:55:32.000000000 +0000
++++ paraview/VTK/IO/vtkSQLiteQuery.h	2011-09-07 09:55:35.000000000 +0000
 @@ -46,7 +46,7 @@
  class vtkSQLiteDatabase;
  class vtkVariant;
@@ -508,8 +508,8 @@ Index: paraview/VTK/IO/vtkSQLiteQuery.h
    char *LastErrorText;
 Index: paraview/VTK/Utilities/CMakeLists.txt
 ===================================================================
---- paraview.orig/VTK/Utilities/CMakeLists.txt	2011-09-07 08:29:38.000000000 +0000
-+++ paraview/VTK/Utilities/CMakeLists.txt	2011-09-07 09:04:22.000000000 +0000
+--- paraview.orig/VTK/Utilities/CMakeLists.txt	2011-09-07 09:55:32.000000000 +0000
++++ paraview/VTK/Utilities/CMakeLists.txt	2011-09-07 09:55:35.000000000 +0000
 @@ -42,7 +42,7 @@
    ADD_SUBDIRECTORY(vtkmetaio)
    SET_PROPERTY(GLOBAL APPEND PROPERTY VTK_TARGETS vtkmetaio)
@@ -519,3 +519,16 @@ Index: paraview/VTK/Utilities/CMakeLists.txt
  
  IF(VTK_HAS_EXODUS)
    ADD_SUBDIRECTORY(vtkexodus2)
+Index: paraview/VTK/IO/CMakeLists.txt
+===================================================================
+--- paraview.orig/VTK/IO/CMakeLists.txt	2011-09-07 09:55:45.000000000 +0000
++++ paraview/VTK/IO/CMakeLists.txt	2011-09-07 09:55:51.000000000 +0000
+@@ -19,7 +19,7 @@
+ SET(KIT_JAVA_LIBS vtkFilteringJava)
+ SET(KIT_INTERFACE_LIBRARIES vtkFiltering)
+ SET(KIT_LIBS vtkDICOMParser vtkNetCDF vtkNetCDF_cxx
+-  ${_VTK_METAIO_LIB} vtksqlite
++  ${_VTK_METAIO_LIB} sqlite3
+   ${VTK_PNG_LIBRARIES} ${VTK_ZLIB_LIBRARIES} ${VTK_JPEG_LIBRARIES}
+   ${VTK_TIFF_LIBRARIES} ${VTK_EXPAT_LIBRARIES} ${VTK_OGGTHEORA_LIBRARIES}
+   ${KWSYS_NAMESPACE})
diff --git a/debian/rules b/debian/rules
index b7d122d..be14f49 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,10 @@
 #! /usr/bin/make -f
+#export DH_VERBOSE=1
+
 DESTDIR = $(CURDIR)/debian/tmp
 
 %:
-	dh $@ --parallel --buildsystem=cmake --with python2
+	dh $@ --with python2 --parallel
 
 export LD_LIBRARY_PATH+=:$(CURDIR)/debian/paraview/usr/lib/paraview
 

-- 
Paraview packaging

More information about the debian-science-commits mailing list