[Pkg-scicomp-commits] paraview/trunk/debian/patches

[Christophe Prud'homme]

SVN commit 4065 by prudhomm:

refreshed 2 patches and re-apply them

 M  +4 -4      paraview/trunk/debian/patches/assistant-qt4.patch  
 M  +7 -7      paraview/trunk/debian/patches/search-client-doc-finder-in-fhs-dir.patch  
 M  +3 -0      paraview/trunk/debian/patches/series  


--- paraview/trunk/debian/patches/assistant-qt4.patch #4064:4065
@@ -1,8 +1,8 @@
-Index: paraview-3.2.3/Applications/Client/MainWindow.cxx
+Index: paraview-3.4.0/Applications/Client/MainWindow.cxx
 ===================================================================
---- paraview-3.2.3.orig/Applications/Client/MainWindow.cxx	2007-11-06 20:10:33.000000000 +0100
-+++ paraview-3.2.3/Applications/Client/MainWindow.cxx	2008-08-01 21:34:33.000000000 +0200
-@@ -896,7 +896,7 @@
+--- paraview-3.4.0.orig/Applications/Client/MainWindow.cxx	2009-01-07 08:18:22.000000000 +0100
++++ paraview-3.4.0/Applications/Client/MainWindow.cxx	2009-01-07 08:18:44.000000000 +0100
+@@ -955,7 +955,7 @@
    QString assistantExe;
    QString profileFile;
  
--- paraview/trunk/debian/patches/search-client-doc-finder-in-fhs-dir.patch #4064:4065
@@ -1,15 +1,15 @@
-Index: paraview-3.2.2/Applications/Client/MainWindow.cxx
+Index: paraview-3.4.0/Applications/Client/MainWindow.cxx
 ===================================================================
---- paraview-3.2.2.orig/Applications/Client/MainWindow.cxx	2008-06-15 12:30:14.314123165 +0200
-+++ paraview-3.2.2/Applications/Client/MainWindow.cxx	2008-06-15 12:30:33.042133152 +0200
-@@ -915,6 +915,11 @@
+--- paraview-3.4.0.orig/Applications/Client/MainWindow.cxx	2009-01-07 08:23:51.000000000 +0100
++++ paraview-3.4.0/Applications/Client/MainWindow.cxx	2009-01-07 08:25:12.000000000 +0100
+@@ -974,6 +974,11 @@
      helper = QCoreApplication::applicationDirPath() +
        binDir1 + QString("pqClientDocFinder.txt");
      }
 +  if(!QFile::exists(helper))
-+    {
-+    // Look in a FHS compliant directory
-+    helper = QString("/usr/share/paraview/pqClientDocFinder.txt");
++    {	  
++      // Look in a FHS compliant directory
++      helper = QString("/usr/share/paraview/pqClientDocFinder.txt");
 +    }
    if(QFile::exists(helper))
      {
--- paraview/trunk/debian/patches/series #4064:4065
@@ -1 +1,4 @@
 vtkFFMPEGWriter.patch
+assistant-qt4.patch
+search-client-doc-finder-in-fhs-dir.patch
+