glib/gtestutils.h is not available on gutsy, so switching to include of

glib.h, which will include that file on hardy, but on gutsy will include
gmessage.h.

diff --git a/src/attributes.cpp b/src/attributes.cpp
index be5dedc249f52c57e63b58b325b8bf878f00b23e..4169dee51997ca7362ddebbd01e5708c1be2489b 100644 (file)
--- a/src/attributes.cpp
+++ b/src/attributes.cpp
@@ -17,7 +17,7 @@
 # include "config.h"
 #endif
 
-#include <glib/gtestutils.h>
+#include <glib.h> // g_assert()
 #include <glib/ghash.h>
 #include "attributes.h"
 

diff --git a/src/axis-manip.h b/src/axis-manip.h
index 0021630a099448d9c99c8e71a2d7559131854815..7513bebaf5237a1a69478a2b49ff1c7455c848ce 100644 (file)
--- a/src/axis-manip.h
+++ b/src/axis-manip.h
@@ -12,7 +12,7 @@
 #ifndef SEEN_AXIS_MANIP_H
 #define SEEN_AXIS_MANIP_H
 
-#include <glib/gtestutils.h>
+#include <glib.h> // g_assert()
 #include <gtk/gtk.h>
 #include "libnr/nr-point.h"
 

diff --git a/src/color-rgba.h b/src/color-rgba.h
index b968f3de184d7cb6047aa4795db6ccc9a89d0593..fc52b193dd007a10a99076ff6955832a31c21d7b 100644 (file)
--- a/src/color-rgba.h
+++ b/src/color-rgba.h
@@ -12,7 +12,7 @@
 #ifndef SEEN_COLOR_RGBA_H
 #define SEEN_COLOR_RGBA_H
 
-#include <glib/gtestutils.h>
+#include <glib.h> // g_assert()
 #include <glib/gmessages.h>
 #include "libnr/nr-pixops.h"
 #include "decimal-round.h"

diff --git a/src/helper/units.cpp b/src/helper/units.cpp
index 45d6d27f9432bbf8820d0fd6cc0de157993d4433..a78f5e623ef55c71f8d73349f77414f0fb36c2a1 100644 (file)
--- a/src/helper/units.cpp
+++ b/src/helper/units.cpp
@@ -20,7 +20,7 @@
 #endif
 
 #include "helper/units.h"
-#include <glib/gtestutils.h>
+#include <glib.h> // g_assert()
 #include <glibmm/i18n.h>
 #include "unit-constants.h"
 #include "svg/svg-length.h"

diff --git a/src/io/resource.cpp b/src/io/resource.cpp
index 267a82d0184c2b796ab5ef439f731ed518964beb..f7542855ee09124f2c44c71deea5b1d33c769f84 100644 (file)
--- a/src/io/resource.cpp
+++ b/src/io/resource.cpp
@@ -16,7 +16,7 @@
 #include "config.h"
 #endif
 
-#include <glib/gtestutils.h>
+#include <glib.h> // g_assert()
 #include <glib/gmessages.h>
 #include <glib/gstrfuncs.h>
 #include <glib/gfileutils.h>

diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp
index f0a2ae79d6f833fee16f5c2e4e7d3dec5ddcf80a..fe79736dc809d32ebb2f172532b469a3808973cd 100644 (file)
--- a/src/svg/svg-color.cpp
+++ b/src/svg/svg-color.cpp
@@ -23,7 +23,7 @@
 #include <cassert>
 #include <math.h>
 #include <glib/gmem.h>
-#include <glib/gtestutils.h>
+#include <glib.h> // g_assert
 #include <glib/gmessages.h>
 #include <glib/gstrfuncs.h>
 #include <glib/ghash.h>

diff --git a/src/svg/svg-path.cpp b/src/svg/svg-path.cpp
index 86d8bc162375c76584647212e41bbd7927efd40a..b491e61c01b7baa5cb4f88a7ae6b826e07c30ae6 100644 (file)
--- a/src/svg/svg-path.cpp
+++ b/src/svg/svg-path.cpp
@@ -30,7 +30,7 @@
 #include <glib/gmem.h>
 #include <glib/gmessages.h>
 #include <glib/gstrfuncs.h>
-#include <glib/gtestutils.h>
+#include <glib.h> // g_assert()
 
 #include "libnr/n-art-bpath.h"
 #include "gnome-canvas-bpath-util.h"

diff --git a/src/xml/event.cpp b/src/xml/event.cpp
index 0e852ce974f4d97e29fece4119802e9a762d4020..d713200e574f9161c7ec5eb5ac1773f2bfd91cf3 100644 (file)
--- a/src/xml/event.cpp
+++ b/src/xml/event.cpp
@@ -13,7 +13,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gtestutils.h>
+#include <glib.h> // g_assert()
 
 #include "event.h"
 #include "event-fns.h"

diff --git a/src/xml/node-fns.cpp b/src/xml/node-fns.cpp
index 69317e2a6c1e29e26ddd4eea1057de694ec2a599..4d346e009ce1c7d4980fc4d68324638308fa8a0d 100644 (file)
--- a/src/xml/node-fns.cpp
+++ b/src/xml/node-fns.cpp
@@ -3,7 +3,7 @@
 #endif
 
 #include <map>
-#include <glib/gtestutils.h>
+#include <glib.h> // g_assert()
 
 #include "xml/node-iterators.h"
 #include "algorithms/find-if-before.h"

diff --git a/src/xml/simple-document.cpp b/src/xml/simple-document.cpp
index c06c0ed69c3475e0b04accab3d7fa4404cacfc7e..30e74a4554dca54b2e49bfbca9e6d20cada5ff50 100644 (file)
--- a/src/xml/simple-document.cpp
+++ b/src/xml/simple-document.cpp
@@ -12,7 +12,7 @@
  *
  */
 
-#include <glib/gtestutils.h>
+#include <glib.h> // g_assert()
 
 #include "xml/simple-document.h"
 #include "xml/event-fns.h"

diff --git a/src/xml/simple-node.h b/src/xml/simple-node.h
index 3bd2f58b4f9aa3d2d134f6f529145525e99c9792..60bb534549e80e6f14c391dc534e823398ea7cba 100644 (file)
--- a/src/xml/simple-node.h
+++ b/src/xml/simple-node.h
@@ -15,7 +15,7 @@
 #ifndef SEEN_INKSCAPE_XML_SIMPLE_NODE_H
 #define SEEN_INKSCAPE_XML_SIMPLE_NODE_H
 
-#include <glib/gtestutils.h>
+#include <glib.h> // g_assert()
 
 #include "xml/node.h"
 #include "xml/attribute-record.h"