r33500 - in /desktop/experimental/glib2.0/debian: changelog patches/10-add-a-forgotten-include-guard.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun Mar 25 11:27:43 2012
New Revision: 33500

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33500
Log:
Add single-include guard for gbytes.h. Patch cherry-picked from
upstream Git.

Added:
    desktop/experimental/glib2.0/debian/patches/10-add-a-forgotten-include-guard.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/series

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=33500&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Sun Mar 25 11:27:43 2012
@@ -1,8 +1,10 @@
 glib2.0 (2.32.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
-
- -- Michael Biebl <biebl at debian.org>  Sun, 25 Mar 2012 13:24:41 +0200
+  * Add single-include guard for gbytes.h. Patch cherry-picked from
+    upstream Git.
+
+ -- Michael Biebl <biebl at debian.org>  Sun, 25 Mar 2012 13:25:30 +0200
 
 glib2.0 (2.31.22-1) experimental; urgency=low
 

Added: desktop/experimental/glib2.0/debian/patches/10-add-a-forgotten-include-guard.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/10-add-a-forgotten-include-guard.patch?rev=33500&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/10-add-a-forgotten-include-guard.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/10-add-a-forgotten-include-guard.patch [utf-8] Sun Mar 25 11:27:43 2012
@@ -1,0 +1,28 @@
+From e927df7b7ab089f5e7de452a509130c06e13e4f9 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Sat, 24 Mar 2012 23:00:15 -0400
+Subject: [PATCH] Add a forgotten include guard
+
+gbytes.h was missing the single-include guard.
+---
+ glib/gbytes.h |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/glib/gbytes.h b/glib/gbytes.h
+index a120e21..de3c8f8 100644
+--- a/glib/gbytes.h
++++ b/glib/gbytes.h
+@@ -21,6 +21,10 @@
+  *         Stef Walter <stefw at collabora.co.uk>
+  */
+ 
++#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
++#error "Only <glib.h> can be included directly."
++#endif
++
+ #ifndef __G_BYTES_H__
+ #define __G_BYTES_H__
+ 
+-- 
+1.7.9.1
+

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=33500&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Sun Mar 25 11:27:43 2012
@@ -2,5 +2,6 @@
 01_gettext-desktopfiles.patch
 02_gettext-desktopfiles-ubuntu.patch
 04_homedir_env.patch
+10-add-a-forgotten-include-guard.patch
 61_glib-compile-binaries-path.patch
 90-gio-modules-multiarch-compat.patch