diff -u pfstools-1.8.1/debian/control pfstools-1.8.1/debian/control --- pfstools-1.8.1/debian/control +++ pfstools-1.8.1/debian/control @@ -1,7 +1,8 @@ Source: pfstools Section: graphics Priority: optional -Maintainer: Debian PhotoTools Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian PhotoTools Maintainers Uploaders: Sebastian Harl Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), dpatch, gfortran, autotools-dev, libqt3-mt-dev, libmagick++-dev | libmagick++9-dev, libtiff4-dev, libopenexr-dev, libnetpbm10-dev, octave3.0-headers, texlive-latex-base, freeglut3-dev Standards-Version: 3.8.1 diff -u pfstools-1.8.1/debian/changelog pfstools-1.8.1/debian/changelog --- pfstools-1.8.1/debian/changelog +++ pfstools-1.8.1/debian/changelog @@ -1,3 +1,11 @@ +pfstools (1.8.1-1ubuntu1) karmic; urgency=low + + * debian/patches/gcc-4.4.dpatch: fix line 194 of src/filter/pfspanoramic.cpp + to avoid a compilation error (LP: #429629) + * debian/patches/00list: added gcc-4.4.dpatch + + -- Fabrice Coutadeur Thu, 10 Sep 2009 20:13:03 +0000 + pfstools (1.8.1-1build1) karmic; urgency=low * No-change rebuild against libmagick++2 (which will fail to build until diff -u pfstools-1.8.1/debian/patches/00list pfstools-1.8.1/debian/patches/00list --- pfstools-1.8.1/debian/patches/00list +++ pfstools-1.8.1/debian/patches/00list @@ -2,2 +2,3 @@ octave-signal.dpatch +gcc-4.4.dpatch only in patch2: unchanged: --- pfstools-1.8.1.orig/debian/patches/gcc-4.4.dpatch +++ pfstools-1.8.1/debian/patches/gcc-4.4.dpatch @@ -0,0 +1,19 @@ +#! /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 + +@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; +