From 5bbe2f7e0870e696c0f89bfb2b6130437454d855 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sat, 31 Jul 2010 19:30:05 +0200 Subject: [PATCH] patches: Removed gcc-4.4 -- applied upstream. --- debian/changelog | 4 +++- debian/patches/00list | 1 - debian/patches/gcc-4.4.dpatch | 21 --------------------- 3 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 debian/patches/gcc-4.4.dpatch diff --git a/debian/changelog b/debian/changelog index 853c151..91e1661 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ pfstools (1.8.2-1) unstable; urgency=low * New upstream release. + * debian/patches: + - Removed gcc-4.4 -- applied upstream. - -- Sebastian Harl Sat, 31 Jul 2010 19:02:30 +0200 + -- Sebastian Harl Sat, 31 Jul 2010 19:29:41 +0200 pfstools (1.8.1-2) unstable; urgency=low diff --git a/debian/patches/00list b/debian/patches/00list index a1ac012..d5b9a75 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,3 +1,2 @@ octave-nargin.dpatch octave-signal.dpatch -gcc-4.4.dpatch diff --git a/debian/patches/gcc-4.4.dpatch b/debian/patches/gcc-4.4.dpatch deleted file mode 100644 index e84dce1..0000000 --- a/debian/patches/gcc-4.4.dpatch +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## gcc-4.4.dpatch by Fabrice Coutadeur -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix compilation error with GCC 4.4. Fix get from http://sourceforge.net/tracker/index.php?func=detail&aid=2848391&group_id=129921&atid=716245 -## DP: Rationale (by zack@debian.org): the "name" argument is in fact *not* used as "const" -## DP: Closes: #554494 - -@DPATCH@ -diff -urNad pfstools-1.8.1~/src/filter/pfspanoramic.cpp pfstools-1.8.1/src/filter/pfspanoramic.cpp ---- pfstools-1.8.1~/src/filter/pfspanoramic.cpp 2008-07-29 16:14:30.000000000 +0000 -+++ pfstools-1.8.1/src/filter/pfspanoramic.cpp 2009-09-10 20:11:29.000000000 +0000 -@@ -191,7 +191,7 @@ - singleton.projections[ string( name ) ] = ptr; - } - -- static Projection *getProjection(const char *name) -+ static Projection *getProjection(char *name) - { - char *opts; - -- 2.30.2