[Pkg-phototools-commits] [SCM] openimageio branch, master, updated. debian/1.1.3+dfsg0-1-7-gda32d47

Matteo F. Vescovi mfv.debian at gmail.com
Fri Feb 1 10:01:44 UTC 2013


The following commit has been merged in the master branch:
commit a492a9f68f20b8862c57a34e3f7399d658b1c226
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Fri Feb 1 10:33:56 2013 +0100

    debian/patches/: 0005-Fix_SHA1_issue.patch dropped (applied upstream)

diff --git a/debian/patches/0005-Fix_SHA1_issue.patch b/debian/patches/0005-Fix_SHA1_issue.patch
deleted file mode 100644
index 5324552..0000000
--- a/debian/patches/0005-Fix_SHA1_issue.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
-Date: Thu, 27 Dec 2012 10:07:44 +0100
-Subject: Fix_SHA1_issue
-
----
- src/libutil/SHA1.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libutil/SHA1.cpp b/src/libutil/SHA1.cpp
-index b9e6c8b..c761185 100644
---- a/src/libutil/SHA1.cpp
-+++ b/src/libutil/SHA1.cpp
-@@ -8,9 +8,9 @@
- 
- // If compiling with MFC, you might want to add #include "StdAfx.h"
- 
-+#include "SHA1.h"
- #include "hash.h"
- #include "dassert.h"
--#include "SHA1.h"
- 
- #ifdef SHA1_UTILITY_FUNCTIONS
- #define SHA1_MAX_FILE_BUFFER 8000
diff --git a/debian/patches/series b/debian/patches/series
index d6920b8..ebbe12e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
 0002-Fix_IlmBase_issue.patch
 0003-Fix_multiarch_paths.patch
 0004-Fix_pause_issue.patch
-0005-Fix_SHA1_issue.patch

-- 
OpenImageIO packaging



More information about the Pkg-phototools-commits mailing list