[SCM] Paraview packaging branch, master, updated. upstream/3.12.0-109-g0717536

Anton Gladky gladky.anton at gmail.com
Thu Nov 10 20:28:49 UTC 2011


The following commit has been merged in the master branch:
commit c795e1b4ae2c71fda3377e17be27ea81bbf93ad2
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Nov 10 21:20:49 2011 +0100

    Update fix_manpages_errors.patch

diff --git a/debian/patches/fix_manpages_errors.patch b/debian/patches/fix_manpages_errors.patch
index a7062ea..bfd2b01 100644
--- a/debian/patches/fix_manpages_errors.patch
+++ b/debian/patches/fix_manpages_errors.patch
@@ -26,23 +26,6 @@ Last-Update: 2011-07-19
  .TP
  \fBICET_SINGLE_IMAGE_STRATEGY_BSWAP\fP
   The classic binary swap 
-@@ -55,14 +55,14 @@
- receives the opposite half from its partner. The processes are then 
- partitioned into two groups that each have the same image part, and the 
- algorithm recurses. 
--.igsingle image strategy!binary swap
-+
- .TP
- \fBICET_SINGLE_IMAGE_STRATEGY_TREE\fP
-  At each phase, each 
- process partners with another, and one of the processes sends its entire 
- image to the other. The algorithm recurses with the group of processes 
- that received images until only one process has an image. 
--.igsingle image strategy!tree
-+
- .PP
- By default \fBIceT \fPsets the single image strategy to 
- \fBICET_SINGLE_IMAGE_STRATEGY_AUTOMATIC\fP
 --- a/Utilities/IceT/doc/man/man3/icetImageGetDepthf.3
 +++ b/Utilities/IceT/doc/man/man3/icetImageGetDepthf.3
 @@ -15,8 +15,6 @@
@@ -54,7 +37,7 @@ Last-Update: 2011-07-19
  .PP
  .SH Synopsis
  
-@@ -142,6 +140,5 @@
+@@ -154,6 +152,5 @@
  \fIicetImageGetColorFormat\fP(3),
  \fIicetImageGetDepthFormat\fP(3)
  .PP
@@ -153,7 +136,7 @@ Last-Update: 2011-07-19
  .PP
  .SH Synopsis
  
-@@ -142,6 +140,5 @@
+@@ -154,6 +152,5 @@
  \fIicetImageGetColorFormat\fP(3),
  \fIicetImageGetDepthFormat\fP(3)
  .PP
@@ -172,7 +155,7 @@ Last-Update: 2011-07-19
  .PP
  .SH Synopsis
  
-@@ -155,6 +154,5 @@
+@@ -177,6 +176,5 @@
  .PP
  \fIicetIsEnabled\fP(3)
  .PP
@@ -222,7 +205,7 @@ Last-Update: 2011-07-19
  .PP
  .SH Synopsis
  
-@@ -155,6 +154,5 @@
+@@ -177,6 +176,5 @@
  .PP
  \fIicetIsEnabled\fP(3)
  .PP
@@ -276,7 +259,7 @@ Last-Update: 2011-07-19
  .PP
  .SH Synopsis
  
-@@ -142,6 +140,5 @@
+@@ -154,6 +152,5 @@
  \fIicetImageGetColorFormat\fP(3),
  \fIicetImageGetDepthFormat\fP(3)
  .PP
@@ -294,7 +277,7 @@ Last-Update: 2011-07-19
  .PP
  .SH Synopsis
  
-@@ -142,6 +140,5 @@
+@@ -154,6 +152,5 @@
  \fIicetImageGetColorFormat\fP(3),
  \fIicetImageGetDepthFormat\fP(3)
  .PP
@@ -330,7 +313,7 @@ Last-Update: 2011-07-19
  .PP
  .SH Synopsis
  
-@@ -142,6 +140,5 @@
+@@ -154,6 +152,5 @@
  \fIicetImageGetColorFormat\fP(3),
  \fIicetImageGetDepthFormat\fP(3)
  .PP
@@ -380,16 +363,7 @@ Last-Update: 2011-07-19
  .\" NOTE: This file is generated, DO NOT EDIT.
 --- a/Utilities/IceT/doc/man/man3/icetStrategy.3
 +++ b/Utilities/IceT/doc/man/man3/icetStrategy.3
-@@ -47,7 +47,7 @@
- whether they draw into it, this strategy is usually inefficient 
- when compositing for more than one tile, but is fine for the single 
- tile case. 
--.igstrategy!sequential
-+
- .TP
- \fBICET_STRATEGY_DIRECT\fP
-  As each process renders an image 
-@@ -55,7 +55,7 @@
+@@ -56,7 +56,7 @@
  display that tile. This usually results in a few processes receiving 
  and processing the majority of the data, and is therefore usually an 
  inefficient strategy. 
@@ -398,7 +372,7 @@ Last-Update: 2011-07-19
  .TP
  \fBICET_STRATEGY_SPLIT\fP
   Like \fBICET_STRATEGY_DIRECT\fP,
-@@ -64,7 +64,7 @@
+@@ -65,7 +65,7 @@
  about the same amount of data. This strategy is often very efficient, 
  but due to the large amount of messages passed, it has not proven to be 
  very scalable or robust. 
@@ -407,16 +381,7 @@ Last-Update: 2011-07-19
  .TP
  \fBICET_STRATEGY_REDUCE\fP
   A two phase algorithm. In the 
-@@ -74,7 +74,7 @@
- contains an image for only one tile, all these compositions may happen 
- simultaneously. This is a well rounded strategy that seems to perform 
- well in a wide variety of applications. 
--.igstrategy!reduce
-+
- .TP
- \fBICET_STRATEGY_VTREE\fP
-  An extension to the binary tree 
-@@ -86,7 +86,7 @@
+@@ -89,7 +89,7 @@
  or \fBICET_STRATEGY_SPLIT\fP,
  but 
  has very well behaved network communication. 
@@ -513,7 +478,7 @@ Last-Update: 2011-07-19
  .PP
  .SH Synopsis
  
-@@ -142,6 +140,5 @@
+@@ -154,6 +152,5 @@
  \fIicetImageGetColorFormat\fP(3),
  \fIicetImageGetDepthFormat\fP(3)
  .PP

-- 
Paraview packaging



More information about the debian-science-commits mailing list