Bug#305521: dia_0.94.0-7: FTBFS with gcc-4.0

[Hervé Cauwelier]

This is a multi-part message in MIME format.
--------------080507020201030604030800
Content-Type: text/plain; charset=ISO-8859-15; format=flowed
Content-Transfer-Encoding: 8bit

This patch is probably necessary too.

-- 
Hervé Cauwelier

--------------080507020201030604030800
Content-Type: text/plain;
 name="01_user-lib-prefix.dpatch"
Content-Transfer-Encoding: 8bit
Content-Disposition: inline;
 filename="01_user-lib-prefix.dpatch"

#! /bin/sh /usr/share/dpatch/dpatch-run
## 01fix-gcc-build.dpatch by Hervé Cauwelier <hcauwelier@oursours.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad dia-0.94.0/plug-ins/python/diamodule.c /tmp/dpep.cCtTtV/dia-0.94.0/plug-ins/python/diamodule.c
--- dia-0.94.0/plug-ins/python/diamodule.c	2004-08-16 09:56:20.000000000 +0200
+++ /tmp/dpep.cCtTtV/dia-0.94.0/plug-ins/python/diamodule.c	2005-04-23 19:55:57.978009944 +0200
@@ -37,8 +37,8 @@
 #include "pydia-error.h"
 #include "pydia-text.h"
 
-#include "object.h"
-#include "group.h"
+#include "lib/object.h"
+#include "lib/group.h"
 #include "app/diagram.h"
 #include "app/display.h"
 #include "app/load_save.h"
diff -urNad dia-0.94.0/plug-ins/python/pydia-object.h /tmp/dpep.cCtTtV/dia-0.94.0/plug-ins/python/pydia-object.h
--- dia-0.94.0/plug-ins/python/pydia-object.h	2005-04-23 19:52:40.119089072 +0200
+++ /tmp/dpep.cCtTtV/dia-0.94.0/plug-ins/python/pydia-object.h	2005-04-23 19:55:29.129395600 +0200
@@ -22,7 +22,7 @@
 
 #include <Python.h>
 
-#include "object.h"
+#include "lib/object.h"
 
 typedef struct {
     PyObject_HEAD
diff -urNad dia-0.94.0/plug-ins/python/pydia-properties.h /tmp/dpep.cCtTtV/dia-0.94.0/plug-ins/python/pydia-properties.h
--- dia-0.94.0/plug-ins/python/pydia-properties.h	2004-08-16 09:56:20.000000000 +0200
+++ /tmp/dpep.cCtTtV/dia-0.94.0/plug-ins/python/pydia-properties.h	2005-04-23 19:56:24.752939536 +0200
@@ -2,8 +2,8 @@
 #define PYDIA_PROPERTIES_H
 
 #include <Python.h>
-#include "object.h"
-#include "properties.h"
+#include "lib/object.h"
+#include "lib/properties.h"
 
 typedef struct {
     PyObject_HEAD
@@ -26,4 +26,4 @@
 
 #define PyDiaProperty_Check(o) ((o)->ob_type == &PyDiaProperty_Type)
 
-#endif
\ Pas de fin de ligne à la fin du fichier.
+#endif

--------------080507020201030604030800--