[Pkg-phototools-commits] [SCM] openimageio branch, master, updated. debian/1.0.3+dfsg0-1-30-gcd46df6

[Matteo F. Vescovi]

The following commit has been merged in the master branch:
commit daefec1a49ace01b5f2449de3878c9a3967bea2b
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Tue Jun 5 11:25:50 2012 +0200

    debian/patches/: #0002 (FTBFS on kBSD) dropped (applied upstream)

diff --git a/debian/patches/0001-Fix_docs_generation.patch b/debian/patches/0001-Fix_docs_generation.patch
index 743c20a..7cc9d04 100644
--- a/debian/patches/0001-Fix_docs_generation.patch
+++ b/debian/patches/0001-Fix_docs_generation.patch
@@ -3,17 +3,12 @@ Date: Mon, 16 Apr 2012 10:11:46 +0200
 Subject: Fix_docs_generation
 
 ---
-From: David Paleino <dapal at debian.org>
-Subject: fix LaTeX→PDF generation
-Origin: vendor
-Forwarded: no
-
  src/doc/CMakeLists.txt |    1 -
  src/doc/Makefile       |    2 +-
  2 files changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt
-index 6dcec9d..035b659 100644
+index 3cbdcff..e698a7b 100644
 --- a/src/doc/CMakeLists.txt
 +++ b/src/doc/CMakeLists.txt
 @@ -1,7 +1,6 @@
diff --git a/debian/patches/0003-Fix_FTBFS_on_Hurd.patch b/debian/patches/0002-Fix_FTBFS_on_Hurd.patch
similarity index 100%
rename from debian/patches/0003-Fix_FTBFS_on_Hurd.patch
rename to debian/patches/0002-Fix_FTBFS_on_Hurd.patch
diff --git a/debian/patches/0002-Fix_usleep_issue_on_kFreeBSD.patch b/debian/patches/0002-Fix_usleep_issue_on_kFreeBSD.patch
deleted file mode 100644
index 2999ba9..0000000
--- a/debian/patches/0002-Fix_usleep_issue_on_kFreeBSD.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
-Date: Sat, 19 May 2012 10:08:56 +0200
-Subject: Fix_usleep_issue_on_kFreeBSD
-
----
- src/libutil/sysutil.cpp |    1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/libutil/sysutil.cpp b/src/libutil/sysutil.cpp
-index d5dcf56..3a24c24 100644
---- a/src/libutil/sysutil.cpp
-+++ b/src/libutil/sysutil.cpp
-@@ -45,6 +45,7 @@
- # include <sys/sysctl.h>
- # include <sys/wait.h>
- # include <sys/ioctl.h>
-+# include <unistd.h>
- #endif
- 
- #ifdef __APPLE__
diff --git a/debian/patches/series b/debian/patches/series
index 38b0f4f..617c065 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-Fix_docs_generation.patch
-0002-Fix_usleep_issue_on_kFreeBSD.patch
-0003-Fix_FTBFS_on_Hurd.patch
+0002-Fix_FTBFS_on_Hurd.patch

-- 
OpenImageIO packaging