[Pkg-cli-libs-commits] [SCM] gtk-sharp2 branch, master, updated. debian/2.12.10-2ubuntu4-7-g1a8ebc7

[Iain Lane]

The following commit has been merged in the master branch:
commit 1a30776e6fff8205ec4e38eee61f602939dd4506
Author: Colin Watson <cjwatson at ubuntu.com>
Date:   Mon Apr 2 23:52:19 2012 +0100

    Imported Debian patch 2.12.10-2ubuntu4

diff --git a/debian/changelog b/debian/changelog
index a47ccc5..45457ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gtk-sharp2 (2.12.10-2ubuntu4) precise; urgency=low
+
+  * Include <glib.h> rather than individual headers (see Debian #665550).
+
+ -- Colin Watson <cjwatson at ubuntu.com>  Mon, 02 Apr 2012 23:52:19 +0100
+
 gtk-sharp2 (2.12.10-2ubuntu3) precise; urgency=low
 
   * debian/patches/04_fix_glib_2.31_threading.dpatch:
diff --git a/debian/patches/00list b/debian/patches/00list
index be75e38..6c60560 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,4 +1,5 @@
 01_dllmaps.dpatch
 02_pcfiles.dpatch
 04_fix_glib_2.31_threading.dpatch
+05_glib_single_include.dpatch
 
diff --git a/debian/patches/05_glib_single_include.dpatch b/debian/patches/05_glib_single_include.dpatch
new file mode 100644
index 0000000..b1152e5
--- /dev/null
+++ b/debian/patches/05_glib_single_include.dpatch
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_glib_single_include.dpatch by Colin Watson <cjwatson at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Include <glib.h> rather than individual headers.
+## DP: http://bugs.debian.org/665550
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gtk-sharp2-2.12.10~/glib/glue/list.c gtk-sharp2-2.12.10/glib/glue/list.c
+--- gtk-sharp2-2.12.10~/glib/glue/list.c	2009-01-07 16:54:06.000000000 +0000
++++ gtk-sharp2-2.12.10/glib/glue/list.c	2012-04-02 23:50:36.000000000 +0100
+@@ -20,7 +20,7 @@
+  */
+ 
+ 
+-#include <glib/glist.h>
++#include <glib.h>
+ 
+ /* Forward declarations */
+ gpointer gtksharp_list_get_data (GList *l);
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gtk-sharp2-2.12.10~/glib/glue/slist.c gtk-sharp2-2.12.10/glib/glue/slist.c
+--- gtk-sharp2-2.12.10~/glib/glue/slist.c	2009-01-07 16:54:06.000000000 +0000
++++ gtk-sharp2-2.12.10/glib/glue/slist.c	2012-04-02 23:50:40.000000000 +0100
+@@ -20,7 +20,7 @@
+  */
+ 
+ 
+-#include <glib/gslist.h>
++#include <glib.h>
+ 
+ /* Forward declarations */
+ gpointer gtksharp_slist_get_data (GSList *l);

-- 
gtk-sharp2