r34613 - in /desktop/unstable/glib2.0/debian: changelog patches/03_revert_git_single_include_error.patch patches/61_glib-compile-binaries-path.patch
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Thu Apr 26 21:02:03 UTC 2012
Author: biebl
Date: Thu Apr 26 21:02:03 2012
New Revision: 34613
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34613
Log:
Refresh patches.
Modified:
desktop/unstable/glib2.0/debian/changelog
desktop/unstable/glib2.0/debian/patches/03_revert_git_single_include_error.patch
desktop/unstable/glib2.0/debian/patches/61_glib-compile-binaries-path.patch
Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=34613&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog [utf-8] Thu Apr 26 21:02:03 2012
@@ -1,8 +1,9 @@
glib2.0 (2.32.1-1) UNRELEASED; urgency=low
* New upstream release.
-
- -- Michael Biebl <biebl at debian.org> Thu, 26 Apr 2012 23:00:24 +0200
+ * Refresh patches.
+
+ -- Michael Biebl <biebl at debian.org> Thu, 26 Apr 2012 23:00:54 +0200
glib2.0 (2.32.0-4) unstable; urgency=low
Modified: desktop/unstable/glib2.0/debian/patches/03_revert_git_single_include_error.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/03_revert_git_single_include_error.patch?rev=34613&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/03_revert_git_single_include_error.patch [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/03_revert_git_single_include_error.patch [utf-8] Thu Apr 26 21:02:03 2012
@@ -1,8 +1,8 @@
-Index: glib-2.32.0/configure.ac
-===================================================================
---- glib-2.32.0.orig/configure.ac 2012-03-24 04:02:16.000000000 +0100
-+++ glib-2.32.0/configure.ac 2012-03-30 23:44:13.665365884 +0200
-@@ -514,6 +514,8 @@
+Index: glib-2.32.1/configure.ac
+===================================================================
+--- glib-2.32.1.orig/configure.ac 2012-04-13 15:39:41.000000000 +0200
++++ glib-2.32.1/configure.ac 2012-04-19 21:26:45.452405526 +0200
+@@ -528,6 +528,8 @@
esac
fi
@@ -11,10 +11,10 @@
if test "$glib_native_win32" = "yes"; then
if test x$enable_static = xyes -a x$enable_shared = xyes; then
AC_MSG_ERROR([Can not build both shared and static at the same time on Windows.])
-Index: glib-2.32.0/glib/deprecated/gallocator.h
-===================================================================
---- glib-2.32.0.orig/glib/deprecated/gallocator.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/deprecated/gallocator.h 2012-03-30 23:44:13.665365884 +0200
+Index: glib-2.32.1/glib/deprecated/gallocator.h
+===================================================================
+--- glib-2.32.1.orig/glib/deprecated/gallocator.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/deprecated/gallocator.h 2012-04-19 21:26:45.452405526 +0200
@@ -15,7 +15,7 @@
* Boston, MA 02111-1307, USA.
*/
@@ -24,101 +24,101 @@
#error "Only <glib.h> can be included directly."
#endif
-Index: glib-2.32.0/glib/deprecated/gcache.h
-===================================================================
---- glib-2.32.0.orig/glib/deprecated/gcache.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/deprecated/gcache.h 2012-03-30 23:44:13.669365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/deprecated/gcompletion.h
-===================================================================
---- glib-2.32.0.orig/glib/deprecated/gcompletion.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/deprecated/gcompletion.h 2012-03-30 23:44:13.669365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/deprecated/grel.h
-===================================================================
---- glib-2.32.0.orig/glib/deprecated/grel.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/deprecated/grel.h 2012-03-30 23:44:13.669365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/deprecated/gthread.h
-===================================================================
---- glib-2.32.0.orig/glib/deprecated/gthread.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/deprecated/gthread.h 2012-03-30 23:44:13.669365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/galloca.h
-===================================================================
---- glib-2.32.0.orig/glib/galloca.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/galloca.h 2012-03-30 23:44:13.669365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/garray.h
-===================================================================
---- glib-2.32.0.orig/glib/garray.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/garray.h 2012-03-30 23:44:13.669365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gasyncqueue.h
-===================================================================
---- glib-2.32.0.orig/glib/gasyncqueue.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/gasyncqueue.h 2012-03-30 23:44:13.681365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gatomic.h
-===================================================================
---- glib-2.32.0.orig/glib/gatomic.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/gatomic.h 2012-03-30 23:44:13.681365883 +0200
+Index: glib-2.32.1/glib/deprecated/gcache.h
+===================================================================
+--- glib-2.32.1.orig/glib/deprecated/gcache.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/deprecated/gcache.h 2012-04-19 21:26:45.456405526 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/deprecated/gcompletion.h
+===================================================================
+--- glib-2.32.1.orig/glib/deprecated/gcompletion.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/deprecated/gcompletion.h 2012-04-19 21:26:45.456405526 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/deprecated/grel.h
+===================================================================
+--- glib-2.32.1.orig/glib/deprecated/grel.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/deprecated/grel.h 2012-04-19 21:26:45.456405526 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/deprecated/gthread.h
+===================================================================
+--- glib-2.32.1.orig/glib/deprecated/gthread.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/deprecated/gthread.h 2012-04-19 21:26:45.456405526 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/galloca.h
+===================================================================
+--- glib-2.32.1.orig/glib/galloca.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/galloca.h 2012-04-19 21:26:45.456405526 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/garray.h
+===================================================================
+--- glib-2.32.1.orig/glib/garray.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/garray.h 2012-04-19 21:26:45.456405526 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gasyncqueue.h
+===================================================================
+--- glib-2.32.1.orig/glib/gasyncqueue.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/gasyncqueue.h 2012-04-19 21:26:45.464405526 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gatomic.h
+===================================================================
+--- glib-2.32.1.orig/glib/gatomic.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/gatomic.h 2012-04-19 21:26:45.464405526 +0200
@@ -19,7 +19,7 @@
* Author: Ryan Lortie <desrt at desrt.ca>
*/
@@ -128,36 +128,36 @@
#error "Only <glib.h> can be included directly."
#endif
-Index: glib-2.32.0/glib/gbacktrace.h
-===================================================================
---- glib-2.32.0.orig/glib/gbacktrace.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/gbacktrace.h 2012-03-30 23:44:13.681365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gbase64.h
-===================================================================
---- glib-2.32.0.orig/glib/gbase64.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/gbase64.h 2012-03-30 23:44:13.681365883 +0200
-@@ -18,7 +18,7 @@
- * Boston, MA 02111-1307, USA.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gbitlock.h
-===================================================================
---- glib-2.32.0.orig/glib/gbitlock.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/gbitlock.h 2012-03-30 23:44:13.681365883 +0200
+Index: glib-2.32.1/glib/gbacktrace.h
+===================================================================
+--- glib-2.32.1.orig/glib/gbacktrace.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/gbacktrace.h 2012-04-19 21:26:45.464405526 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gbase64.h
+===================================================================
+--- glib-2.32.1.orig/glib/gbase64.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/gbase64.h 2012-04-19 21:26:45.464405526 +0200
+@@ -18,7 +18,7 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gbitlock.h
+===================================================================
+--- glib-2.32.1.orig/glib/gbitlock.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/gbitlock.h 2012-04-19 21:26:45.464405526 +0200
@@ -25,7 +25,7 @@
#include <glib/gtypes.h>
@@ -167,10 +167,10 @@
#error "Only <glib.h> can be included directly."
#endif
-Index: glib-2.32.0/glib/gbookmarkfile.h
-===================================================================
---- glib-2.32.0.orig/glib/gbookmarkfile.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/gbookmarkfile.h 2012-03-30 23:44:13.681365883 +0200
+Index: glib-2.32.1/glib/gbookmarkfile.h
+===================================================================
+--- glib-2.32.1.orig/glib/gbookmarkfile.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/gbookmarkfile.h 2012-04-19 21:26:45.464405526 +0200
@@ -17,7 +17,7 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
*/
@@ -180,62 +180,62 @@
#error "Only <glib.h> can be included directly."
#endif
-Index: glib-2.32.0/glib/gchecksum.h
-===================================================================
---- glib-2.32.0.orig/glib/gchecksum.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/gchecksum.h 2012-03-30 23:44:13.685365883 +0200
-@@ -18,7 +18,7 @@
- * Boston, MA 02111-1307, USA.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gconvert.h
-===================================================================
---- glib-2.32.0.orig/glib/gconvert.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/gconvert.h 2012-03-30 23:44:13.685365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gdataset.h
-===================================================================
---- glib-2.32.0.orig/glib/gdataset.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/gdataset.h 2012-03-30 23:44:13.685365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gdate.h
-===================================================================
---- glib-2.32.0.orig/glib/gdate.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/gdate.h 2012-03-30 23:44:13.685365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gdatetime.h
-===================================================================
---- glib-2.32.0.orig/glib/gdatetime.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/gdatetime.h 2012-03-30 23:44:13.685365883 +0200
+Index: glib-2.32.1/glib/gchecksum.h
+===================================================================
+--- glib-2.32.1.orig/glib/gchecksum.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/gchecksum.h 2012-04-19 21:26:45.464405526 +0200
+@@ -18,7 +18,7 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gconvert.h
+===================================================================
+--- glib-2.32.1.orig/glib/gconvert.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/gconvert.h 2012-04-19 21:26:45.468405526 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gdataset.h
+===================================================================
+--- glib-2.32.1.orig/glib/gdataset.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/gdataset.h 2012-04-19 21:26:45.468405526 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gdate.h
+===================================================================
+--- glib-2.32.1.orig/glib/gdate.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/gdate.h 2012-04-19 21:26:45.468405526 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gdatetime.h
+===================================================================
+--- glib-2.32.1.orig/glib/gdatetime.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/gdatetime.h 2012-04-19 21:26:45.468405526 +0200
@@ -23,7 +23,7 @@
* Ryan Lortie <desrt at desrt.ca>
*/
@@ -245,10 +245,10 @@
#error "Only <glib.h> can be included directly."
#endif
-Index: glib-2.32.0/glib/gdir.h
-===================================================================
---- glib-2.32.0.orig/glib/gdir.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/gdir.h 2012-03-30 23:44:13.685365883 +0200
+Index: glib-2.32.1/glib/gdir.h
+===================================================================
+--- glib-2.32.1.orig/glib/gdir.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/gdir.h 2012-04-19 21:26:45.468405526 +0200
@@ -21,7 +21,7 @@
* Boston, MA 02111-1307, USA.
*/
@@ -258,10 +258,10 @@
#error "Only <glib.h> can be included directly."
#endif
-Index: glib-2.32.0/glib/gerror.h
-===================================================================
---- glib-2.32.0.orig/glib/gerror.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/gerror.h 2012-03-30 23:44:13.685365883 +0200
+Index: glib-2.32.1/glib/gerror.h
+===================================================================
+--- glib-2.32.1.orig/glib/gerror.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/gerror.h 2012-04-19 21:26:45.468405526 +0200
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
@@ -271,10 +271,10 @@
#error "Only <glib.h> can be included directly."
#endif
-Index: glib-2.32.0/glib/gfileutils.h
-===================================================================
---- glib-2.32.0.orig/glib/gfileutils.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/gfileutils.h 2012-03-30 23:44:13.685365883 +0200
+Index: glib-2.32.1/glib/gfileutils.h
+===================================================================
+--- glib-2.32.1.orig/glib/gfileutils.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/gfileutils.h 2012-04-19 21:26:45.468405526 +0200
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
@@ -284,62 +284,62 @@
#error "Only <glib.h> can be included directly."
#endif
-Index: glib-2.32.0/glib/ghash.h
-===================================================================
---- glib-2.32.0.orig/glib/ghash.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/ghash.h 2012-03-30 23:44:13.685365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/ghmac.h
-===================================================================
---- glib-2.32.0.orig/glib/ghmac.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/ghmac.h 2012-03-30 23:44:13.685365883 +0200
-@@ -18,7 +18,7 @@
- * Boston, MA 02111-1307, USA.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/ghook.h
-===================================================================
---- glib-2.32.0.orig/glib/ghook.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/ghook.h 2012-03-30 23:44:13.685365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/giochannel.h
-===================================================================
---- glib-2.32.0.orig/glib/giochannel.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/giochannel.h 2012-03-30 23:44:13.685365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gkeyfile.h
-===================================================================
---- glib-2.32.0.orig/glib/gkeyfile.h 2012-03-30 23:44:12.041365941 +0200
-+++ glib-2.32.0/glib/gkeyfile.h 2012-03-30 23:44:13.685365883 +0200
+Index: glib-2.32.1/glib/ghash.h
+===================================================================
+--- glib-2.32.1.orig/glib/ghash.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/ghash.h 2012-04-19 21:26:45.468405526 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/ghmac.h
+===================================================================
+--- glib-2.32.1.orig/glib/ghmac.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/ghmac.h 2012-04-19 21:26:45.472405525 +0200
+@@ -18,7 +18,7 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/ghook.h
+===================================================================
+--- glib-2.32.1.orig/glib/ghook.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/ghook.h 2012-04-19 21:26:45.472405525 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/giochannel.h
+===================================================================
+--- glib-2.32.1.orig/glib/giochannel.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/giochannel.h 2012-04-19 21:26:45.472405525 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gkeyfile.h
+===================================================================
+--- glib-2.32.1.orig/glib/gkeyfile.h 2012-04-19 21:26:43.648405542 +0200
++++ glib-2.32.1/glib/gkeyfile.h 2012-04-19 21:26:45.472405525 +0200
@@ -20,7 +20,7 @@
* Boston, MA 02111-1307, USA.
*/
@@ -349,23 +349,23 @@
#error "Only <glib.h> can be included directly."
#endif
-Index: glib-2.32.0/glib/glist.h
-===================================================================
---- glib-2.32.0.orig/glib/glist.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/glist.h 2012-03-30 23:44:13.685365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gmacros.h
-===================================================================
---- glib-2.32.0.orig/glib/gmacros.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/gmacros.h 2012-03-30 23:44:13.685365883 +0200
+Index: glib-2.32.1/glib/glist.h
+===================================================================
+--- glib-2.32.1.orig/glib/glist.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/glist.h 2012-04-19 21:26:45.472405525 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gmacros.h
+===================================================================
+--- glib-2.32.1.orig/glib/gmacros.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/gmacros.h 2012-04-19 21:26:45.472405525 +0200
@@ -28,7 +28,7 @@
* not refer to variables from glibconfig.h
*/
@@ -375,10 +375,10 @@
#error "Only <glib.h> can be included directly."
#endif
-Index: glib-2.32.0/glib/gmain.h
-===================================================================
---- glib-2.32.0.orig/glib/gmain.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/gmain.h 2012-03-30 23:44:13.689365883 +0200
+Index: glib-2.32.1/glib/gmain.h
+===================================================================
+--- glib-2.32.1.orig/glib/gmain.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/gmain.h 2012-04-19 21:26:45.472405525 +0200
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
@@ -388,10 +388,10 @@
#error "Only <glib.h> can be included directly."
#endif
-Index: glib-2.32.0/glib/gmappedfile.h
-===================================================================
---- glib-2.32.0.orig/glib/gmappedfile.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/gmappedfile.h 2012-03-30 23:44:13.689365883 +0200
+Index: glib-2.32.1/glib/gmappedfile.h
+===================================================================
+--- glib-2.32.1.orig/glib/gmappedfile.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/gmappedfile.h 2012-04-19 21:26:45.476405524 +0200
@@ -19,7 +19,7 @@
* Boston, MA 02111-1307, USA.
*/
@@ -401,10 +401,10 @@
#error "Only <glib.h> can be included directly."
#endif
-Index: glib-2.32.0/glib/gmarkup.h
-===================================================================
---- glib-2.32.0.orig/glib/gmarkup.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/gmarkup.h 2012-03-30 23:44:13.689365883 +0200
+Index: glib-2.32.1/glib/gmarkup.h
+===================================================================
+--- glib-2.32.1.orig/glib/gmarkup.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/gmarkup.h 2012-04-19 21:26:45.476405524 +0200
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
@@ -414,62 +414,62 @@
#error "Only <glib.h> can be included directly."
#endif
-Index: glib-2.32.0/glib/gmem.h
-===================================================================
---- glib-2.32.0.orig/glib/gmem.h 2012-03-12 01:42:41.000000000 +0100
-+++ glib-2.32.0/glib/gmem.h 2012-03-30 23:44:13.689365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gmessages.h
-===================================================================
---- glib-2.32.0.orig/glib/gmessages.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gmessages.h 2012-03-30 23:44:13.689365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gnode.h
-===================================================================
---- glib-2.32.0.orig/glib/gnode.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gnode.h 2012-03-30 23:44:13.689365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/goption.h
-===================================================================
---- glib-2.32.0.orig/glib/goption.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/goption.h 2012-03-30 23:44:13.689365883 +0200
-@@ -18,7 +18,7 @@
- * Boston, MA 02111-1307, USA.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gpattern.h
-===================================================================
---- glib-2.32.0.orig/glib/gpattern.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gpattern.h 2012-03-30 23:44:13.689365883 +0200
+Index: glib-2.32.1/glib/gmem.h
+===================================================================
+--- glib-2.32.1.orig/glib/gmem.h 2012-03-12 01:42:41.000000000 +0100
++++ glib-2.32.1/glib/gmem.h 2012-04-19 21:26:45.476405524 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gmessages.h
+===================================================================
+--- glib-2.32.1.orig/glib/gmessages.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gmessages.h 2012-04-19 21:26:45.476405524 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gnode.h
+===================================================================
+--- glib-2.32.1.orig/glib/gnode.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gnode.h 2012-04-19 21:26:45.476405524 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/goption.h
+===================================================================
+--- glib-2.32.1.orig/glib/goption.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/goption.h 2012-04-19 21:26:45.476405524 +0200
+@@ -18,7 +18,7 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gpattern.h
+===================================================================
+--- glib-2.32.1.orig/glib/gpattern.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gpattern.h 2012-04-19 21:26:45.480405524 +0200
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
@@ -479,75 +479,75 @@
#error "Only <glib.h> can be included directly."
#endif
-Index: glib-2.32.0/glib/gprimes.h
-===================================================================
---- glib-2.32.0.orig/glib/gprimes.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gprimes.h 2012-03-30 23:44:13.689365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gqsort.h
-===================================================================
---- glib-2.32.0.orig/glib/gqsort.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gqsort.h 2012-03-30 23:44:13.689365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gquark.h
-===================================================================
---- glib-2.32.0.orig/glib/gquark.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gquark.h 2012-03-30 23:44:13.689365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gqueue.h
-===================================================================
---- glib-2.32.0.orig/glib/gqueue.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gqueue.h 2012-03-30 23:44:13.689365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/grand.h
-===================================================================
---- glib-2.32.0.orig/glib/grand.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/grand.h 2012-03-30 23:44:13.689365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gregex.h
-===================================================================
---- glib-2.32.0.orig/glib/gregex.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gregex.h 2012-03-30 23:44:13.689365883 +0200
+Index: glib-2.32.1/glib/gprimes.h
+===================================================================
+--- glib-2.32.1.orig/glib/gprimes.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gprimes.h 2012-04-19 21:26:45.480405524 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gqsort.h
+===================================================================
+--- glib-2.32.1.orig/glib/gqsort.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gqsort.h 2012-04-19 21:26:45.480405524 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gquark.h
+===================================================================
+--- glib-2.32.1.orig/glib/gquark.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gquark.h 2012-04-19 21:26:45.480405524 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gqueue.h
+===================================================================
+--- glib-2.32.1.orig/glib/gqueue.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gqueue.h 2012-04-19 21:26:45.480405524 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/grand.h
+===================================================================
+--- glib-2.32.1.orig/glib/grand.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/grand.h 2012-04-19 21:26:45.480405524 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gregex.h
+===================================================================
+--- glib-2.32.1.orig/glib/gregex.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gregex.h 2012-04-19 21:26:45.480405524 +0200
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
@@ -557,49 +557,49 @@
#error "Only <glib.h> can be included directly."
#endif
-Index: glib-2.32.0/glib/gscanner.h
-===================================================================
---- glib-2.32.0.orig/glib/gscanner.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gscanner.h 2012-03-30 23:44:13.689365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gsequence.h
-===================================================================
---- glib-2.32.0.orig/glib/gsequence.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gsequence.h 2012-03-30 23:44:13.689365883 +0200
-@@ -18,7 +18,7 @@
- * Boston, MA 02111-1307, USA.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gshell.h
-===================================================================
---- glib-2.32.0.orig/glib/gshell.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gshell.h 2012-03-30 23:44:13.689365883 +0200
-@@ -18,7 +18,7 @@
- * Boston, MA 02111-1307, USA.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gslice.h
-===================================================================
---- glib-2.32.0.orig/glib/gslice.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gslice.h 2012-03-30 23:44:13.689365883 +0200
+Index: glib-2.32.1/glib/gscanner.h
+===================================================================
+--- glib-2.32.1.orig/glib/gscanner.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gscanner.h 2012-04-19 21:26:45.484405524 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gsequence.h
+===================================================================
+--- glib-2.32.1.orig/glib/gsequence.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gsequence.h 2012-04-19 21:26:45.484405524 +0200
+@@ -18,7 +18,7 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gshell.h
+===================================================================
+--- glib-2.32.1.orig/glib/gshell.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gshell.h 2012-04-19 21:26:45.484405524 +0200
+@@ -18,7 +18,7 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gslice.h
+===================================================================
+--- glib-2.32.1.orig/glib/gslice.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gslice.h 2012-04-19 21:26:45.484405524 +0200
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
@@ -609,127 +609,127 @@
#error "Only <glib.h> can be included directly."
#endif
-Index: glib-2.32.0/glib/gslist.h
-===================================================================
---- glib-2.32.0.orig/glib/gslist.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gslist.h 2012-03-30 23:44:13.693365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gspawn.h
-===================================================================
---- glib-2.32.0.orig/glib/gspawn.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gspawn.h 2012-03-30 23:44:13.693365883 +0200
-@@ -18,7 +18,7 @@
- * Boston, MA 02111-1307, USA.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gstrfuncs.h
-===================================================================
---- glib-2.32.0.orig/glib/gstrfuncs.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gstrfuncs.h 2012-03-30 23:44:13.693365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gstringchunk.h
-===================================================================
---- glib-2.32.0.orig/glib/gstringchunk.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gstringchunk.h 2012-03-30 23:44:13.693365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gstring.h
-===================================================================
---- glib-2.32.0.orig/glib/gstring.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gstring.h 2012-03-30 23:44:13.693365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gtestutils.h
-===================================================================
---- glib-2.32.0.orig/glib/gtestutils.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gtestutils.h 2012-03-30 23:44:13.693365883 +0200
-@@ -18,7 +18,7 @@
- * Boston, MA 02111-1307, USA.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gthread.h
-===================================================================
---- glib-2.32.0.orig/glib/gthread.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gthread.h 2012-03-30 23:44:13.693365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gthreadpool.h
-===================================================================
---- glib-2.32.0.orig/glib/gthreadpool.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gthreadpool.h 2012-03-30 23:44:13.693365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gtimer.h
-===================================================================
---- glib-2.32.0.orig/glib/gtimer.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gtimer.h 2012-03-30 23:44:13.693365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gtimezone.h
-===================================================================
---- glib-2.32.0.orig/glib/gtimezone.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gtimezone.h 2012-03-30 23:44:13.693365883 +0200
+Index: glib-2.32.1/glib/gslist.h
+===================================================================
+--- glib-2.32.1.orig/glib/gslist.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gslist.h 2012-04-19 21:26:45.484405524 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gspawn.h
+===================================================================
+--- glib-2.32.1.orig/glib/gspawn.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gspawn.h 2012-04-19 21:26:45.484405524 +0200
+@@ -18,7 +18,7 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gstrfuncs.h
+===================================================================
+--- glib-2.32.1.orig/glib/gstrfuncs.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gstrfuncs.h 2012-04-19 21:26:45.484405524 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gstringchunk.h
+===================================================================
+--- glib-2.32.1.orig/glib/gstringchunk.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gstringchunk.h 2012-04-19 21:26:45.484405524 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gstring.h
+===================================================================
+--- glib-2.32.1.orig/glib/gstring.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gstring.h 2012-04-19 21:26:45.488405524 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gtestutils.h
+===================================================================
+--- glib-2.32.1.orig/glib/gtestutils.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gtestutils.h 2012-04-19 21:26:45.488405524 +0200
+@@ -18,7 +18,7 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gthread.h
+===================================================================
+--- glib-2.32.1.orig/glib/gthread.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gthread.h 2012-04-19 21:26:45.488405524 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gthreadpool.h
+===================================================================
+--- glib-2.32.1.orig/glib/gthreadpool.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gthreadpool.h 2012-04-19 21:26:45.488405524 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gtimer.h
+===================================================================
+--- glib-2.32.1.orig/glib/gtimer.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gtimer.h 2012-04-19 21:26:45.488405524 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gtimezone.h
+===================================================================
+--- glib-2.32.1.orig/glib/gtimezone.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gtimezone.h 2012-04-19 21:26:45.488405524 +0200
@@ -19,7 +19,7 @@
* Author: Ryan Lortie <desrt at desrt.ca>
*/
@@ -739,36 +739,36 @@
#error "Only <glib.h> can be included directly."
#endif
-Index: glib-2.32.0/glib/gtree.h
-===================================================================
---- glib-2.32.0.orig/glib/gtree.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gtree.h 2012-03-30 23:44:13.693365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gtypes.h
-===================================================================
---- glib-2.32.0.orig/glib/gtypes.h 2012-03-18 04:27:18.000000000 +0100
-+++ glib-2.32.0/glib/gtypes.h 2012-03-30 23:44:13.693365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gunicode.h
-===================================================================
---- glib-2.32.0.orig/glib/gunicode.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gunicode.h 2012-03-30 23:44:13.693365883 +0200
+Index: glib-2.32.1/glib/gtree.h
+===================================================================
+--- glib-2.32.1.orig/glib/gtree.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gtree.h 2012-04-19 21:26:45.488405524 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gtypes.h
+===================================================================
+--- glib-2.32.1.orig/glib/gtypes.h 2012-03-18 04:27:18.000000000 +0100
++++ glib-2.32.1/glib/gtypes.h 2012-04-19 21:26:45.488405524 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gunicode.h
+===================================================================
+--- glib-2.32.1.orig/glib/gunicode.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gunicode.h 2012-04-19 21:26:45.488405524 +0200
@@ -19,7 +19,7 @@
* Boston, MA 02111-1307, USA.
*/
@@ -778,10 +778,10 @@
#error "Only <glib.h> can be included directly."
#endif
-Index: glib-2.32.0/glib/gurifuncs.h
-===================================================================
---- glib-2.32.0.orig/glib/gurifuncs.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gurifuncs.h 2012-03-30 23:44:13.693365883 +0200
+Index: glib-2.32.1/glib/gurifuncs.h
+===================================================================
+--- glib-2.32.1.orig/glib/gurifuncs.h 2012-04-07 01:15:44.000000000 +0200
++++ glib-2.32.1/glib/gurifuncs.h 2012-04-19 21:26:45.488405524 +0200
@@ -20,7 +20,7 @@
* Author: Alexander Larsson <alexl at redhat.com>
*/
@@ -791,23 +791,23 @@
#error "Only <glib.h> can be included directly."
#endif
-Index: glib-2.32.0/glib/gutils.h
-===================================================================
---- glib-2.32.0.orig/glib/gutils.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gutils.h 2012-03-30 23:44:13.693365883 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gvariant.h
-===================================================================
---- glib-2.32.0.orig/glib/gvariant.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gvariant.h 2012-03-30 23:44:13.697365882 +0200
+Index: glib-2.32.1/glib/gutils.h
+===================================================================
+--- glib-2.32.1.orig/glib/gutils.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gutils.h 2012-04-19 21:26:45.488405524 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gvariant.h
+===================================================================
+--- glib-2.32.1.orig/glib/gvariant.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gvariant.h 2012-04-19 21:26:45.488405524 +0200
@@ -20,7 +20,7 @@
* Author: Ryan Lortie <desrt at desrt.ca>
*/
@@ -817,10 +817,10 @@
#error "Only <glib.h> can be included directly."
#endif
-Index: glib-2.32.0/glib/gvarianttype.h
-===================================================================
---- glib-2.32.0.orig/glib/gvarianttype.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gvarianttype.h 2012-03-30 23:44:13.697365882 +0200
+Index: glib-2.32.1/glib/gvarianttype.h
+===================================================================
+--- glib-2.32.1.orig/glib/gvarianttype.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gvarianttype.h 2012-04-19 21:26:45.488405524 +0200
@@ -20,7 +20,7 @@
* Author: Ryan Lortie <desrt at desrt.ca>
*/
@@ -830,29 +830,29 @@
#error "Only <glib.h> can be included directly."
#endif
-Index: glib-2.32.0/glib/gwin32.h
-===================================================================
---- glib-2.32.0.orig/glib/gwin32.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gwin32.h 2012-03-30 23:44:13.697365882 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
-Index: glib-2.32.0/glib/gversionmacros.h
-===================================================================
---- glib-2.32.0.orig/glib/gversionmacros.h 2012-03-12 01:42:42.000000000 +0100
-+++ glib-2.32.0/glib/gversionmacros.h 2012-03-30 23:45:47.521362564 +0200
-@@ -24,7 +24,7 @@
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
--#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
- #error "Only <glib.h> can be included directly."
- #endif
-
+Index: glib-2.32.1/glib/gwin32.h
+===================================================================
+--- glib-2.32.1.orig/glib/gwin32.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gwin32.h 2012-04-19 21:26:45.492405524 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
+Index: glib-2.32.1/glib/gversionmacros.h
+===================================================================
+--- glib-2.32.1.orig/glib/gversionmacros.h 2012-03-12 01:42:42.000000000 +0100
++++ glib-2.32.1/glib/gversionmacros.h 2012-04-19 21:26:45.492405524 +0200
+@@ -24,7 +24,7 @@
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+ #error "Only <glib.h> can be included directly."
+ #endif
+
Modified: desktop/unstable/glib2.0/debian/patches/61_glib-compile-binaries-path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/61_glib-compile-binaries-path.patch?rev=34613&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/61_glib-compile-binaries-path.patch [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/61_glib-compile-binaries-path.patch [utf-8] Thu Apr 26 21:02:03 2012
@@ -4,18 +4,18 @@
Author: Sebastian Dröge <slomo at debian.org>
Origin: vendor
-Index: glib-2.31.20/gio-2.0.pc.in
+Index: glib2.0-2.32.1/gio-2.0.pc.in
===================================================================
---- glib-2.31.20.orig/gio-2.0.pc.in 2012-03-05 02:35:47.000000000 +0100
-+++ glib-2.31.20/gio-2.0.pc.in 2012-03-05 19:21:12.614147505 +0100
+--- glib2.0-2.32.1.orig/gio-2.0.pc.in 2012-04-16 08:36:01.973345422 +0200
++++ glib2.0-2.32.1/gio-2.0.pc.in 2012-04-16 08:36:11.005345860 +0200
@@ -4,8 +4,8 @@
includedir=@includedir@
giomoduledir=@GIO_MODULE_DIR@
--glib_compile_schemas=@bindir@/glib-compile-schemas at EXEEXT@
--glib_compile_resources=@bindir@/glib-compile-resources at EXEEXT@
-+glib_compile_schemas=@libdir@/glib-2.0/glib-compile-schemas at EXEEXT@
-+glib_compile_resources=@libdir@/glib-2.0/glib-compile-resources at EXEEXT@
- gdbus_codegen=@bindir@/gdbus-codegen
+-glib_compile_schemas=glib-compile-schemas
+-glib_compile_resources=glib-compile-resources
++glib_compile_schemas=@libdir@/glib-2.0/glib-compile-schemas
++glib_compile_resources=@libdir@/glib-2.0/glib-compile-resources
+ gdbus_codegen=gdbus-codegen
Name: GIO
More information about the pkg-gnome-commits
mailing list