[SCM] Debian packaging for swt-gtk. branch, master, updated. debian/3.5.1-2-4-g90002e6

[Ahmed El-Mahmoudy]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Debian packaging for swt-gtk.".

The branch, master has been updated
       via  90002e6b9f329e7f0cd2939deaecd74faecfb388 (commit)
       via  a78c9d81d43acdb33b0cf6034ed105f953c055e4 (commit)
       via  cb4a4b05e11de34d5b51033e9ed1fff832c8e01d (commit)
       via  b987b6aa0b57c9a3bd6431b2b0967dfaecf3f18b (commit)
      from  2656d7d8f0f8f577422f268ca966f38649115548 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 90002e6b9f329e7f0cd2939deaecd74faecfb388
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Fri Aug 6 18:02:32 2010 +0300

    Bumped Standards-Version to 3.9.1

commit a78c9d81d43acdb33b0cf6034ed105f953c055e4
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Fri Aug 6 17:59:47 2010 +0300

    debian/rules: Fix from Ubuntu: Don't set DEB_MAKE_INVOKE and pass
    AWT_LIB_PATH to Makefile. This used to be overwritten by
    makefile-vars.mk in Lucid anyway, and so it was ignored. It is not
    overwritten now, and causes the package to FTBFS. Instead, export
    AWT_LIB_PATH before calling the makefile (Closes: #577360)

commit cb4a4b05e11de34d5b51033e9ed1fff832c8e01d
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Fri Aug 6 17:55:41 2010 +0300

    debian/rules: call dh_xulrunner to add proper  xulrunner dependency to
    libswt-mozilla-gtk-<version>-jni (Closes: #587643)

commit b987b6aa0b57c9a3bd6431b2b0967dfaecf3f18b
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Wed Jun 30 05:57:17 2010 +0300

    Replace default-jdk-builddep with default-jdk, gcj-native-helper in B-D

-----------------------------------------------------------------------

Summary of changes:
 debian/control |    4 ++--
 debian/rules   |    6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 1783a26..37b0c44 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,11 @@ Section: libs
 Priority: optional
 Maintainer: Adrian Perez <adrianperez.deb at gmail.com>
 DM-Upload-Allowed: yes
-Build-Depends: default-jdk-builddep, libgnomeui-dev, libxtst-dev,
+Build-Depends: default-jdk, gcj-native-helper, libgnomeui-dev, libxtst-dev,
  xulrunner-dev, libxcb-render-util0-dev, libxt-dev,
  libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,
  fastjar, cdbs, patchutils, debhelper (>> 7.0)
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/pkg-java/swt-gtk.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/swt-gtk.git
 Homepage: http://www.eclipse.org/swt/
diff --git a/debian/rules b/debian/rules
index 9dd3333..90bed7b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,8 +18,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH), powerpc))
 	AWT_LIB_DIR = ppc
 endif 
 
-DEB_MAKE_INVOKE += -DAWT_LIB_PATH=/usr/lib/jvm/default-java/jre/lib/\
-	$(AWT_LIB_DIR)
+export AWT_LIB_PATH=/usr/lib/jvm/default-java/jre/lib/$(AWT_LIB_DIR)
 
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/makefile.mk
@@ -35,3 +34,6 @@ ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
 common-binary-post-install-arch::
 	dh_nativejava -a
 endif
+
+common-binary-predeb-arch::
+	dh_xulrunner


hooks/post-receive
-- 
Debian packaging for swt-gtk.