Dear maintainer,
Here is the NMU diff according to DevRef 5.11.1[1][2] for RC bug: #504865.
See the debian/patches directory for the important fixes. Feel free to
contact if you have any questions.
Thank you for maintaining the package,
Jari Aalto
[1] http://www.debian.org/doc/developers-reference/pkgs.html#nmu
[2] http://dep.debian.net/deps/dep1.html
lsdiff(1) of changes:
a/debian/changelog
b/debian/patches/10-gcc-4.4-fix.patch
b/debian/patches/20-gcc-4.4-const-char.patch
b/debian/patches/series
a/debian/rules
debian/changelog | 16 +++++++++++
debian/patches/10-gcc-4.4-fix.patch | 39 ++++++++++++++++++++++++++++
debian/patches/20-gcc-4.4-const-char.patch | 29 ++++++++++++++++++++
debian/patches/series | 2 +
debian/rules | 6 +++-
5 files changed, 90 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6103bdd..219597f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+geresh (0.6.3-9.1) unstable; urgency=low
+
+ [Jari Aalto]
+ * Non-maintainer upload.
+ * debian/control
+ - (Build-Depends): Add quilt for the patches.
+ * debian/patches
+ - (number 10): New patch. Fix gcc 4.4. missing includes. Patch thanks
+ to Martin Michlmayr <t...@cyrius.com> (RC bug FTBFS; Closes: #504865).
+ (number 20): New patch. Fix gcc 4.4 error: invalid conversion from
+ const char* to char*.
+ * debian/rules
+ - Add quilt
+
+ -- Jari Aalto <jari.aa...@cante.net> Thu, 07 Jan 2010 12:46:01 +0200
+
geresh (0.6.3-9) unstable; urgency=low
* Fix FTBFS with GCC 4.3 with help by Martin Michlmayr (Closes: #455189)
diff --git a/debian/patches/10-gcc-4.4-fix.patch b/debian/patches/10-gcc-4.4-fix.patch
new file mode 100644
index 0000000..be11b24
--- /dev/null
+++ b/debian/patches/10-gcc-4.4-fix.patch
@@ -0,0 +1,39 @@
+From 6dc122b4da44042e64f0bacb9137737ce7568792 Mon Sep 17 00:00:00 2001
+From: Jari Aalto <jari.aa...@cante.net>
+Date: Fri, 25 Dec 2009 22:00:07 +0200
+Subject: [PATCH] Gcc 4.4 missing includes bug #504865
+
+Signed-off-by: Jari Aalto <jari.aa...@cante.net>
+---
+ converters.cc | 1 +
+ iso88598.cc | 2 ++
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/converters.cc b/converters.cc
+index f126072..b7b6deb 100644
+--- a/converters.cc
++++ b/converters.cc
+@@ -16,6 +16,7 @@
+
+ #include <config.h>
+
++#include <cstdio>
+ #include <ctype.h> // toupper
+
+ #include "converters.h"
+diff --git a/iso88598.cc b/iso88598.cc
+index 717a4cb..507866e 100644
+--- a/iso88598.cc
++++ b/iso88598.cc
+@@ -16,6 +16,8 @@
+
+ #include <config.h>
+
++#include <cstdio>
++
+ #include "iso88598.h"
+
+ #include "univalues.h"
+--
+1.6.5
+
diff --git a/debian/patches/20-gcc-4.4-const-char.patch b/debian/patches/20-gcc-4.4-const-char.patch
new file mode 100644
index 0000000..a91ec77
--- /dev/null
+++ b/debian/patches/20-gcc-4.4-const-char.patch
@@ -0,0 +1,29 @@
+From 6aff1bb63ba5ef07c1f68422c3d94be84b675624 Mon Sep 17 00:00:00 2001
+From: Jari Aalto <jari.aa...@cante.net>
+Date: Thu, 7 Jan 2010 13:01:34 +0200
+Subject: [PATCH] Fix error: invalid conversion from const char* to char*
+
+Signed-off-by: Jari Aalto <jari.aa...@cante.net>
+---
+ editbox2.cc | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/editbox2.cc b/editbox2.cc
+index 485ef23..c671812 100644
+--- a/editbox2.cc
++++ b/editbox2.cc
+@@ -1618,7 +1618,10 @@ void EditBox::log2vis(const char *options)
+ if (strstr(options, "engpad"))
+ opt_engpad = true;
+ char *s;
+- if ((s = strstr(options, "emph"))) {
++ // NOTE: strstr() returns 'const char*', but
++ // strtol() needs char*** as second arg, so we use
++ // cast here. The content through 's' is not changed.
++ if ((s = (char *)strstr(options, "emph"))) {
+ opt_emph = true;
+ if (s[4] == ':') {
+ opt_emph_ch = strtol(s + 5, &s, 0);
+--
+1.6.5
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..77fe26f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+10-gcc-4.4-fix.patch
+20-gcc-4.4-const-char.patch
diff --git a/debian/rules b/debian/rules
index 5ea7bd9..98c7217 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,9 +30,11 @@ config.status: configure
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+include /usr/share/quilt/quilt.make
+
build: build-stamp
-build-stamp: config.status
+build-stamp: config.status patch
dh_testdir
# Add here commands to compile the package.
@@ -41,7 +43,7 @@ build-stamp: config.status
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp
