Hi,
here's the NMU patch:
debdiff ivtools_1.1.3-5.1.dsc /pbuilder/result/ivtools_1.1.3-5.2.dsc
ivtools-1.1.3/debian/changelog | 8 ++++++++
src/FrameUnidraw/framecmds.h | 4 ++--
src/InterViews/style.c | 2 +-
src/OverlayUnidraw/ovcmds.h | 2 +-
4 files changed, 12 insertions(+), 4 deletions(-)
diff -u ivtools-1.1.3/debian/changelog ivtools-1.1.3/debian/changelog
--- ivtools-1.1.3/debian/changelog
+++ ivtools-1.1.3/debian/changelog
@@ -1,3 +1,11 @@
+ivtools (1.1.3-5.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS with gcc-4.1: extra qualifications (Closes: #371142),
+ thanks to Martin Michlmayr for the patch.
+
+ -- Christoph Berg <[EMAIL PROTECTED]> Fri, 9 Jun 2006 17:57:28 +0200
+
ivtools (1.1.3-5.1) unstable; urgency=low
* Non-maintainer upload.
only in patch2:
unchanged:
--- ivtools-1.1.3.orig/src/FrameUnidraw/framecmds.h
+++ ivtools-1.1.3/src/FrameUnidraw/framecmds.h
@@ -125,7 +125,7 @@
static MoveFrameCmd* default_instance() { return _default; }
// return a default instance of the MoveFrameCmd.
- static void MoveFrameCmd::default_instance(MoveFrameCmd* cmd)
+ static void default_instance(MoveFrameCmd* cmd)
{ _default = cmd; }
// set a default instance of the MoveFrameCmd.
@@ -315,7 +315,7 @@
virtual boolean Reversible();
static AutoNewFrameCmd* default_instance() { return _default; }
- static void AutoNewFrameCmd::default_instance(AutoNewFrameCmd* cmd)
+ static void default_instance(AutoNewFrameCmd* cmd)
{ _default = cmd; }
protected:
only in patch2:
unchanged:
--- ivtools-1.1.3.orig/src/InterViews/style.c
+++ ivtools-1.1.3/src/InterViews/style.c
@@ -118,7 +118,7 @@
const UniqueString& name, const StyleAttributeTableEntry&,
const StyleList&, long s_index, String& value
);
- int StyleRep::finish_match(
+ int finish_match(
const StyleList&, long s_index, const UniqueStringList&, long p_index
);
};
only in patch2:
unchanged:
--- ivtools-1.1.3.orig/src/OverlayUnidraw/ovcmds.h
+++ ivtools-1.1.3/src/OverlayUnidraw/ovcmds.h
@@ -259,7 +259,7 @@
static OvNewViewCmd* default_instance() { return _default; }
// return default instance of this command.
- static void OvNewViewCmd::default_instance(OvNewViewCmd* cmd)
+ static void default_instance(OvNewViewCmd* cmd)
{ _default = cmd; }
// set default instance of this command.
Christoph
--
[EMAIL PROTECTED] | http://www.df7cb.de/
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
