Added type_mismatch.dpatch to fix a failure to instantiate std::max().

 * Use dpatch in debian/rules.
 * Added dpatch to build dependencies.

diff --git a/debian/changelog b/debian/changelog
index 04f1e5ed06374887c598369cf301b88337372cdc..8427e85991cb3a83ef7716a08dcaf8384f9b71d3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ enblend (3.0+dfsg-1) unstable; urgency=low
 
   * Initial release (Closes: #294389, #390655).
   * Removed GPL incompatible src/win32helpers/ from .orig.tar.gz.
+  * Added type_mismatch.dpatch to fix a failure to instantiate std::max().
 
- -- Sebastian Harl <sh@tokkee.org>  Sun, 28 Oct 2007 18:25:17 +0100
+ -- Sebastian Harl <sh@tokkee.org>  Fri, 30 Nov 2007 15:37:42 +0000
 

diff --git a/debian/control b/debian/control
index 1122b098802037ab0ec30959a18a99b05e7b276f..9ec62cfe7c64f49581c1291d93b7d42c229c2555 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: graphics
 Priority: optional
 Maintainer: Sebastian Harl <sh@tokkee.org>
 Uploaders: Florent Bayle <fbayle@bigfoot.com>
-Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), autotools-dev, libtiff4-dev, libboost-dev, liblcms1-dev, libglew-dev, libplot-dev
+Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), dpatch, autotools-dev, libtiff4-dev, libboost-dev, liblcms1-dev, libglew-dev, libplot-dev
 Standards-Version: 3.7.2
 Homepage: http://enblend.sourceforge.net/
 Vcs-Git: git://git.tokkee.org/pkg-enblend.git

diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644 (file)
index 0000000..d1c5651
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1,2 @@
+type_mismatch.dpatch
+

diff --git a/debian/patches/type_mismatch.dpatch b/debian/patches/type_mismatch.dpatch
new file mode 100644 (file)
index 0000000..42e79d1
--- /dev/null
+++ b/debian/patches/type_mismatch.dpatch
@@ -0,0 +1,18 @@
+#! /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());
+ 
+         }
+ 

diff --git a/debian/rules b/debian/rules
index a8b41860cb514c724e2e85ee4835283b126ec588..44f28e3af4e724075cc2aac6d16df571f2804749 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,9 @@ else
        CFLAGS += -O2
 endif
 
-config.status: configure
+include /usr/share/dpatch/dpatch.make
+
+config.status: configure $(DPATCH_STAMPFN)
        dh_testdir
        CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
                --build=$(DEB_BUILD_GNU_TYPE) \
@@ -34,7 +36,7 @@ build-stamp:  config.status
        
        touch build-stamp
 
-clean:
+clean: unpatch
        dh_testdir
        dh_testroot
        rm -f build-stamp