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

Wed Apr 11 11:07:46 UTC 2012

The following commit has been merged in the master branch:
commit f36ecab56734d4faab9f058a6d9ebf50226d9d3b
Author: Christopher James Halse Rogers <raof at ubuntu.com>
Date:   Fri Mar 2 18:30:17 2012 +1100

    Imported Debian patch 2.12.10-2ubuntu3

diff --git a/debian/changelog b/debian/changelog
index 5db7e6b..a47ccc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,37 @@
-gtk-sharp2 (2.12.10-3) unstable; urgency=low
+gtk-sharp2 (2.12.10-2ubuntu3) precise; urgency=low
 
-  * No-change rebuild for CLR 4.0 transition 
+  * debian/patches/04_fix_glib_2.31_threading.dpatch:
+    + GLib 2.31 always has threading support, always initialises it, and has
+      dropped some deprecated functions.  Update glibsharpglue and 
+      Thread.cs to match.  Fixes FTBFS (LP: #911125, LP: #935518)
+  * debian/control:
+    + Add versioned dependency on glib > 2.31 to libglib2.0-cil, as we depend
+      on the threading behaviour of those GLibs.
+  * debian/control:
+  * debian/rules:
+    + Add dh_autoreconf to update build system for patch
+  * debian/patches/99_ltmain_as_needed:
+    + Drop; dh_autoreconf does this better
+
+ -- Christopher James Halse Rogers <raof at ubuntu.com>  Fri, 02 Mar 2012 18:30:17 +1100
+
+gtk-sharp2 (2.12.10-2ubuntu2) precise; urgency=low
+
+  * debian/patches/03_resize_grips.dpatch:
+    - drop that patch to disable resize grip, that was needed because of 
+      Ubuntu had a backport of a gtk3 feature but it has been decided to
+      drop that distro specific change before the lts (lp: #944312)
+
+ -- Sebastien Bacher <seb128 at ubuntu.com>  Thu, 01 Mar 2012 21:20:58 +0100
 
- -- Iain Lane <laney at debian.org>  Mon, 23 Jan 2012 19:57:58 +0000
+gtk-sharp2 (2.12.10-2ubuntu1) oneiric; urgency=low
+
+  * Merge with Debian, remaining changes:
+    + debian/patches/03_resize_grips.dpatch: Add GtkWindow.HasResizeGrip
+      property.
+    + debian/rules: Bump API version to match addition of HasResizeGrip API.
+
+ -- Iain Lane <laney at debian.org>  Tue, 12 Jul 2011 09:36:59 +0100
 
 gtk-sharp2 (2.12.10-2) unstable; urgency=low
 
@@ -14,6 +43,17 @@ gtk-sharp2 (2.12.10-2) unstable; urgency=low
 
  -- Julian Taylor <jtaylor.debian at googlemail.com>  Mon, 11 Jul 2011 23:11:57 +0100
 
+gtk-sharp2 (2.12.10-1ubuntu1) natty; urgency=low
+
+  [ Cody Russell ]
+  * debian/patches/03_resize_grips.dpatch: Add GtkWindow.HasResizeGrip
+    property. (LP: #702642)
+
+  [ Christopher James Halse Rogers ]
+  * debian/rules: Bump API version to match addition of HasResizeGrip API.
+
+ -- Christopher James Halse Rogers <raof at ubuntu.com>  Mon, 31 Jan 2011 09:55:15 +1100
+
 gtk-sharp2 (2.12.10-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 7ef1b06..3513de0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,10 @@
 Source: gtk-sharp2
 Section: libs
 Priority: optional
-Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
 Uploaders: Mirco Bauer <meebey at debian.org>, Sebastian Dröge <slomo at debian.org>
-Build-Depends: debhelper (>= 5), cli-common-dev (>= 0.5.7), dpatch, mono-devel (>= 2.4.2.3), monodoc-base (>= 1.0), pkg-config, libglib2.0-dev (>= 2.12.0), libgtk2.0-dev (>= 2.12.0), libpango1.0-dev, libglade2-dev (>= 2.3.6), libmono-cairo2.0-cil
+Build-Depends: debhelper (>= 5), cli-common-dev (>= 0.5.7), dpatch, mono-devel (>= 2.4.2.3), monodoc-base (>= 1.0), pkg-config, libglib2.0-dev (>= 2.12.0), libgtk2.0-dev (>= 2.12.0), libpango1.0-dev, libglade2-dev (>= 2.3.6), libmono-cairo2.0-cil, dh-autoreconf,
 Standards-Version: 3.8.4
 Homepage: http://www.mono-project.com/GtkSharp
 Vcs-Git: git://git.debian.org/git/pkg-cli-libs/packages/gtk-sharp2.git
@@ -48,7 +49,7 @@ Description: C source parser and C# code generator for GObject based APIs
 Package: libglib2.0-cil
 Architecture: any
 Suggests: monodoc-gtk2.0-manual
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}
+Depends: libglib2.0-0 (>= 2.31), ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}
 Replaces: gtk-sharp2-gapi (<< 2.10.0-1)
 Description: CLI binding for the GLib utility library 2.12
  This package provides the glib-sharp assembly that allows CLI (.NET) programs
diff --git a/debian/patches/00list b/debian/patches/00list
index 9d6b0b7..be75e38 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
 01_dllmaps.dpatch
 02_pcfiles.dpatch
-99_ltmain_as-needed
+04_fix_glib_2.31_threading.dpatch
+
diff --git a/debian/patches/01_dllmaps.dpatch b/debian/patches/01_dllmaps.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/02_pcfiles.dpatch b/debian/patches/02_pcfiles.dpatch
old mode 100755
new mode 100644
diff --git a/debian/patches/04_fix_glib_2.31_threading.dpatch b/debian/patches/04_fix_glib_2.31_threading.dpatch
new file mode 100644
index 0000000..ae43540
--- /dev/null
+++ b/debian/patches/04_fix_glib_2.31_threading.dpatch
@@ -0,0 +1,87 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_fix_glib_2.31_threading.dpatch by Christopher James Halse Rogers <raof at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix build against glib >= 2.31
+## DP: GLib's threading support is included and initialised by default
+## DP: so Thread.Init () is now a no-op, and Thread.Supported is always true
+##
+## DP: glib removed the associated symbols.
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gtk-sharp2-2.12.10~/glib/Thread.cs gtk-sharp2-2.12.10/glib/Thread.cs
+--- gtk-sharp2-2.12.10~/glib/Thread.cs	2009-01-31 06:51:10.000000000 +1100
++++ gtk-sharp2-2.12.10/glib/Thread.cs	2012-03-02 11:36:06.583379301 +1100
+@@ -28,21 +28,15 @@
+ 	{
+ 		private Thread () {}
+ 		
+-		[DllImport("libgthread-2.0-0.dll")]
+-		static extern void g_thread_init (IntPtr i);
+-
+ 		public static void Init ()
+ 		{
+-			g_thread_init (IntPtr.Zero);
++			// GLib automatically inits threads in 2.31 and above
+ 		}
+ 
+-		[DllImport("glibsharpglue-2")]
+-		static extern bool glibsharp_g_thread_supported ();
+-
+ 		public static bool Supported
+ 		{
+ 			get {
+-				return glibsharp_g_thread_supported ();
++				return true;
+ 			}
+ 		}
+ 	}
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gtk-sharp2-2.12.10~/glib/glue/Makefile.am gtk-sharp2-2.12.10/glib/glue/Makefile.am
+--- gtk-sharp2-2.12.10~/glib/glue/Makefile.am	2009-01-08 03:54:06.000000000 +1100
++++ gtk-sharp2-2.12.10/glib/glue/Makefile.am	2012-03-02 11:35:13.059378013 +1100
+@@ -13,8 +13,7 @@
+ 	type.c			\
+ 	unichar.c		\
+ 	value.c			\
+-	valuearray.c	\
+-	thread.c
++	valuearray.c
+ 
+ # Adding a new glue file?
+ 
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gtk-sharp2-2.12.10~/glib/glue/thread.c gtk-sharp2-2.12.10/glib/glue/thread.c
+--- gtk-sharp2-2.12.10~/glib/glue/thread.c	2009-01-08 03:54:06.000000000 +1100
++++ gtk-sharp2-2.12.10/glib/glue/thread.c	1970-01-01 11:00:00.000000000 +1100
+@@ -1,32 +0,0 @@
+-/* thread.c : glue functions for GLib.Thread
+- *
+- * Author: Alp Toker  <alp at atoker.com>
+- *
+- * Copyright (c) 2005 Alp Toker
+- *
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of version 2 of the Lesser GNU General 
+- * Public License as published by the Free Software Foundation.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public
+- * License along with this program; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+- * Boston, MA 02111-1307, USA.
+- */
+-
+-
+-#include <glib/gthread.h>
+-
+-gboolean glibsharp_g_thread_supported (void);
+-
+-gboolean
+-glibsharp_g_thread_supported ()
+-{
+-	return g_thread_supported ();
+-}
+-
diff --git a/debian/patches/99_ltmain_as-needed.dpatch b/debian/patches/99_ltmain_as-needed.dpatch
deleted file mode 100644
index 30cdd39..0000000
--- a/debian/patches/99_ltmain_as-needed.dpatch
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-#
-## DP: fixes the behaviour of LDFLAGS="-Wl,--as-needed",
-## DP: useful to remove unneeded dependencies.
-
- at DPATCH@
-
---- gtk-sharp/ltmain.sh.old	2008-02-29 06:36:13.000000000 +0100
-+++ gtk-sharp/ltmain.sh	2008-02-29 06:36:48.000000000 +0100
-@@ -1794,6 +1794,11 @@
- 	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
- 	;;
- 
-+      -Wl,--as-needed)
-+	deplibs="$deplibs $arg"
-+	continue
-+	;;
-+
-       -Wl,*)
- 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
- 	arg=
-@@ -2134,6 +2139,15 @@
- 	lib=
- 	found=no
- 	case $deplib in
-+	-Wl,--as-needed)
-+	  if test "$linkmode,$pass" = "prog,link"; then
-+	    compile_deplibs="$deplib $compile_deplibs"
-+	    finalize_deplibs="$deplib $finalize_deplibs"
-+	  else
-+	    deplibs="$deplib $deplibs"
-+	  fi
-+	  continue
-+	  ;;
- 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- 	  if test "$linkmode,$pass" = "prog,link"; then
- 	    compile_deplibs="$deplib $compile_deplibs"
diff --git a/debian/rules b/debian/rules
index 2fbe254..3a55d8b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ include /usr/share/dpatch/dpatch.make
 CFLAGS ?= -O2 -Wall -g
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-API_VERSION = 2.12.10
+API_VERSION = 2.12.10-1ubuntu1
 
 UPVERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2 | sed 's,-.*,,')
 NEXT_UPVERSION = $(shell perl -e '$$_=pop; s/(\d+)$$/$$1+1/e; print' $(UPVERSION))
@@ -35,6 +35,7 @@ get-orig-source:
 config: config-stamp
 config-stamp: patch-stamp
 	dh_testdir
+	dh_autoreconf --as-needed
 	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --prefix=/usr RUNTIME=/usr/bin/cli CSC=/usr/bin/mono-csc MONO_CAIRO_LIBS=-r:Mono.Cairo MONO_CAIRO_CFLAGS=" "
 	touch config-stamp
 
@@ -58,6 +59,7 @@ clean: unpatch
 	[ ! -f Makefile ] || $(MAKE) distclean RUNTIME=/usr/bin/cli
 	rm -f config-stamp build-indep-stamp build-arch-stamp
 	rm -rf $(MONO_SHARED_DIR)/.wapi
+	dh_autoreconf_clean
 	dh_clean
 
 install:

-- 
gtk-sharp2

