[swt-gtk] 06/13: Refreshed the patches

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master-4.3
in repository swt-gtk.

commit fb11e17ac48931734f09322b462cda4d3fecd7bb
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Oct 18 01:41:56 2017 +0200

    Refreshed the patches
---
 debian/changelog                       |  4 +++-
 debian/patches/01-make_linux.patch     | 16 ++++------------
 debian/patches/search-usr-lib-jni.diff | 10 +++++-----
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f1e3fba..3416c24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-swt4-gtk (4.6.0-3) UNRELEASED; urgency=medium
+swt4-gtk (4.6.1-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
   * Switch to debhelper level 10
   * Modified debian/watch to use the git mode
   * Standards-Version updated to 4.1.1
diff --git a/debian/patches/01-make_linux.patch b/debian/patches/01-make_linux.patch
index aee15f7..05fe991 100644
--- a/debian/patches/01-make_linux.patch
+++ b/debian/patches/01-make_linux.patch
@@ -1,15 +1,7 @@
-From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Date: Mon, 27 Jul 2015 18:12:00 +0200
-Subject: make_linux
-
----
- make_linux.mak | 31 ++++++++++++++++++-------------
- 1 file changed, 18 insertions(+), 13 deletions(-)
-
-diff --git a/make_linux.mak b/make_linux.mak
-index 9d3aa87..340208e 100644
---- a/make_linux.mak
-+++ b/make_linux.mak
+diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
+index 9d3aa87..b88f2e8 100644
+--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak	
++++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak	
 @@ -75,6 +75,7 @@ GLXLIBS = -lGL -lGLU -lm
  # Uncomment for Native Stats tool
  #NATIVE_STATS = -DNATIVE_STATS
diff --git a/debian/patches/search-usr-lib-jni.diff b/debian/patches/search-usr-lib-jni.diff
index 407b685..6c92024 100644
--- a/debian/patches/search-usr-lib-jni.diff
+++ b/debian/patches/search-usr-lib-jni.diff
@@ -8,11 +8,11 @@ This allows Sun/Oracle JRE to find the libraries.
  org/eclipse/swt/internal/Library.java |    4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/org/eclipse/swt/internal/Library.java b/org/eclipse/swt/internal/Library.java
-index d76b39a..12374a2 100644
---- a/org/eclipse/swt/internal/Library.java
-+++ b/org/eclipse/swt/internal/Library.java
-@@ -302,6 +302,10 @@ public static void loadLibrary (String name, boolean mapName) {
+diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java b/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java
+index b982f3f..248bda6 100644
+--- a/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java	
++++ b/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java	
+@@ -298,6 +298,10 @@ public static void loadLibrary (String name, boolean mapName) {
  	if (load (libName1, message)) return;
  	if (mapName && load (libName2, message)) return;
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/swt-gtk.git