The following commit has been merged in the master-3.8 branch: commit 424d5d0fee50ad4989faf4ccd385ff7a6afdc0d5 Author: Niels Thykier <ni...@thykier.net> Date: Wed May 9 16:10:03 2012 +0200
Refactor d/rules Signed-off-by: Niels Thykier <ni...@thykier.net> diff --git a/debian/changelog b/debian/changelog index e1671f9..f1c9e29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ swt-gtk (3.8.0~m7-1) UNRELEASED; urgency=low [ Niels Thykier ] * Merge make_linux.mak patches and pass LDFLAGS + CPPFLAGS to the underlying build system. + * Refactored the d/rules files. -- Jakub Adam <jakub.a...@ktknet.cz> Mon, 07 May 2012 00:05:05 +0200 diff --git a/debian/control b/debian/control index 0efbd1a..78ec030 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,8 @@ DM-Upload-Allowed: yes Build-Depends: default-jdk, gcj-native-helper, libgnomeui-dev, libxtst-dev, libxcb-render-util0-dev, libxt-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, - fastjar, cdbs, patchutils, debhelper (>= 9), libwebkitgtk-dev, javahelper + fastjar, cdbs, patchutils, debhelper (>= 9), libwebkitgtk-dev, javahelper, + dpkg-dev (>= 1.16.1~) Standards-Version: 3.9.3 Vcs-Git: git://git.debian.org/git/pkg-java/swt-gtk.git Vcs-Browser: http://git.debian.org/?p=pkg-java/swt-gtk.git diff --git a/debian/rules b/debian/rules index 5910e32..675b09c 100755 --- a/debian/rules +++ b/debian/rules @@ -1,39 +1,34 @@ #!/usr/bin/make -f -alpha := 64 -amd64 := 64 -ia64 := 64 -ppc64 := 64 -DEB_PATCHDIRS = debian/patches/common debian/patches/$($(DEB_HOST_ARCH_CPU)) +DPKG_EXPORT_BUILDFLAGS:=1 +include /usr/share/dpkg/buildflags.mk -DEB_DH_MAKESHLIBS_ARGS_ALL := -Xjni +include /usr/share/cdbs/1/class/makefile.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/javahelper.mk -AWT_LIB_DIR = $(DEB_HOST_ARCH_CPU) +include /usr/share/javahelper/java-vars.mk -ifneq (,$(filter $(DEB_HOST_ARCH), lpia)) - AWT_LIB_DIR = i386 -endif +include /usr/share/gcj/debian_defaults -ifneq (,$(filter $(DEB_HOST_ARCH), powerpc)) - AWT_LIB_DIR = ppc -endif +DEB_PATCHDIRS = debian/patches/common +BITS = $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS) -ifneq (,$(filter $(DEB_HOST_ARCH), powerpcspe)) - AWT_LIB_DIR = ppc +ifeq (64,$(BITS)) +DEB_PATCHDIES += debian/patches/64 endif -ifneq (,$(filter $(DEB_HOST_ARCH), sh4)) - AWT_LIB_DIR = sh -endif +# Must be included after setting DEB_PATCHDIRS +include /usr/share/cdbs/1/rules/simple-patchsys.mk -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 -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/javahelper.mk -include /usr/share/gcj/debian_defaults +DEB_DH_MAKESHLIBS_ARGS_ALL := -Xjni + +AWT_LIB_DIR := $(JAVA_ARCH) + +export AWT_LIB_PATH=/usr/lib/jvm/default-java/jre/lib/$(AWT_LIB_DIR) + makecleanbuildir::patch -- Debian packaging for swt-gtk. _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits