r33763 - in /desktop/unstable/glib2.0/debian: changelog patches/03_revert_git_single_include_error.patch patches/series
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Fri Mar 30 06:25:02 UTC 2012
Author: biebl
Date: Fri Mar 30 06:25:01 2012
New Revision: 33763
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33763
Log:
Revert upstream commit for now which makes single includes mandatory as
the list of affected packages is still a bit too long.
Added:
desktop/unstable/glib2.0/debian/patches/03_revert_git_single_include_error.patch
Modified:
desktop/unstable/glib2.0/debian/changelog
desktop/unstable/glib2.0/debian/patches/series
Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=33763&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog [utf-8] Fri Mar 30 06:25:01 2012
@@ -1,8 +1,10 @@
glib2.0 (2.32.0-2) UNRELEASED; urgency=low
* Upload to unstable.
-
- -- Michael Biebl <biebl at debian.org> Fri, 30 Mar 2012 08:15:39 +0200
+ * Revert upstream commit for now which makes single includes mandatory as
+ the list of affected packages is still a bit too long.
+
+ -- Michael Biebl <biebl at debian.org> Fri, 30 Mar 2012 08:22:13 +0200
glib2.0 (2.32.0-1) experimental; urgency=low
Added: 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=33763&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/03_revert_git_single_include_error.patch (added)
+++ desktop/unstable/glib2.0/debian/patches/03_revert_git_single_include_error.patch [utf-8] Fri Mar 30 06:25:01 2012
@@ -1,0 +1,845 @@
+Index: glib-2.32.0/configure.ac
+===================================================================
+--- glib-2.32.0.orig/configure.ac 2012-03-30 08:17:48.652937403 +0200
++++ glib-2.32.0/configure.ac 2012-03-30 08:17:55.740937153 +0200
+@@ -514,6 +514,8 @@
+ esac
+ fi
+
++CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES"
++
+ 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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/deprecated/gallocator.h 2012-03-30 08:17:55.744937152 +0200
+@@ -15,7 +15,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/deprecated/gcache.h
+===================================================================
+--- glib-2.32.0.orig/glib/deprecated/gcache.h 2012-03-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/deprecated/gcache.h 2012-03-30 08:17:55.744937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/deprecated/gcompletion.h 2012-03-30 08:17:55.744937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/deprecated/grel.h 2012-03-30 08:17:55.744937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/deprecated/gthread.h 2012-03-30 08:17:55.744937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/galloca.h 2012-03-30 08:17:55.744937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/garray.h 2012-03-30 08:17:55.744937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gasyncqueue.h 2012-03-30 08:17:55.748937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gatomic.h 2012-03-30 08:17:55.748937152 +0200
+@@ -19,7 +19,7 @@
+ * Author: Ryan Lortie <desrt at desrt.ca>
+ */
+
+-#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/gbacktrace.h
+===================================================================
+--- glib-2.32.0.orig/glib/gbacktrace.h 2012-03-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gbacktrace.h 2012-03-30 08:17:55.748937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gbase64.h 2012-03-30 08:17:55.748937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gbitlock.h 2012-03-30 08:17:55.748937152 +0200
+@@ -25,7 +25,7 @@
+
+ #include <glib/gtypes.h>
+
+-#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/gbookmarkfile.h
+===================================================================
+--- glib-2.32.0.orig/glib/gbookmarkfile.h 2012-03-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gbookmarkfile.h 2012-03-30 08:17:55.748937152 +0200
+@@ -17,7 +17,7 @@
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ */
+
+-#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/gchecksum.h
+===================================================================
+--- glib-2.32.0.orig/glib/gchecksum.h 2012-03-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gchecksum.h 2012-03-30 08:17:55.748937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gconvert.h 2012-03-30 08:17:55.748937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gdataset.h 2012-03-30 08:17:55.752937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gdate.h 2012-03-30 08:17:55.752937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gdatetime.h 2012-03-30 08:17:55.752937152 +0200
+@@ -23,7 +23,7 @@
+ * Ryan Lortie <desrt at desrt.ca>
+ */
+
+-#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/gdir.h
+===================================================================
+--- glib-2.32.0.orig/glib/gdir.h 2012-03-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gdir.h 2012-03-30 08:17:55.752937152 +0200
+@@ -21,7 +21,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/gerror.h
+===================================================================
+--- glib-2.32.0.orig/glib/gerror.h 2012-03-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gerror.h 2012-03-30 08:17:55.752937152 +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/gfileutils.h
+===================================================================
+--- glib-2.32.0.orig/glib/gfileutils.h 2012-03-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gfileutils.h 2012-03-30 08:17:55.752937152 +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/ghash.h
+===================================================================
+--- glib-2.32.0.orig/glib/ghash.h 2012-03-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/ghash.h 2012-03-30 08:17:55.752937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/ghmac.h 2012-03-30 08:17:55.752937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/ghook.h 2012-03-30 08:17:55.756937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/giochannel.h 2012-03-30 08:17:55.756937152 +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 08:17:52.320937273 +0200
++++ glib-2.32.0/glib/gkeyfile.h 2012-03-30 08:17:55.756937152 +0200
+@@ -20,7 +20,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/glist.h
+===================================================================
+--- glib-2.32.0.orig/glib/glist.h 2012-03-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/glist.h 2012-03-30 08:17:55.756937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gmacros.h 2012-03-30 08:17:55.756937152 +0200
+@@ -28,7 +28,7 @@
+ * not refer to variables from glibconfig.h
+ */
+
+-#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/gmain.h
+===================================================================
+--- glib-2.32.0.orig/glib/gmain.h 2012-03-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gmain.h 2012-03-30 08:17:55.756937152 +0200
+@@ -17,7 +17,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/gmappedfile.h
+===================================================================
+--- glib-2.32.0.orig/glib/gmappedfile.h 2012-03-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gmappedfile.h 2012-03-30 08:17:55.756937152 +0200
+@@ -19,7 +19,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/gmarkup.h
+===================================================================
+--- glib-2.32.0.orig/glib/gmarkup.h 2012-03-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gmarkup.h 2012-03-30 08:17:55.760937152 +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/gmem.h
+===================================================================
+--- glib-2.32.0.orig/glib/gmem.h 2012-03-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gmem.h 2012-03-30 08:17:55.760937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gmessages.h 2012-03-30 08:17:55.760937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gnode.h 2012-03-30 08:17:55.760937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/goption.h 2012-03-30 08:17:55.760937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gpattern.h 2012-03-30 08:17:55.760937152 +0200
+@@ -17,7 +17,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/gprimes.h
+===================================================================
+--- glib-2.32.0.orig/glib/gprimes.h 2012-03-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gprimes.h 2012-03-30 08:17:55.760937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gqsort.h 2012-03-30 08:17:55.760937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gquark.h 2012-03-30 08:17:55.764937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gqueue.h 2012-03-30 08:17:55.764937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/grand.h 2012-03-30 08:17:55.764937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gregex.h 2012-03-30 08:17:55.764937152 +0200
+@@ -19,7 +19,7 @@
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 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/gscanner.h
+===================================================================
+--- glib-2.32.0.orig/glib/gscanner.h 2012-03-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gscanner.h 2012-03-30 08:17:55.764937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gsequence.h 2012-03-30 08:17:55.764937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gshell.h 2012-03-30 08:17:55.764937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gslice.h 2012-03-30 08:17:55.764937152 +0200
+@@ -17,7 +17,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/gslist.h
+===================================================================
+--- glib-2.32.0.orig/glib/gslist.h 2012-03-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gslist.h 2012-03-30 08:17:55.764937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gspawn.h 2012-03-30 08:17:55.764937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gstrfuncs.h 2012-03-30 08:17:55.764937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gstringchunk.h 2012-03-30 08:17:55.764937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gstring.h 2012-03-30 08:17:55.764937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gtestutils.h 2012-03-30 08:17:55.764937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gthread.h 2012-03-30 08:17:55.764937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gthreadpool.h 2012-03-30 08:17:55.764937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gtimer.h 2012-03-30 08:17:55.768937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gtimezone.h 2012-03-30 08:17:55.768937152 +0200
+@@ -19,7 +19,7 @@
+ * Author: Ryan Lortie <desrt at desrt.ca>
+ */
+
+-#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/gtree.h
+===================================================================
+--- glib-2.32.0.orig/glib/gtree.h 2012-03-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gtree.h 2012-03-30 08:17:55.768937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gtypes.h 2012-03-30 08:17:55.768937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gunicode.h 2012-03-30 08:17:55.768937152 +0200
+@@ -19,7 +19,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/gurifuncs.h
+===================================================================
+--- glib-2.32.0.orig/glib/gurifuncs.h 2012-03-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gurifuncs.h 2012-03-30 08:17:55.768937152 +0200
+@@ -20,7 +20,7 @@
+ * Author: Alexander Larsson <alexl at redhat.com>
+ */
+
+-#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/gutils.h
+===================================================================
+--- glib-2.32.0.orig/glib/gutils.h 2012-03-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gutils.h 2012-03-30 08:17:55.768937152 +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-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gvariant.h 2012-03-30 08:17:55.768937152 +0200
+@@ -20,7 +20,7 @@
+ * Author: Ryan Lortie <desrt at desrt.ca>
+ */
+
+-#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/gvarianttype.h
+===================================================================
+--- glib-2.32.0.orig/glib/gvarianttype.h 2012-03-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gvarianttype.h 2012-03-30 08:17:55.768937152 +0200
+@@ -20,7 +20,7 @@
+ * Author: Ryan Lortie <desrt at desrt.ca>
+ */
+
+-#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/gwin32.h
+===================================================================
+--- glib-2.32.0.orig/glib/gwin32.h 2012-03-30 08:17:48.652937403 +0200
++++ glib-2.32.0/glib/gwin32.h 2012-03-30 08:17:55.768937152 +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/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/series?rev=33763&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/series [utf-8] Fri Mar 30 06:25:01 2012
@@ -1,7 +1,8 @@
0001-Run-gio-tests-with-a-dbus-session.patch
01_gettext-desktopfiles.patch
02_gettext-desktopfiles-ubuntu.patch
+03_revert_git_single_include_error.patch
04_homedir_env.patch
-10-add-a-forgotten-include-guard.patch
+#10-add-a-forgotten-include-guard.patch
61_glib-compile-binaries-path.patch
90-gio-modules-multiarch-compat.patch
More information about the pkg-gnome-commits
mailing list