[SCM] yafaray/master: debian/patches/: refreshed after new upstream source

[mfv-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3e762bddcf62161f7a7be89656c078b8e5e5d9f0
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Wed May 23 17:58:53 2012 +0200

    debian/patches/: refreshed after new upstream source
    
    Git-Dch: Ignore

diff --git a/debian/patches/0002-Fix_FTBFS_on_ARM.patch b/debian/patches/0001-Fix_FTBFS_on_ARM.patch
similarity index 85%
rename from debian/patches/0002-Fix_FTBFS_on_ARM.patch
rename to debian/patches/0001-Fix_FTBFS_on_ARM.patch
index ef17773..bca3c23 100644
--- a/debian/patches/0002-Fix_FTBFS_on_ARM.patch
+++ b/debian/patches/0001-Fix_FTBFS_on_ARM.patch
@@ -1,5 +1,5 @@
 From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
-Date: Tue, 24 Apr 2012 08:52:16 +0200
+Date: Wed, 23 May 2012 17:58:25 +0200
 Subject: Fix_FTBFS_on_ARM
 
 ---
@@ -7,7 +7,7 @@ Subject: Fix_FTBFS_on_ARM
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/src/yafraycore/triangle.cc b/src/yafraycore/triangle.cc
-index 05b8751..f2b160b 100644
+index d9b30e4..72c89cd 100644
 --- a/src/yafraycore/triangle.cc
 +++ b/src/yafraycore/triangle.cc
 @@ -6,7 +6,7 @@ __BEGIN_YAFRAY
@@ -35,8 +35,8 @@ index 05b8751..f2b160b 100644
 -inline float triangle_t::surfaceArea() const
 +float triangle_t::surfaceArea() const
  {
-     point3d_t const& a = mesh->getVertex(pa);
-     point3d_t const& b = mesh->getVertex(pb);
+ 	point3d_t const& a = mesh->getVertex(pa);
+ 	point3d_t const& b = mesh->getVertex(pb);
 @@ -153,7 +153,7 @@ inline float triangle_t::surfaceArea() const
  	return 0.5 * (edge1 ^ edge2).length();
  }
@@ -44,8 +44,8 @@ index 05b8751..f2b160b 100644
 -inline void triangle_t::sample(float s1, float s2, point3d_t &p, vector3d_t &n) const
 +void triangle_t::sample(float s1, float s2, point3d_t &p, vector3d_t &n) const
  {
-     point3d_t const& a = mesh->getVertex(pa);
-     point3d_t const& b = mesh->getVertex(pb);
+ 	point3d_t const& a = mesh->getVertex(pa);
+ 	point3d_t const& b = mesh->getVertex(pb);
 @@ -168,7 +168,7 @@ inline void triangle_t::sample(float s1, float s2, point3d_t &p, vector3d_t &n)
  
  // triangleInstance_t Methods
@@ -54,7 +54,7 @@ index 05b8751..f2b160b 100644
 +void triangleInstance_t::getSurface(surfacePoint_t &sp, const point3d_t &hit, intersectData_t &data) const
  {
  	sp.Ng = getNormal();
-     int pa = mBase->pa;
+ 	int pa = mBase->pa;
 @@ -287,7 +287,7 @@ inline void triangleInstance_t::getSurface(surfacePoint_t &sp, const point3d_t &
  	sp.light = mesh->mBase->light;
  }
@@ -71,8 +71,8 @@ index 05b8751..f2b160b 100644
 -inline float triangleInstance_t::surfaceArea() const
 +float triangleInstance_t::surfaceArea() const
  {
-     point3d_t const& a = mesh->getVertex(mBase->pa);
-     point3d_t const& b = mesh->getVertex(mBase->pb);
+ 	point3d_t const& a = mesh->getVertex(mBase->pa);
+ 	point3d_t const& b = mesh->getVertex(mBase->pb);
 @@ -347,7 +347,7 @@ inline float triangleInstance_t::surfaceArea() const
  	return 0.5 * (edge1 ^ edge2).length();
  }
@@ -80,5 +80,5 @@ index 05b8751..f2b160b 100644
 -inline void triangleInstance_t::sample(float s1, float s2, point3d_t &p, vector3d_t &n) const
 +void triangleInstance_t::sample(float s1, float s2, point3d_t &p, vector3d_t &n) const
  {
-     point3d_t const& a = mesh->getVertex(mBase->pa);
-     point3d_t const& b = mesh->getVertex(mBase->pb);
+ 	point3d_t const& a = mesh->getVertex(mBase->pa);
+ 	point3d_t const& b = mesh->getVertex(mBase->pb);
diff --git a/debian/patches/0001-Fix_FTBFS_with_gcc-4.7.patch b/debian/patches/0001-Fix_FTBFS_with_gcc-4.7.patch
deleted file mode 100644
index 7e6a634..0000000
--- a/debian/patches/0001-Fix_FTBFS_with_gcc-4.7.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
-Date: Wed, 4 Apr 2012 16:52:31 +0200
-Subject: Fix_FTBFS_with_gcc-4.7
-
----
-Description: Fix FTBFS with gcc 4.7 by fixing the missing <unistd.h> include.
-Author: Cyril Brulebois <kibi at debian.org>
-Bug-Debian: http://bugs.debian.org/667426
-
- src/yafraycore/scene.cc |    1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/yafraycore/scene.cc b/src/yafraycore/scene.cc
-index 861e100..2b48a99 100644
---- a/src/yafraycore/scene.cc
-+++ b/src/yafraycore/scene.cc
-@@ -39,6 +39,7 @@
- #include <iostream>
- #include <limits>
- #include <sstream>
-+#include <unistd.h>
- 
- __BEGIN_YAFRAY
- 
diff --git a/debian/patches/series b/debian/patches/series
index 6998ff5..a650017 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-Fix_FTBFS_with_gcc-4.7.patch
-0002-Fix_FTBFS_on_ARM.patch
+0001-Fix_FTBFS_on_ARM.patch

-- 
yafaray packaging