[SCM] Debian packaging for swt-gtk. branch, master, updated. debian/3.8.2-2-1-g3179818

[Jakub Adam]

The following commit has been merged in the master branch:
commit 3179818994f0a747014d3ffe8753e61f71b1dacd
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Thu Jun 27 10:13:55 2013 +0200

    Fix FTBFS with glib 2.35

diff --git a/debian/changelog b/debian/changelog
index 38e47ed..1bb6673 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+swt-gtk (3.8.2-3) UNRELEASED; urgency=low
+
+  * Fix FTBFS with glib 2.35 (Closes: #710649).
+
+ -- Jakub Adam <jakub.adam at ktknet.cz>  Wed, 26 Jun 2013 14:49:25 +0200
+
 swt-gtk (3.8.2-2) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 5bbd58a..8013b87 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Adrian Perez <blackxored at debian.org>,
            Jakub Adam <jakub.adam at ktknet.cz>,
            Niels Thykier <niels at thykier.net>
 Build-Depends: default-jdk, gcj-native-helper, libgnomeui-dev, libxtst-dev,
- libxcb-render-util0-dev, libxt-dev,
+ libxcb-render-util0-dev, libxt-dev, libglib2.0-dev (>= 2.35),
  libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,
  fastjar, cdbs, patchutils, debhelper (>= 9), libwebkitgtk-dev, javahelper,
  dpkg-dev (>= 1.16.1~)
diff --git a/debian/patches/common/fix-glib-2.35-compatibility.patch b/debian/patches/common/fix-glib-2.35-compatibility.patch
new file mode 100644
index 0000000..d41a4df
--- /dev/null
+++ b/debian/patches/common/fix-glib-2.35-compatibility.patch
@@ -0,0 +1,45 @@
+From c973b9b9be568ebbce618985bc5ee440babf8ab1 Mon Sep 17 00:00:00 2001
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Thu, 27 Jun 2013 10:16:49 +0200
+Subject: [PATCH 1/2] fix-glib-2.35-compatibility
+
+g_thread_init() and g_thread_supported() are deprecated and don't
+have to be used anymore.
+---
+ os.c |    9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/os.c b/os.c
+index a3085a1..1e550cc 100644
+--- a/os.c
++++ b/os.c
+@@ -4444,9 +4444,9 @@ fail:
+ JNIEXPORT void JNICALL OS_NATIVE(_1g_1thread_1init)
+ 	(JNIEnv *env, jclass that, jintLong arg0)
+ {
+-	OS_NATIVE_ENTER(env, that, _1g_1thread_1init_FUNC);
++	/*OS_NATIVE_ENTER(env, that, _1g_1thread_1init_FUNC);
+ 	g_thread_init((GThreadFunctions *)arg0);
+-	OS_NATIVE_EXIT(env, that, _1g_1thread_1init_FUNC);
++	OS_NATIVE_EXIT(env, that, _1g_1thread_1init_FUNC);*/
+ }
+ #endif
+ 
+@@ -4454,11 +4454,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1thread_1init)
+ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1thread_1supported)
+ 	(JNIEnv *env, jclass that)
+ {
+-	jboolean rc = 0;
++	/*jboolean rc = 0;
+ 	OS_NATIVE_ENTER(env, that, _1g_1thread_1supported_FUNC);
+ 	rc = (jboolean)g_thread_supported();
+ 	OS_NATIVE_EXIT(env, that, _1g_1thread_1supported_FUNC);
+-	return rc;
++	return rc;*/
++	return 1;
+ }
+ #endif
+ 
+-- 
+1.7.10.4
+

-- 
Debian packaging for swt-gtk.