[Pkg-scicomp-commits] [SCM] paraview branch, master, updated. 8c06dcb12df5d5fcdd30df2231e2fa58172ca9fa

[Christophe Prud'homme]

tags 516689 pending
tags 528640 pending
tags 529632 pending
thanks

The following commit has been merged in the master branch:
commit 8c06dcb12df5d5fcdd30df2231e2fa58172ca9fa
Author: Christophe Prud'homme <prudhomm at debian.org>
Date:   Thu May 21 07:26:11 2009 +0200

    fixed a few bugs in paraview(build with Qt4.5 and conflict with vtkpython)

diff --git a/debian/changelog b/debian/changelog
index a0078ce..bce94e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,20 @@
-paraview (3.4.0-4) UNRELEASED; urgency=low
+paraview (3.4.0-4) unstable; urgency=low
 
   [ Rafael Laboissiere ]
   * debian/control: The Debian packaging files are now maintained through
     a Git repository at alioth.debian.org.  Switch the Vcs-* URLs to Git,
     accordingly.
 
- -- Rafael Laboissiere <rafael at debian.org>  Fri, 01 May 2009 14:07:30 +0200
+  [ Christophe Prud'homme ]
+  * debian/control: update Standards-Version to 3.8.1 (no change)
+  * debian/{compat,control}: increase dh compat to 7
+  * Fixes "undeclared conflicts with python-vtk" thanks to S Robbins (Closes: #516689).
+  * Bug fix: "doesn&#39;t build from deb package", thanks to Gerber van
+    der Graaf (Closes: #528640).
+  * Bug fix: "paraview fails to build with some QT lib 4.x versions",
+    thanks to Andres E. Rodriguez Lazo (Closes: #529632).
+
+ -- Christophe Prud'homme <prudhomm at debian.org>  Thu, 21 May 2009 07:25:30 +0200
 
 paraview (3.4.0-3) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index a9ecba7..6fe9d5f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: science
 Priority: extra
 Maintainer: Debian Scientific Computing Team <pkg-scicomp-devel at lists.alioth.debian.org>
 Uploaders: Christophe Prud'homme <prudhomm at debian.org>, Ondrej Certik <ondrej at certik.cz>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 5), autotools-dev, quilt (>= 0.46-4), cmake (>= 2.4.8), libqt4-dev (>= 4.3.3-2), qt4-dev-tools, mpi-default-dev, libhdf5-serial-dev, libavformat-dev (>= 0.svn20080206), libavutil-dev, libavcodec-dev, libswscale-dev, python-dev, chrpath, libglu1-mesa-dev, libxt-dev, libxext-dev, doxygen, graphviz, gnuplot
-Standards-Version: 3.8.0
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), autotools-dev, quilt (>= 0.46-4), cmake (>= 2.4.8), libqt4-dev (>= 4.3.3-2), qt4-dev-tools, mpi-default-dev, libhdf5-serial-dev, libavformat-dev (>= 0.svn20080206), libavutil-dev, libavcodec-dev, libswscale-dev, python-dev, chrpath, libglu1-mesa-dev, libxt-dev, libxext-dev, doxygen, graphviz, gnuplot
+Standards-Version: 3.8.1
 XS-DM-Upload-Allowed: yes
 Homepage: http://www.paraview.org/
 Vcs-Git: git://alioth.debian.org/git/pkg-scicomp/paraview.git
diff --git a/debian/patches/configure.patch b/debian/patches/configure.patch
index 2102e3d..115aa5e 100644
--- a/debian/patches/configure.patch
+++ b/debian/patches/configure.patch
@@ -7,7 +7,7 @@ Index: paraview-3.2.2/Qt/CMakeLists.txt
  # of Qt at one time.  If you really want to use a newer version of Qt, you
  # can delete this check, but you are on your own.
 -STRING(REGEX MATCH "^4\\.2\\.[0-9]+" qt_version_tmp "${QTVERSION}")
-+STRING(REGEX MATCH "^4\\.[2-4]\\.[0-9]+" qt_version_tmp "${QTVERSION}")
++STRING(REGEX MATCH "^4\\.5\\.[0-9]+" qt_version_tmp "${QTVERSION}")
  IF (NOT qt_version_tmp)
    STRING(REGEX MATCH "^4\\.3\\.[0-9]+" qt_version_tmp2 "${QTVERSION}")
    IF (NOT qt_version_tmp2)
diff --git a/debian/patches/series b/debian/patches/series
index 6adb17c..74f1301 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ vtkFFMPEGWriter.patch
 assistant-qt4.patch
 search-client-doc-finder-in-fhs-dir.patch
 use-ffmpeg-swscaler.patch
+qt.patch
diff --git a/debian/rules b/debian/rules
index dfca9b3..f702d25 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,6 +51,7 @@ install/paraview::
 	 do\
           install $$i debian/paraview/usr/bin; \
         done
+	-mv debian/paraview/usr/bin/vtkpython debian/paraview/usr/share/paraview
 	-rm debian/paraview/usr/bin/*.txt
 	-rm debian/paraview/usr/bin/*.adp
 	-rm debian/paraview/usr/bin/vtkWrapPythonInit
@@ -88,7 +89,8 @@ install/paraview::
 	-echo >>debian/paraview/usr/share/paraview/pqClientDocFinder.txt /usr/share/doc/paraview/html/pqClient.adp
 	-install $(DEB_BUILDDIR)/pqClient.adp debian/paraview/usr/share/doc/paraview/html
 	-ln -s . debian/paraview/usr/share/doc/paraview/html/Documentation
+	-rm debian/paraview/usr/bin/vtkpython
 
 get-orig-source:
-	uscan --force-download 
+	uscan --force-download
 

-- 
paraview