glib232.patch

   1 diff -ur libgda-3.1.5.orig/libgda/dir-blob-op.c libgda-3.1.5/libgda/dir-blob-op.c
   2 --- libgda-3.1.5.orig/libgda/dir-blob-op.c      2008-07-20 11:51:23.000000000 +0200
   3 +++ libgda-3.1.5/libgda/dir-blob-op.c   2012-06-29 12:53:05.243999205 +0200
   4 @@ -28,7 +28,7 @@
   5  #include <sys/types.h>
   6  #include <sys/stat.h>
   7  #include <unistd.h>
   8 -#include <glib/gstdio.h>
   9 +#include <glib.h>
  10
  11  struct _GdaDirBlobOpPrivate {
  12         gchar *complete_filename;
  13 diff -ur libgda-3.1.5.orig/libgda/gda-column.c libgda-3.1.5/libgda/gda-column.c
  14 --- libgda-3.1.5.orig/libgda/gda-column.c       2008-07-20 11:51:23.000000000 +0200
  15 +++ libgda-3.1.5/libgda/gda-column.c    2012-06-29 12:53:05.237332538 +0200
  16 @@ -23,8 +23,7 @@
  17   * Boston, MA 02111-1307, USA.
  18   */
  19
  20 -#include <glib/gmessages.h>
  21 -#include <glib/gstrfuncs.h>
  22 +#include <glib.h>
  23  #include <libgda/gda-column.h>
  24  #include <string.h>
  25  #include "gda-marshal.h"
  26 diff -ur libgda-3.1.5.orig/libgda/gda-column.h libgda-3.1.5/libgda/gda-column.h
  27 --- libgda-3.1.5.orig/libgda/gda-column.h       2008-07-20 11:43:15.000000000 +0200
  28 +++ libgda-3.1.5/libgda/gda-column.h    2012-06-29 12:53:05.237332538 +0200
  29 @@ -28,7 +28,7 @@
  30
  31  #include <glib-object.h>
  32  #include <libgda/gda-value.h>
  33 -#include <glib/gmacros.h>
  34 +#include <glib.h>
  35  #include <libgda/gda-decl.h>
  36
  37  G_BEGIN_DECLS
  38 diff -ur libgda-3.1.5.orig/libgda/gda-command.c libgda-3.1.5/libgda/gda-command.c
  39 --- libgda-3.1.5.orig/libgda/gda-command.c      2008-07-20 11:51:23.000000000 +0200
  40 +++ libgda-3.1.5/libgda/gda-command.c   2012-06-29 12:53:05.243999205 +0200
  41 @@ -21,9 +21,7 @@
  42   * Boston, MA 02111-1307, USA.
  43   */
  44
  45 -#include <glib/gmem.h>
  46 -#include <glib/gmessages.h>
  47 -#include <glib/gstrfuncs.h>
  48 +#include <glib.h>
  49  #include <libgda/gda-command.h>
  50
  51  GType
  52 diff -ur libgda-3.1.5.orig/libgda/gda-command.h libgda-3.1.5/libgda/gda-command.h
  53 --- libgda-3.1.5.orig/libgda/gda-command.h      2008-07-20 11:51:23.000000000 +0200
  54 +++ libgda-3.1.5/libgda/gda-command.h   2012-06-29 12:53:05.243999205 +0200
  55 @@ -25,8 +25,7 @@
  56  #define __GDA_COMMAND_H__
  57
  58  #include <glib-object.h>
  59 -#include <glib/gmacros.h>
  60 -#include <glib/gtypes.h>
  61 +#include <glib.h>
  62
  63  G_BEGIN_DECLS
  64
  65 diff -ur libgda-3.1.5.orig/libgda/gda-config.c libgda-3.1.5/libgda/gda-config.c
  66 --- libgda-3.1.5.orig/libgda/gda-config.c       2008-07-20 11:51:23.000000000 +0200
  67 +++ libgda-3.1.5/libgda/gda-config.c    2012-06-29 12:53:05.240665871 +0200
  68 @@ -38,7 +38,7 @@
  69  #include <sys/stat.h>
  70  #ifdef HAVE_FAM
  71  #include <fam.h>
  72 -#include <glib/giochannel.h>
  73 +#include <glib.h>
  74  #include <sys/types.h>
  75  #include <sys/stat.h>
  76  #include <unistd.h>
  77 diff -ur libgda-3.1.5.orig/libgda/gda-config.h libgda-3.1.5/libgda/gda-config.h
  78 --- libgda-3.1.5.orig/libgda/gda-config.h       2008-07-20 11:51:23.000000000 +0200
  79 +++ libgda-3.1.5/libgda/gda-config.h    2012-06-29 12:53:05.240665871 +0200
  80 @@ -23,7 +23,7 @@
  81  #ifndef __GDA_CONFIG_H__
  82  #define __GDA_CONFIG_H__
  83
  84 -#include <glib/gmacros.h>
  85 +#include <glib.h>
  86  #include <libgda/gda-data-model.h>
  87  #include <libgda/gda-parameter.h>
  88
  89 diff -ur libgda-3.1.5.orig/libgda/gda-data-model-array.c libgda-3.1.5/libgda/gda-data-model-array.c
  90 --- libgda-3.1.5.orig/libgda/gda-data-model-array.c     2008-07-20 11:51:23.000000000 +0200
  91 +++ libgda-3.1.5/libgda/gda-data-model-array.c  2012-06-29 12:53:05.240665871 +0200
  92 @@ -22,7 +22,7 @@
  93   */
  94
  95  #include <string.h>
  96 -#include <glib/garray.h>
  97 +#include <glib.h>
  98  #include <libgda/gda-data-model-array.h>
  99  #include <glib/gi18n-lib.h>
 100  #include <libgda/gda-row.h>
 101 diff -ur libgda-3.1.5.orig/libgda/gda-data-model.c libgda-3.1.5/libgda/gda-data-model.c
 102 --- libgda-3.1.5.orig/libgda/gda-data-model.c   2008-07-20 11:51:23.000000000 +0200
 103 +++ libgda-3.1.5/libgda/gda-data-model.c        2012-06-29 12:53:05.253999204 +0200
 104 @@ -23,7 +23,7 @@
 105   */
 106
 107  #include <glib/gi18n-lib.h>
 108 -#include <glib/gprintf.h>
 109 +#include <glib.h>
 110  #include <libgda/gda-data-model.h>
 111  #include <libgda/gda-data-model-private.h>
 112  #include <libgda/gda-data-model-extra.h>
 113 diff -ur libgda-3.1.5.orig/libgda/gda-data-model-dir.c libgda-3.1.5/libgda/gda-data-model-dir.c
 114 --- libgda-3.1.5.orig/libgda/gda-data-model-dir.c       2008-07-20 11:51:23.000000000 +0200
 115 +++ libgda-3.1.5/libgda/gda-data-model-dir.c    2012-06-29 12:53:05.250665871 +0200
 116 @@ -21,7 +21,7 @@
 117
 118  #include <string.h>
 119  #include <glib/gi18n-lib.h>
 120 -#include <glib/gstdio.h>
 121 +#include <glib.h>
 122  #include <libgda/gda-data-model.h>
 123  #include <libgda/gda-data-model-dir.h>
 124  #include <libgda/gda-data-model-extra.h>
 125 diff -ur libgda-3.1.5.orig/libgda/gda-data-model-filter-sql.c libgda-3.1.5/libgda/gda-data-model-filter-sql.c
 126 --- libgda-3.1.5.orig/libgda/gda-data-model-filter-sql.c        2008-07-20 11:51:23.000000000 +0200
 127 +++ libgda-3.1.5/libgda/gda-data-model-filter-sql.c     2012-06-29 12:53:05.257332538 +0200
 128 @@ -21,7 +21,7 @@
 129   * Boston, MA 02111-1307, USA.
 130   */
 131
 132 -#include <glib/gdataset.h>
 133 +#include <glib.h>
 134  #include <glib-object.h>
 135  #include <libsql/sql_parser.h>
 136  #include <glib/gi18n-lib.h>
 137 diff -ur libgda-3.1.5.orig/libgda/gda-data-model-hash.c libgda-3.1.5/libgda/gda-data-model-hash.c
 138 --- libgda-3.1.5.orig/libgda/gda-data-model-hash.c      2008-07-20 11:51:23.000000000 +0200
 139 +++ libgda-3.1.5/libgda/gda-data-model-hash.c   2012-06-29 12:53:05.250665871 +0200
 140 @@ -23,7 +23,7 @@
 141   * Boston, MA 02111-1307, USA.
 142   */
 143
 144 -#include <glib/ghash.h>
 145 +#include <glib.h>
 146  #include <glib/gi18n-lib.h>
 147  #include <libgda/gda-data-model-hash.h>
 148  #include <libgda/gda-data-model-extra.h>
 149 diff -ur libgda-3.1.5.orig/libgda/gda-dict.c libgda-3.1.5/libgda/gda-dict.c
 150 --- libgda-3.1.5.orig/libgda/gda-dict.c 2008-07-20 11:51:23.000000000 +0200
 151 +++ libgda-3.1.5/libgda/gda-dict.c      2012-06-29 12:53:05.233999205 +0200
 152 @@ -19,7 +19,7 @@
 153
 154  #include <string.h>
 155  #include <glib/gi18n-lib.h>
 156 -#include <glib/gstdio.h>
 157 +#include <glib.h>
 158  #include "gda-dict.h"
 159  #include "gda-dict-private.h"
 160  #include "gda-marshal.h"
 161 diff -ur libgda-3.1.5.orig/libgda/gda-init.c libgda-3.1.5/libgda/gda-init.c
 162 --- libgda-3.1.5.orig/libgda/gda-init.c 2008-07-20 11:51:23.000000000 +0200
 163 +++ libgda-3.1.5/libgda/gda-init.c      2012-06-29 12:53:05.233999205 +0200
 164 @@ -17,7 +17,7 @@
 165   * Boston, MA 02111-1307, USA.
 166   */
 167
 168 -#include <glib/gmain.h>
 169 +#include <glib.h>
 170  #include <gmodule.h>
 171  #include <libgda/libgda.h>
 172  #include <glib/gi18n-lib.h>
 173 diff -ur libgda-3.1.5.orig/libgda/gda-log.c libgda-3.1.5/libgda/gda-log.c
 174 --- libgda-3.1.5.orig/libgda/gda-log.c  2008-07-20 11:43:15.000000000 +0200
 175 +++ libgda-3.1.5/libgda/gda-log.c       2012-06-29 12:53:05.250665871 +0200
 176 @@ -24,10 +24,7 @@
 177  #include <syslog.h>
 178  #endif
 179  #include <time.h>
 180 -#include <glib/gmem.h>
 181 -#include <glib/gmessages.h>
 182 -#include <glib/gstrfuncs.h>
 183 -#include <glib/gutils.h>
 184 +#include <glib.h>
 185  #include <glib/gi18n-lib.h>
 186  #include <libgda/gda-log.h>
 187
 188 diff -ur libgda-3.1.5.orig/libgda/gda-log.h libgda-3.1.5/libgda/gda-log.h
 189 --- libgda-3.1.5.orig/libgda/gda-log.h  2008-07-20 11:43:15.000000000 +0200
 190 +++ libgda-3.1.5/libgda/gda-log.h       2012-06-29 12:53:05.250665871 +0200
 191 @@ -20,8 +20,7 @@
 192  #if !defined(__gda_log_h__)
 193  #  define __gda_log_h__
 194
 195 -#include <glib/gmacros.h>
 196 -#include <glib/gtypes.h>
 197 +#include <glib.h>
 198  #include <time.h>
 199
 200  G_BEGIN_DECLS
 201 diff -ur libgda-3.1.5.orig/libgda/gda-quark-list.c libgda-3.1.5/libgda/gda-quark-list.c
 202 --- libgda-3.1.5.orig/libgda/gda-quark-list.c   2008-07-20 11:51:23.000000000 +0200
 203 +++ libgda-3.1.5/libgda/gda-quark-list.c        2012-06-29 12:53:05.240665871 +0200
 204 @@ -22,10 +22,7 @@
 205   */
 206
 207  #include <libgda/gda-quark-list.h>
 208 -#include <glib/ghash.h>
 209 -#include <glib/gmem.h>
 210 -#include <glib/gmessages.h>
 211 -#include <glib/gstrfuncs.h>
 212 +#include <glib.h>
 213
 214  struct _GdaQuarkList {
 215         GHashTable *hash_table;
 216 diff -ur libgda-3.1.5.orig/libgda/gda-quark-list.h libgda-3.1.5/libgda/gda-quark-list.h
 217 --- libgda-3.1.5.orig/libgda/gda-quark-list.h   2008-07-20 11:43:15.000000000 +0200
 218 +++ libgda-3.1.5/libgda/gda-quark-list.h        2012-06-29 12:53:05.240665871 +0200
 219 @@ -24,8 +24,7 @@
 220  #ifndef __GDA_QUARK_LIST_H__
 221  #define __GDA_QUARK_LIST_H__
 222
 223 -#include <glib/gmacros.h>
 224 -#include <glib/gtypes.h>
 225 +#include <glib.h>
 226  #include <glib-object.h>
 227
 228  G_BEGIN_DECLS
 229 diff -ur libgda-3.1.5.orig/libgda/gda-row.h libgda-3.1.5/libgda/gda-row.h
 230 --- libgda-3.1.5.orig/libgda/gda-row.h  2008-07-20 11:43:15.000000000 +0200
 231 +++ libgda-3.1.5/libgda/gda-row.h       2012-06-29 12:53:05.250665871 +0200
 232 @@ -27,7 +27,7 @@
 233
 234  #include <glib-object.h>
 235  #include <libgda/gda-column.h>
 236 -#include <glib/gmacros.h>
 237 +#include <glib.h>
 238  #include <libgda/gda-decl.h>
 239
 240  G_BEGIN_DECLS
 241 diff -ur libgda-3.1.5.orig/libgda/gda-server-operation.c libgda-3.1.5/libgda/gda-server-operation.c
 242 --- libgda-3.1.5.orig/libgda/gda-server-operation.c     2008-08-04 13:16:26.000000000 +0200
 243 +++ libgda-3.1.5/libgda/gda-server-operation.c  2012-06-29 12:53:05.270665870 +0200
 244 @@ -21,7 +21,7 @@
 245   */
 246
 247  #include <stdlib.h>
 248 -#include <glib/gmessages.h>
 249 +#include <glib.h>
 250  #include <libgda/gda-marshal.h>
 251  #include <libgda/gda-dict.h>
 252  #include <libgda/gda-dict-type.h>
 253 diff -ur libgda-3.1.5.orig/libgda/gda-server-provider.c libgda-3.1.5/libgda/gda-server-provider.c
 254 --- libgda-3.1.5.orig/libgda/gda-server-provider.c      2008-07-20 11:51:23.000000000 +0200
 255 +++ libgda-3.1.5/libgda/gda-server-provider.c   2012-06-29 12:53:05.253999204 +0200
 256 @@ -22,7 +22,7 @@
 257   * Boston, MA 02111-1307, USA.
 258   */
 259
 260 -#include <glib/gmessages.h>
 261 +#include <glib.h>
 262  #include <libgda/gda-server-provider.h>
 263  #include <libgda/gda-server-provider-extra.h>
 264  #include <libgda/gda-server-provider-private.h>
 265 diff -ur libgda-3.1.5.orig/libgda/gda-util.c libgda-3.1.5/libgda/gda-util.c
 266 --- libgda-3.1.5.orig/libgda/gda-util.c 2008-07-20 11:51:23.000000000 +0200
 267 +++ libgda-3.1.5/libgda/gda-util.c      2012-06-29 12:53:05.247332538 +0200
 268 @@ -27,10 +27,7 @@
 269  #include <fcntl.h>
 270  #include <unistd.h>
 271  #include <string.h>
 272 -#include <glib/gfileutils.h>
 273 -#include <glib/gmessages.h>
 274 -#include <glib/gstrfuncs.h>
 275 -#include <glib/gprintf.h>
 276 +#include <glib.h>
 277  #include <libsql/sql_parser.h>
 278  #include <glib/gi18n-lib.h>
 279  #include <libgda/gda-log.h>
 280 diff -ur libgda-3.1.5.orig/libgda/gda-util.h libgda-3.1.5/libgda/gda-util.h
 281 --- libgda-3.1.5.orig/libgda/gda-util.h 2008-07-20 11:51:23.000000000 +0200
 282 +++ libgda-3.1.5/libgda/gda-util.h      2012-06-29 12:53:05.247332538 +0200
 283 @@ -24,8 +24,7 @@
 284  #ifndef __GDA_UTIL_H__
 285  #define __GDA_UTIL_H__
 286
 287 -#include <glib/ghash.h>
 288 -#include <glib/glist.h>
 289 +#include <glib.h>
 290  #include "gda-parameter.h"
 291  #include "gda-row.h"
 292  #include "gda-connection.h"
 293 diff -ur libgda-3.1.5.orig/libgda/gda-value.c libgda-3.1.5/libgda/gda-value.c
 294 --- libgda-3.1.5.orig/libgda/gda-value.c        2008-07-20 11:51:23.000000000 +0200
 295 +++ libgda-3.1.5/libgda/gda-value.c     2012-06-29 12:53:05.267332537 +0200
 296 @@ -28,10 +28,7 @@
 297  #include <string.h>
 298  #include <stdlib.h>
 299  #include <time.h>
 300 -#include <glib/gdate.h>
 301 -#include <glib/gmessages.h>
 302 -#include <glib/gstrfuncs.h>
 303 -#include <glib/gstring.h>
 304 +#include <glib.h>
 305  #include <glib/gi18n-lib.h>
 306  #include <libgda/gda-value.h>
 307  #include <libgda/gda-blob-op.h>
 308 diff -ur libgda-3.1.5.orig/libgda/gda-value.h libgda-3.1.5/libgda/gda-value.h
 309 --- libgda-3.1.5.orig/libgda/gda-value.h        2008-07-20 11:51:23.000000000 +0200
 310 +++ libgda-3.1.5/libgda/gda-value.h     2012-06-29 12:53:05.267332537 +0200
 311 @@ -27,8 +27,7 @@
 312  #define __GDA_VALUE_H__
 313
 314  #include <time.h>
 315 -#include <glib/glist.h>
 316 -#include <glib/gmacros.h>
 317 +#include <glib.h>
 318  #include <glib-object.h>
 319  #include <libxml/tree.h>
 320  #include <libgda/gda-decl.h>
 321 diff -ur libgda-3.1.5.orig/libgda/sqlite/gda-sqlite.h libgda-3.1.5/libgda/sqlite/gda-sqlite.h
 322 --- libgda-3.1.5.orig/libgda/sqlite/gda-sqlite.h        2008-07-20 11:51:22.000000000 +0200
 323 +++ libgda-3.1.5/libgda/sqlite/gda-sqlite.h     2012-06-29 12:53:05.253999204 +0200
 324 @@ -25,8 +25,7 @@
 325  #ifndef __GDA_SQLITE_H__
 326  #define __GDA_SQLITE_H__
 327
 328 -#include <glib/gmacros.h>
 329 -#include <glib/gtypes.h>
 330 +#include <glib.h>
 331  #include <libgda/gda-value.h>
 332  #include <libgda/gda-connection.h>
 333
 334 diff -ur libgda-3.1.5.orig/libgda/sqlite/gda-sqlite-provider.c libgda-3.1.5/libgda/sqlite/gda-sqlite-provider.c
 335 --- libgda-3.1.5.orig/libgda/sqlite/gda-sqlite-provider.c       2008-07-20 11:51:22.000000000 +0200
 336 +++ libgda-3.1.5/libgda/sqlite/gda-sqlite-provider.c    2012-06-29 12:53:05.257332538 +0200
 337 @@ -25,7 +25,7 @@
 338  #include <errno.h>
 339  #include <string.h>
 340  #include <glib/gi18n-lib.h>
 341 -#include <glib/gstdio.h>
 342 +#include <glib.h>
 343  #include <libgda/gda-data-model-array.h>
 344  #include <libgda/gda-data-model-private.h>
 345  #include <libgda/gda-parameter-list.h>
 346 diff -ur libgda-3.1.5.orig/libgda-report/DocBook/gda-report-docbook-document.c libgda-3.1.5/libgda-report/DocBook/gda-report-docbook-document.c
 347 --- libgda-3.1.5.orig/libgda-report/DocBook/gda-report-docbook-document.c       2008-07-20 11:51:14.000000000 +0200
 348 +++ libgda-3.1.5/libgda-report/DocBook/gda-report-docbook-document.c    2012-06-29 12:53:05.230665872 +0200
 349 @@ -21,7 +21,7 @@
 350   */
 351
 352  #include <glib/gi18n-lib.h>
 353 -#include <glib/gstdio.h>
 354 +#include <glib.h>
 355  #include <stdio.h>
 356  #include <unistd.h>
 357  #include <string.h>
 358 diff -ur libgda-3.1.5.orig/libgda-report/gda-report-document.c libgda-3.1.5/libgda-report/gda-report-document.c
 359 --- libgda-3.1.5.orig/libgda-report/gda-report-document.c       2008-07-20 11:51:14.000000000 +0200
 360 +++ libgda-3.1.5/libgda-report/gda-report-document.c    2012-06-29 12:53:05.230665872 +0200
 361 @@ -21,7 +21,7 @@
 362   */
 363
 364  #include <glib/gi18n-lib.h>
 365 -#include <glib/gstdio.h>
 366 +#include <glib.h>
 367  #include <stdio.h>
 368  #include <unistd.h>
 369  #include <string.h>
 370 diff -ur libgda-3.1.5.orig/libgda-report/RML/gda-report-rml-document.c libgda-3.1.5/libgda-report/RML/gda-report-rml-document.c
 371 --- libgda-3.1.5.orig/libgda-report/RML/gda-report-rml-document.c       2008-07-20 11:51:14.000000000 +0200
 372 +++ libgda-3.1.5/libgda-report/RML/gda-report-rml-document.c    2012-06-29 12:53:05.230665872 +0200
 373 @@ -21,7 +21,7 @@
 374   */
 375
 376  #include <glib/gi18n-lib.h>
 377 -#include <glib/gstdio.h>
 378 +#include <glib.h>
 379  #include <stdio.h>
 380  #include <unistd.h>
 381  #include <string.h>
 382 diff -ur libgda-3.1.5.orig/libsql/sql_parser.c libgda-3.1.5/libsql/sql_parser.c
 383 --- libgda-3.1.5.orig/libsql/sql_parser.c       2008-07-20 11:51:38.000000000 +0200
 384 +++ libgda-3.1.5/libsql/sql_parser.c    2012-06-29 12:53:05.273999204 +0200
 385 @@ -17,7 +17,7 @@
 386  #include <stdio.h>
 387  #include <glib.h>
 388  #include <glib/gi18n-lib.h>
 389 -#include <glib/gprintf.h>
 390 +#include <glib.h>
 391  #include <strings.h>
 392  #include <string.h>
 393
 394 diff -ur libgda-3.1.5.orig/providers/bdb/gda-bdb.h libgda-3.1.5/providers/bdb/gda-bdb.h
 395 --- libgda-3.1.5.orig/providers/bdb/gda-bdb.h   2008-07-20 11:51:15.000000000 +0200
 396 +++ libgda-3.1.5/providers/bdb/gda-bdb.h        2012-06-29 12:53:05.273999204 +0200
 397 @@ -25,7 +25,7 @@
 398  #if defined(HAVE_CONFIG_H)
 399  #endif
 400
 401 -#include <glib/gmacros.h>
 402 +#include <glib.h>
 403  #include <glib/gi18n-lib.h>
 404  #include <libgda/gda-server-provider.h>
 405  #include <db.h>
 406 diff -ur libgda-3.1.5.orig/providers/firebird/gda-firebird-provider.c libgda-3.1.5/providers/firebird/gda-firebird-provider.c
 407 --- libgda-3.1.5.orig/providers/firebird/gda-firebird-provider.c        2008-07-20 11:51:15.000000000 +0200
 408 +++ libgda-3.1.5/providers/firebird/gda-firebird-provider.c     2012-06-29 12:53:05.277332537 +0200
 409 @@ -21,7 +21,7 @@
 410  #include <libgda/gda-server-provider-extra.h>
 411  #include <libgda/gda-command.h>
 412  #include <libgda/gda-parameter-list.h>
 413 -#include <glib/gprintf.h>
 414 +#include <glib.h>
 415  #include <string.h>
 416  #include "gda-firebird-provider.h"
 417  #include "gda-firebird-recordset.h"
 418 diff -ur libgda-3.1.5.orig/providers/firebird/gda-firebird-recordset.c libgda-3.1.5/providers/firebird/gda-firebird-recordset.c
 419 --- libgda-3.1.5.orig/providers/firebird/gda-firebird-recordset.c       2008-07-20 11:51:15.000000000 +0200
 420 +++ libgda-3.1.5/providers/firebird/gda-firebird-recordset.c    2012-06-29 12:53:05.273999204 +0200
 421 @@ -27,7 +27,7 @@
 422  #include <libgda/gda-quark-list.h>
 423  #include <libgda/gda-parameter-list.h>
 424  #include <glib/gi18n-lib.h>
 425 -#include <glib/gprintf.h>
 426 +#include <glib.h>
 427  #include <string.h>
 428  #include <math.h>
 429
 430 diff -ur libgda-3.1.5.orig/providers/freetds/gda-freetds.h libgda-3.1.5/providers/freetds/gda-freetds.h
 431 --- libgda-3.1.5.orig/providers/freetds/gda-freetds.h   2007-10-01 17:51:37.000000000 +0200
 432 +++ libgda-3.1.5/providers/freetds/gda-freetds.h        2012-06-29 12:53:05.277332537 +0200
 433 @@ -24,7 +24,7 @@
 434  #if defined(HAVE_CONFIG_H)
 435  #endif
 436
 437 -#include <glib/gmacros.h>
 438 +#include <glib.h>
 439  #include <glib/gi18n-lib.h>
 440  #include <libgda/gda-server-provider.h>
 441  #include <tds.h>
 442 diff -ur libgda-3.1.5.orig/providers/freetds/gda-freetds-message.h libgda-3.1.5/providers/freetds/gda-freetds-message.h
 443 --- libgda-3.1.5.orig/providers/freetds/gda-freetds-message.h   2007-10-01 17:51:37.000000000 +0200
 444 +++ libgda-3.1.5/providers/freetds/gda-freetds-message.h        2012-06-29 12:53:05.277332537 +0200
 445 @@ -24,7 +24,7 @@
 446  #if defined(HAVE_CONFIG_H)
 447  #endif
 448
 449 -#include <glib/gmacros.h>
 450 +#include <glib.h>
 451  #include <glib/gi18n-lib.h>
 452  #include <libgda/gda-server-provider.h>
 453  #include <tds.h>
 454 diff -ur libgda-3.1.5.orig/providers/freetds/gda-freetds-types.h libgda-3.1.5/providers/freetds/gda-freetds-types.h
 455 --- libgda-3.1.5.orig/providers/freetds/gda-freetds-types.h     2007-10-01 17:51:37.000000000 +0200
 456 +++ libgda-3.1.5/providers/freetds/gda-freetds-types.h  2012-06-29 12:53:05.277332537 +0200
 457 @@ -24,7 +24,7 @@
 458  #if defined(HAVE_CONFIG_H)
 459  #endif
 460
 461 -#include <glib/gmacros.h>
 462 +#include <glib.h>
 463  #include <glib/gi18n-lib.h>
 464  #include <libgda/gda-server-provider.h>
 465  #include <tds.h>
 466 diff -ur libgda-3.1.5.orig/providers/ibmdb2/gda-ibmdb2.h libgda-3.1.5/providers/ibmdb2/gda-ibmdb2.h
 467 --- libgda-3.1.5.orig/providers/ibmdb2/gda-ibmdb2.h     2007-10-01 17:51:38.000000000 +0200
 468 +++ libgda-3.1.5/providers/ibmdb2/gda-ibmdb2.h  2012-06-29 12:53:05.277332537 +0200
 469 @@ -23,12 +23,11 @@
 470  #if !defined(__gda_ibmdb2_h__)
 471  #  define __gda_ibmdb2_h__
 472
 473 -#include <glib/gmacros.h>
 474 +#include <glib.h>
 475  #include <glib/gi18n-lib.h>
 476  #include <libgda/gda-connection.h>
 477  #include <libgda/gda-server-provider.h>
 478  #include <libgda/gda-value.h>
 479 -#include <glib/gi18n-lib.h>
 480  #include <sqlcli1.h>
 481  #include "gda-ibmdb2-provider.h"
 482
 483 diff -ur libgda-3.1.5.orig/providers/ibmdb2/gda-ibmdb2-types.h libgda-3.1.5/providers/ibmdb2/gda-ibmdb2-types.h
 484 --- libgda-3.1.5.orig/providers/ibmdb2/gda-ibmdb2-types.h       2007-10-01 17:51:38.000000000 +0200
 485 +++ libgda-3.1.5/providers/ibmdb2/gda-ibmdb2-types.h    2012-06-29 12:53:05.277332537 +0200
 486 @@ -23,7 +23,7 @@
 487  #ifndef __GDA_IBMDB2_TYPES_H__
 488  #define __GDA_IBMDB2_TYPES_H__
 489
 490 -#include <glib/gmacros.h>
 491 +#include <glib.h>
 492  #include <glib/gi18n-lib.h>
 493  #include <libgda/gda-server-provider.h>
 494  #include <sqlcli1.h>
 495 diff -ur libgda-3.1.5.orig/providers/ldap/gda-ldap.h libgda-3.1.5/providers/ldap/gda-ldap.h
 496 --- libgda-3.1.5.orig/providers/ldap/gda-ldap.h 2007-10-01 17:51:37.000000000 +0200
 497 +++ libgda-3.1.5/providers/ldap/gda-ldap.h      2012-06-29 12:53:05.273999204 +0200
 498 @@ -26,7 +26,7 @@
 499  #if !defined(__gda_ldap_h__)
 500  #  define __gda_ldap_h__
 501
 502 -#include <glib/gmacros.h>
 503 +#include <glib.h>
 504  #include <libgda/gda-connection.h>
 505  #include <libgda/gda-server-provider.h>
 506  #include <glib/gi18n-lib.h>
 507 diff -ur libgda-3.1.5.orig/providers/mdb/gda-mdb.h libgda-3.1.5/providers/mdb/gda-mdb.h
 508 --- libgda-3.1.5.orig/providers/mdb/gda-mdb.h   2008-07-20 11:51:16.000000000 +0200
 509 +++ libgda-3.1.5/providers/mdb/gda-mdb.h        2012-06-29 12:53:05.273999204 +0200
 510 @@ -24,7 +24,7 @@
 511  #ifndef __GDA_MDB_H__
 512  #define __GDA_MDB_H__
 513
 514 -#include <glib/gmacros.h>
 515 +#include <glib.h>
 516  #include <libgda/gda-connection.h>
 517  #include <libgda/gda-server-provider.h>
 518  #include <glib/gi18n-lib.h>
 519 diff -ur libgda-3.1.5.orig/providers/mdb/gda-mdb-provider.c libgda-3.1.5/providers/mdb/gda-mdb-provider.c
 520 --- libgda-3.1.5.orig/providers/mdb/gda-mdb-provider.c  2008-07-20 11:51:16.000000000 +0200
 521 +++ libgda-3.1.5/providers/mdb/gda-mdb-provider.c       2012-06-29 12:53:05.273999204 +0200
 522 @@ -22,7 +22,7 @@
 523   */
 524
 525  #include <stdlib.h>
 526 -#include <glib/gbacktrace.h>
 527 +#include <glib.h>
 528  #include <virtual/gda-vconnection-data-model.h>
 529  #include <libgda/gda-data-model-array.h>
 530  #include <libgda/gda-data-model-private.h>
 531 diff -ur libgda-3.1.5.orig/providers/msql/gda-msql.h libgda-3.1.5/providers/msql/gda-msql.h
 532 --- libgda-3.1.5.orig/providers/msql/gda-msql.h 2007-10-01 17:51:41.000000000 +0200
 533 +++ libgda-3.1.5/providers/msql/gda-msql.h      2012-06-29 12:53:05.273999204 +0200
 534 @@ -22,7 +22,7 @@
 535  #ifndef __gda_msql_h__
 536  #define __gda_msql_h__
 537
 538 -#include <glib/gmacros.h>
 539 +#include <glib.h>
 540  #include <libgda/gda-connection.h>
 541  #include <libgda/gda-server-provider.h>
 542  #include <glib/gi18n-lib.h>
 543 diff -ur libgda-3.1.5.orig/providers/mysql/gda-mysql.h libgda-3.1.5/providers/mysql/gda-mysql.h
 544 --- libgda-3.1.5.orig/providers/mysql/gda-mysql.h       2008-07-20 11:51:16.000000000 +0200
 545 +++ libgda-3.1.5/providers/mysql/gda-mysql.h    2012-06-29 12:53:05.273999204 +0200
 546 @@ -25,7 +25,7 @@
 547  #ifndef __GDA_MYSQL_H__
 548  #define __GDA_MYSQL_H__
 549
 550 -#include <glib/gmacros.h>
 551 +#include <glib.h>
 552  #include <libgda/gda-connection.h>
 553  #include <libgda/gda-server-provider.h>
 554  #include <glib/gi18n-lib.h>
 555 diff -ur libgda-3.1.5.orig/providers/odbc/gda-odbc.h libgda-3.1.5/providers/odbc/gda-odbc.h
 556 --- libgda-3.1.5.orig/providers/odbc/gda-odbc.h 2007-10-01 17:51:41.000000000 +0200
 557 +++ libgda-3.1.5/providers/odbc/gda-odbc.h      2012-06-29 12:53:05.273999204 +0200
 558 @@ -25,7 +25,7 @@
 559  #if !defined(__gda_odbc_h__)
 560  #  define __gda_odbc_h__
 561
 562 -#include <glib/gmacros.h>
 563 +#include <glib.h>
 564  #include <glib-object.h>
 565  #include <glib/gi18n-lib.h>
 566  #include <libgda/gda-server-provider.h>
 567 diff -ur libgda-3.1.5.orig/providers/oracle/gda-oracle.h libgda-3.1.5/providers/oracle/gda-oracle.h
 568 --- libgda-3.1.5.orig/providers/oracle/gda-oracle.h     2007-10-01 17:51:38.000000000 +0200
 569 +++ libgda-3.1.5/providers/oracle/gda-oracle.h  2012-06-29 12:53:05.277332537 +0200
 570 @@ -31,7 +31,7 @@
 571  #if defined(HAVE_CONFIG_H)
 572  #endif
 573
 574 -#include <glib/gmacros.h>
 575 +#include <glib.h>
 576  #include <libgda/gda-connection.h>
 577  #include <libgda/gda-server-provider.h>
 578  #include <glib/gi18n-lib.h>
 579 diff -ur libgda-3.1.5.orig/providers/postgres/gda-postgres.h libgda-3.1.5/providers/postgres/gda-postgres.h
 580 --- libgda-3.1.5.orig/providers/postgres/gda-postgres.h 2008-07-20 11:51:16.000000000 +0200
 581 +++ libgda-3.1.5/providers/postgres/gda-postgres.h      2012-06-29 12:53:05.273999204 +0200
 582 @@ -24,7 +24,7 @@
 583  #ifndef __GDA_POSTGRES_H__
 584  #define __GDA_POSTGRES_H__
 585
 586 -#include <glib/gmacros.h>
 587 +#include <glib.h>
 588  #include <glib/gi18n-lib.h>
 589  #include <libgda/gda-server-provider.h>
 590  #include "gda-postgres-provider.h"
 591 diff -ur libgda-3.1.5.orig/providers/sybase/gda-sybase.h libgda-3.1.5/providers/sybase/gda-sybase.h
 592 --- libgda-3.1.5.orig/providers/sybase/gda-sybase.h     2007-10-01 17:51:37.000000000 +0200
 593 +++ libgda-3.1.5/providers/sybase/gda-sybase.h  2012-06-29 12:53:05.277332537 +0200
 594 @@ -32,7 +32,7 @@
 595  #  include <config.h>
 596  #endif
 597
 598 -#include <glib/gmacros.h>
 599 +#include <glib.h>
 600  #include <glib/gi18n-lib.h>
 601  #include <libgda/gda-server-provider.h>
 602  #include <ctpublic.h>
 603 diff -ur libgda-3.1.5.orig/testing/gda-test-model-query.c libgda-3.1.5/testing/gda-test-model-query.c
 604 --- libgda-3.1.5.orig/testing/gda-test-model-query.c    2008-07-20 11:51:16.000000000 +0200
 605 +++ libgda-3.1.5/testing/gda-test-model-query.c 2012-06-29 12:53:05.230665872 +0200
 606 @@ -3,7 +3,7 @@
 607  #include <stdio.h>
 608  #include <string.h>
 609  #include <glib.h>
 610 -#include <glib/gstdio.h>
 611 +#include <glib.h>
 612  #include <gmodule.h>
 613  #include <glib/gi18n-lib.h>
 614
 615 diff -ur libgda-3.1.5.orig/testing/gda-test-sql.c libgda-3.1.5/testing/gda-test-sql.c
 616 --- libgda-3.1.5.orig/testing/gda-test-sql.c    2008-07-20 11:51:16.000000000 +0200
 617 +++ libgda-3.1.5/testing/gda-test-sql.c 2012-06-29 12:53:05.230665872 +0200
 618 @@ -3,7 +3,7 @@
 619  #include <stdio.h>
 620  #include <string.h>
 621  #include <glib.h>
 622 -#include <glib/gstdio.h>
 623 +#include <glib.h>
 624  #include <gmodule.h>
 625  #include <glib/gi18n-lib.h>
 626
 627 diff -ur libgda-3.1.5.orig/tools/gda-diagnose.c libgda-3.1.5/tools/gda-diagnose.c
 628 --- libgda-3.1.5.orig/tools/gda-diagnose.c      2008-07-20 11:51:14.000000000 +0200
 629 +++ libgda-3.1.5/tools/gda-diagnose.c   2012-06-29 12:53:05.230665872 +0200
 630 @@ -24,7 +24,7 @@
 631  #include <stdio.h>
 632  #include <string.h>
 633  #include <glib.h>
 634 -#include <glib/gstdio.h>
 635 +#include <glib.h>
 636  #include <gmodule.h>
 637  #include <glib/gi18n-lib.h>
 638  #include <libgda/gda-server-provider-extra.h>
 639 diff -ur libgda-3.1.5.orig/tools/gda-inspect-dict-file.c libgda-3.1.5/tools/gda-inspect-dict-file.c
 640 --- libgda-3.1.5.orig/tools/gda-inspect-dict-file.c     2008-07-20 11:51:14.000000000 +0200
 641 +++ libgda-3.1.5/tools/gda-inspect-dict-file.c  2012-06-29 12:53:05.227332539 +0200
 642 @@ -1,6 +1,6 @@
 643  #include <libgda/libgda.h>
 644  #include <unistd.h>
 645 -#include <glib/gstdio.h>
 646 +#include <glib.h>
 647  #include <glib/gi18n-lib.h>
 648
 649  /* options */
 650 diff -ur libgda-3.1.5.orig/tools/gda-sql.c libgda-3.1.5/tools/gda-sql.c
 651 --- libgda-3.1.5.orig/tools/gda-sql.c   2008-07-20 11:55:34.000000000 +0200
 652 +++ libgda-3.1.5/tools/gda-sql.c        2012-06-29 12:53:05.227332539 +0200
 653 @@ -21,12 +21,11 @@
 654  #include <libgda/libgda.h>
 655  #include <virtual/libgda-virtual.h>
 656  #include <glib/gi18n-lib.h>
 657 -#include <glib/gprintf.h>
 658 +#include <glib.h>
 659  #include <string.h>
 660  #include <errno.h>
 661  #include <stdio.h>
 662  #include <stdlib.h>
 663 -#include <glib/gstdio.h>
 664  #include "tools-input.h"
 665  #include "command-exec.h"
 666  #include <unistd.h>