[libjogl2-java] 02/04: Transition to libswt-gtk-4-java

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository libjogl2-java.

commit 0fa0663984428a51a0616b8ad6fa80e0551e9e52
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Aug 4 11:27:08 2016 +0200

    Transition to libswt-gtk-4-java
---
 debian/changelog        | 7 +++++++
 debian/control          | 2 +-
 debian/patches/swt.diff | 2 +-
 debian/rules            | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2017610..c9f2ea3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libjogl2-java (2.3.2+dfsg-5) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Transition to libswt-gtk-4-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 04 Aug 2016 10:38:59 +0200
+
 libjogl2-java (2.3.2+dfsg-4) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 44fad2c..14b0347 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends:
  libglu1-mesa-dev,
  libgluegen2-build-java (>= 2.3.2),
  libgluegen2-rt-java (>= 2.3.2),
- libswt-gtk-3-java,
+ libswt-gtk-4-java,
  libxcursor-dev,
  libxinerama-dev,
  libxrandr-dev,
diff --git a/debian/patches/swt.diff b/debian/patches/swt.diff
index e71c2b3..b3738c5 100644
--- a/debian/patches/swt.diff
+++ b/debian/patches/swt.diff
@@ -15,7 +15,7 @@ Index: libjogl2-java/make/build-common.xml
 -        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar">
 -          <istrue value="${isLinuxARMv6}" /> <!-- FIXME JAU .. hack -->
 -        </condition>
-+        <condition property="swt.jar" value="/usr/share/java/swt.jar">
++        <condition property="swt.jar" value="/usr/share/java/swt4.jar">
 +          <istrue value="${isLinux}" />
 +	</condition>
          <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar">
diff --git a/debian/rules b/debian/rules
index c7ddce9..c4f4f9c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 JAVA_HOME            := /usr/lib/jvm/default-java/
-DEB_JARS             := ant-contrib ant-contrib-cpptasks ant-nodeps antlr ant-antlr swt
+DEB_JARS             := ant-contrib ant-contrib-cpptasks ant-nodeps antlr ant-antlr swt4
 DEB_ANT_ARGS         := -Dsetup.noCDC=true -verbose -Dcommon.gluegen.build.done=true
 DEB_ANT_CLEAN_TARGET := clean
 DEB_ANT_BUILD_TARGET := all

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