As list administrator, your authorization is requested for the
following mailing list posting:
List: [email protected]
From: [email protected]
Subject: [SCM] openimageio branch, master, updated.
debian/1.0.0+dfsg0-1-5-g8b6be18
Reason: Post to moderated list
At your convenience, visit:
http://lists.alioth.debian.org/cgi-bin/mailman/admindb/pkg-phototools-commits
to approve or deny the request.
--- Begin Message ---
The following commit has been merged in the master branch:
commit cace303bb4bcac697943ad65814d7684f8a34b03
Author: Matteo F. Vescovi <[email protected]>
Date: Thu Apr 12 15:36:04 2012 +0200
debian/patches/: #0003 added and patchset re-worked
diff --git a/debian/patches/0001-PDF_documentation_file_removed.patch
b/debian/patches/0001-PDF_documentation_file_removed.patch
index d93d6a1..4ea661f 100644
--- a/debian/patches/0001-PDF_documentation_file_removed.patch
+++ b/debian/patches/0001-PDF_documentation_file_removed.patch
@@ -4,7 +4,7 @@ Subject: PDF_documentation_file_removed
---
src/doc/CMakeLists.txt | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
+ 1 file changed, 1 deletion(-)
diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt
index 6dcec9d..035b659 100644
diff --git a/debian/patches/0002-Fix_docs_generation.patch
b/debian/patches/0002-Fix_docs_generation.patch
index 43ece33..fcf8e8f 100644
--- a/debian/patches/0002-Fix_docs_generation.patch
+++ b/debian/patches/0002-Fix_docs_generation.patch
@@ -1,14 +1,15 @@
-From: David Paleino <[email protected]>
-Subject: fix LaTeX→PDF generation
-Origin: vendor
-Forwarded: no
+From: "Matteo F. Vescovi" <[email protected]>
+Date: Thu, 12 Apr 2012 15:31:36 +0200
+Subject: Fix_docs_generation
---
src/doc/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- openimageio.orig/src/doc/Makefile
-+++ openimageio/src/doc/Makefile
+diff --git a/src/doc/Makefile b/src/doc/Makefile
+index cdc25e4..7b47251 100644
+--- a/src/doc/Makefile
++++ b/src/doc/Makefile
@@ -4,7 +4,7 @@ all: openimageio.pdf
diff --git a/debian/patches/0003-Fix_FTBFS_on_kFreeBSD.patch
b/debian/patches/0003-Fix_FTBFS_on_kFreeBSD.patch
new file mode 100644
index 0000000..e67d3b3
--- /dev/null
+++ b/debian/patches/0003-Fix_FTBFS_on_kFreeBSD.patch
@@ -0,0 +1,39 @@
+From: "Matteo F. Vescovi" <[email protected]>
+Date: Thu, 12 Apr 2012 15:35:16 +0200
+Subject: Fix_FTBFS_on_kFreeBSD
+
+---
+ src/libutil/sysutil.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/libutil/sysutil.cpp b/src/libutil/sysutil.cpp
+index 6121f4e..dbed837 100644
+--- a/src/libutil/sysutil.cpp
++++ b/src/libutil/sysutil.cpp
+@@ -39,7 +39,7 @@
+ # include <sys/ioctl.h>
+ #endif
+
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ # include <sys/types.h>
+ # include <sys/resource.h>
+ # include <sys/sysctl.h>
+@@ -154,7 +154,7 @@ Sysutil::this_program_path ()
+ #elif defined(_WIN32)
+ // According to MSDN...
+ int r = GetModuleFileName (NULL, filename, size);
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ int mib[4];
+ mib[0] = CTL_KERN;
+ mib[1] = KERN_PROC;
+@@ -193,7 +193,7 @@ Sysutil::terminal_columns ()
+ {
+ int columns = 80; // a decent guess, if we have nothing more to go on
+
+-#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
++#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) ||
(__FreeBSD_kernel__)
+ struct winsize w;
+ ioctl (0, TIOCGWINSZ, &w);
+ columns = w.ws_col;
diff --git a/debian/patches/series b/debian/patches/series
index baf835b..68448fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
0001-PDF_documentation_file_removed.patch
0002-Fix_docs_generation.patch
+0003-Fix_FTBFS_on_kFreeBSD.patch
--
OpenImageIO packaging
--- End Message ---
--- Begin Message ---
If you reply to this message, keeping the Subject: header intact,
Mailman will discard the held message. Do this if the message is
spam. If you reply to this message and include an Approved: header
with the list password in it, the message will be approved for posting
to the list. The Approved: header can also appear in the first line
of the body of the reply.
--- End Message ---
_______________________________________________
Pkg-phototools-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-phototools-devel
