From: Stefano Zacchiroli <zack@debian.org>
Date: Sun, 20 Dec 2009 19:51:20 +0000 (+0100)
Subject: NMU version 1.8.1-1.1.
X-Git-Tag: pfstools-1.8.1-1.1^0
X-Git-Url: https://git.tokkee.org/?p=pkg-pfstools.git;a=commitdiff_plain;h=e0e5aaada5075922084f01892eb1d2ffac766eea

NMU version 1.8.1-1.1.

I've prepared an NMU for pfstools (versioned as 1.8.1-1.1) and uploaded
it to DELAYED/2, according to devref §5.11.1. The patch is the one from
Ubuntu which has been posted to the bug log a while ago. The rationale
of the patch is that in fact that variable is not being used as a
"const" char *, hence the declaration should be dropped.
---

diff --git a/debian/changelog b/debian/changelog
index c8b9f26..0efacca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+pfstools (1.8.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add patch gcc-4.4.dpatch, to fix FTBFS w/ gcc 4.4, rationale; patch
+    from Ubuntu (with some extra comments/rationale by me).
+    (Closes: #554494)
+
+ -- Stefano Zacchiroli <zack@debian.org>  Sun, 20 Dec 2009 15:12:00 +0100
+
 pfstools (1.8.1-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/00list b/debian/patches/00list
index 0783a75..a1ac012 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,3 @@
 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
new file mode 100644
index 0000000..e84dce1
--- /dev/null
+++ b/debian/patches/gcc-4.4.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## gcc-4.4.dpatch by Fabrice Coutadeur <fabricesp@ubuntu.com>
+##
+## 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;
+