Merge lp:~ari-tczew/ubuntu/karmic/agg/lp-393923 into lp:ubuntu/karmic/agg

[Artur Rona]

=== modified file 'debian/changelog'
--- debian/changelog	2009-04-02 18:39:54 +0000
+++ debian/changelog	2010-08-23 20:18:45 +0000
@@ -1,3 +1,12 @@
+agg (2.5+dfsg1-1ubuntu1.9.10.1) karmic-proposed; urgency=low
+
+  * debian/patches/07_fix_missing_includes.dpatch: Fix missing
+    includes causes compilation problem. (LP: #393923, Closes: #575620)
+  * debian/patches/06_fix_recursion_crash.dpatch: Update patch,
+    it's necessary to fix compilation problem.
+
+ -- Artur Rona <[e-mail]>  Mon, 23 Aug 2010 01:34:28 +0200
+
 agg (2.5+dfsg1-1ubuntu1) jaunty; urgency=low
 
   [ Andrew Straw ]
 
=== modified file 'debian/patches/00list'
--- debian/patches/00list	2009-04-02 18:39:54 +0000
+++ debian/patches/00list	2010-08-23 20:18:45 +0000
@@ -4,3 +4,4 @@
 04_no_rpath
 05_x11_makefile_am.dpatch
 06_fix_recursion_crash.dpatch
+07_fix_missing_includes.dpatch
 
=== modified file 'debian/patches/06_fix_recursion_crash.dpatch'
--- debian/patches/06_fix_recursion_crash.dpatch	2009-04-02 18:39:54 +0000
+++ debian/patches/06_fix_recursion_crash.dpatch	2010-08-23 20:18:45 +0000
@@ -3,7 +3,7 @@
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Ubuntu: http://launchpad.net/bugs/344849
-## DP: Patch: https://trac.mapnik.org/ticket/253
+## DP: Patch: https://trac.mapnik.org/ticket/253, http://trac.mapnik.org/changeset/1801
 ## DP: Description: Avoid a crash caused by an infinite recursion when drawing extremely long lines
 
 @DPATCH@
@@ -16,8 +16,8 @@
              int cy = (y1 + y2) >> 1;
 +
 +            // Bail if values are so large they are likely to wrap
-+            if ((abs(x1) >= INT_MAX/2) || (abs(y1) >= INT_MAX/2) ||
-+                (abs(x2) >= INT_MAX/2) || (abs(y2) >= INT_MAX/2))
++            if ((std::abs(x1) >= std::numeric_limits<int>::max()/2) || (std::abs(y1) >= std::numeric_limits<int>::max()/2) ||
++                (std::abs(x2) >= std::numeric_limits<int>::max()/2) || (std::abs(y2) >= std::numeric_limits<int>::max()/2))
 +                    return;
 +
              line(x1, y1, cx, cy);
 
=== added file 'debian/patches/07_fix_missing_includes.dpatch'
--- debian/patches/07_fix_missing_includes.dpatch	1970-01-01 00:00:00 +0000
+++ debian/patches/07_fix_missing_includes.dpatch	2010-08-23 20:18:45 +0000
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## From: Artur Rona
+## Description: Add missing includes for fix compile.
+## Bug: https://launchpad.net/bugs/393923
+## Origin: upstream, https://trac.mapnik.org/changeset/1801
+## Author: Dane Springmeyer
+
+@DPATCH@
+
+diff -pruN -x '*~' agg-2.5+dfsg1.orig/include/agg_rasterizer_cells_aa.h agg-2.5+dfsg1/include/agg_rasterizer_cells_aa.h
+--- agg-2.5+dfsg1.orig/include/agg_rasterizer_cells_aa.h	2007-10-11 00:06:16.000000000 +0200
++++ agg-2.5+dfsg1/include/agg_rasterizer_cells_aa.h	2010-08-23 01:51:07.000000000 +0200
+@@ -40,7 +40,8 @@
+ #define AGG_RASTERIZER_CELLS_AA_INCLUDED
+ 
+ #include <string.h>
+-#include <math.h>
++#include <cstdlib>
++#include <limits>
+ #include "agg_math.h"
+ #include "agg_array.h"
+