From a4b112f9306a40b6e84f125083f0e65c465f2c8b Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Tue, 7 Oct 2008 17:27:29 +0200 Subject: [PATCH] Removed debian/patches/type_mismatch.dpatch. A fix for this issue has been included upstream. --- debian/changelog | 3 ++- debian/patches/00list | 1 - debian/patches/type_mismatch.dpatch | 18 ------------------ 3 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 debian/patches/type_mismatch.dpatch diff --git a/debian/changelog b/debian/changelog index d9b038f..e0addaf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,8 +13,9 @@ enblend (3.2+dfsg-1) unstable; urgency=low - Include AUTHORS file in the package as well. * debian/patches: - Removed gcc4.3-includes.dpatch - included upstream. + - Removed type_mismatch.dpatch - included upstream. - -- Sebastian Harl Tue, 07 Oct 2008 14:01:25 +0200 + -- Sebastian Harl Tue, 07 Oct 2008 17:25:49 +0200 enblend (3.0+dfsg-2) unstable; urgency=low diff --git a/debian/patches/00list b/debian/patches/00list index d1c5651..8b13789 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,2 +1 @@ -type_mismatch.dpatch diff --git a/debian/patches/type_mismatch.dpatch b/debian/patches/type_mismatch.dpatch deleted file mode 100644 index 42e79d1..0000000 --- a/debian/patches/type_mismatch.dpatch +++ /dev/null @@ -1,18 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## type_mismatch.dpatch by Sebastian Harl -## -## DP: Fixed a type mismatch when trying to instantiate std::max. - -@DPATCH@ - ---- a/src/anneal.h -+++ b/src/anneal.h -@@ -678,7 +678,7 @@ - - localK = stateSpace->size(); - if (localK < 2) convergedPoints[index] = true; -- kMax = std::max(kMax, stateProbabilities->size()); -+ kMax = std::max(kMax, (unsigned int)stateProbabilities->size()); - - } - -- 2.30.2