[swt-gtk] 03/03: Don't build libswt-gtk-4-java-gcj

[Jakub Adam]

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

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

commit 57341efc47e48e66896558e3471d1af6131a8c06
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Mon Mar 31 18:55:36 2014 +0200

    Don't build libswt-gtk-4-java-gcj
---
 debian/changelog |  1 +
 debian/control   | 20 ++------------------
 debian/rules     |  7 -------
 3 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 22ebd52..b824691 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ swt4-gtk (4.3.2-1) UNRELEASED; urgency=medium
   * Removed d/patches/fix-glib-2.35-compatibility.patch.
   * Removed java-config.
   * Removed unnecessary hardening-no-fortify-functions lintian overrides.
+  * Don't build libswt-gtk-4-java-gcj.
 
   [ Ángel Guzmán Maeso ]
   * Update-version-for-package-binaries
diff --git a/debian/control b/debian/control
index fc2e838..836a447 100644
--- a/debian/control
+++ b/debian/control
@@ -6,10 +6,10 @@ Uploaders: Adrian Perez <blackxored at debian.org>,
            أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.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,
+Build-Depends: default-jdk, libgnomeui-dev, libxtst-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,
+ fastjar, cdbs, debhelper (>= 9), libwebkitgtk-dev, javahelper,
  dpkg-dev (>= 1.16.1~)
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-java/swt-gtk.git
@@ -78,19 +78,3 @@ Description: Standard Widget Toolkit for GTK+ WebKit JNI library
  and fast access to native controls and user interface facilities.
  .
  This package includes the WebKit JNI libraries.
-
-Package: libswt-gtk-4-java-gcj
-Architecture: any
-Section: java
-Depends: ${misc:Depends}, ${shlibs:Depends},
-	  libswt-cairo-gtk-4-jni (= ${binary:Version}),
-	  libswt-glx-gtk-4-jni (= ${binary:Version}),
-	  libswt-gnome-gtk-4-jni (= ${binary:Version}),
-	  libswt-gtk-4-jni (= ${binary:Version}),
-	  libswt-webkit-gtk-4-jni (= ${binary:Version})
-Description: Standard Widget Toolkit for GTK+ native library
- The Standard Widget Toolkit (SWT) is a fast and rich Java GUI toolkit.
- For platforms with existing SWT implementations it provides efficient, portable
- and fast access to native controls and user interface facilities.
- .
- This package contains a native library built using gcj.
diff --git a/debian/rules b/debian/rules
index 69f48aa..4b8bf0e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,8 +11,6 @@ include /usr/share/cdbs/1/class/javahelper.mk
 
 include /usr/share/javahelper/java-vars.mk
 
-include /usr/share/gcj/debian_defaults
-
 BITS = $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
 
 DEB_DH_MAKESHLIBS_ARGS_ALL := -Xjni
@@ -26,11 +24,6 @@ makecleanbuildir::patch
 
 DEB_MAKE_MAKEFILE = debian/Makefile
 
-ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
-common-binary-post-install-arch::
-	dh_nativejava -a
-endif
-
 post-patches:: patch_64_bit
 
 clean:: unpatch_64_bit

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