Removed debian/patches/type_mismatch.dpatch.

A fix for this issue has been included upstream.

diff --git a/debian/changelog b/debian/changelog
index d9b038fa8ac684290fdaa046d758ce466902d04b..e0addaf81143d9ae86d21cd05a5b95bcb29111b8 100644 (file)
--- 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 <sh@tokkee.org>  Tue, 07 Oct 2008 14:01:25 +0200
+ -- Sebastian Harl <sh@tokkee.org>  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 d1c565170e6aed999566265359b6b73e0c611cf2..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- 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 (file)
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 <sh@tokkee.org>
-##
-## 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());
- 
-         }
-