[SCM] Debian packaging for swt-gtk. branch, master-3.8, updated. debian/3.8.0-m6-1-9-g6e351c8
The following commit has been merged in the master-3.8 branch: commit 424d5d0fee50ad4989faf4ccd385ff7a6afdc0d5 Author: Niels Thykier Date: Wed May 9 16:10:03 2012 +0200 Refactor d/rules Signed-off-by: Niels Thykier 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 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
[SCM] Debian packaging for swt-gtk. branch, master-3.8, updated. debian/3.8.0-m6-1-9-g6e351c8
The following commit has been merged in the master-3.8 branch: commit 39ced9f0f9cb128a077c6c9d3b8549e1f9286c91 Author: Niels Thykier Date: Wed May 9 16:09:20 2012 +0200 Merge the make_linux.mak patches Signed-off-by: Niels Thykier diff --git a/debian/changelog b/debian/changelog index d1bd44c..e1671f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ swt-gtk (3.8.0~m7-1) UNRELEASED; urgency=low + [ Jakub Adam ] * New upstream release. * Updated arch64.diff patch for new upstream release. * Updated 01-as-needed.diff patch for new upstream release. + [ Niels Thykier ] + * Merge make_linux.mak patches and pass LDFLAGS + CPPFLAGS +to the underlying build system. + -- Jakub Adam Mon, 07 May 2012 00:05:05 +0200 swt-gtk (3.8.0~m6-1) experimental; urgency=low diff --git a/debian/patches/common/01-as-needed.diff b/debian/patches/common/01-as-needed.diff deleted file mode 100644 index 602c4c1..000 --- a/debian/patches/common/01-as-needed.diff +++ /dev/null @@ -1,95 +0,0 @@ -Description: Use -Wl,--as-needed when linking -Author: أحمد المحمودي (Ahmed El-Mahmoudy) -Forwarded: https://bugs.eclipse.org/bugs/show_bug.cgi?id=350346 a/make_linux.mak -+++ b/make_linux.mak -@@ -136,7 +136,7 @@ - $(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c - - $(SWTPI_LIB): $(SWTPI_OBJECTS) -- $(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS) -+ $(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) -Wl,--as-needed $(GTKLIBS) - - swt.o: swt.c swt.h - $(CC) $(CFLAGS) -c swt.c -@@ -155,7 +155,7 @@ - make_cairo: $(CAIRO_LIB) - - $(CAIRO_LIB): $(CAIRO_OBJECTS) -- $(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS) -+ $(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) -Wl,--as-needed $(CAIROLIBS) - - cairo.o: cairo.c cairo.h swt.h - $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c -@@ -171,7 +171,7 @@ - make_cde: $(CDE_LIB) - - $(CDE_LIB): $(CDE_OBJECTS) -- $(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS) -+ $(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) -Wl,--as-needed $(CDE_LIBS) - - # - # AWT lib -@@ -179,7 +179,7 @@ - make_awt:$(AWT_LIB) - - $(AWT_LIB): $(AWT_OBJECTS) -- $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) -+ $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) -Wl,--as-needed $(AWT_LIBS) - - # - # Atk lib -@@ -187,7 +187,7 @@ - make_atk: $(ATK_LIB) - - $(ATK_LIB): $(ATK_OBJECTS) -- $(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS) -+ $(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) -Wl,--as-needed $(ATKLIBS) - - atk.o: atk.c atk.h - $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c -@@ -204,7 +204,7 @@ - make_gnome: $(GNOME_LIB) - - $(GNOME_LIB): $(GNOME_OBJECTS) -- $(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS) -+ $(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) -Wl,--as-needed $(GNOMELIBS) - - gnome.o: gnome.c - $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c -@@ -221,7 +221,7 @@ - make_mozilla:$(MOZILLA_LIB) - - $(MOZILLA_LIB): $(MOZILLA_OBJECTS) -- $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS} -+ $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) -Wl,--as-needed ${MOZILLA_LIBS} - - xpcom.o: xpcom.cpp - $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp -@@ -242,7 +242,7 @@ - - $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS) - echo -e "#include\nsize_t je_malloc_usable_size_in_advance(size_t n) {\nreturn n;\n}" | gcc --shared -xc - -o libswt-xulrunner-fix.so -- $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} -+ $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) -Wl,--as-needed ${XULRUNNER_LIBS} - - xpcomxul.o: xpcom.cpp - $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp -@@ -262,7 +262,7 @@ - make_xpcominit:$(XPCOMINIT_LIB) - - $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS) -- $(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} -+ $(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) -Wl,--as-needed ${XULRUNNER_LIBS} - - xpcominit.o: xpcominit.cpp - $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp -@@ -296,7 +296,7 @@ - make_glx: $(GLX_LIB) - - $(GLX_LIB): $(GLX_OBJECTS) -- $(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS) -+ $(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) -Wl,--as-needed $(GLXLIBS) - - glx.o: glx.c - $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c diff --git a/debian/patches/common/01-make_linux.patch b/debian/patches/common/01-make_linux.patch index 3ccc2e7..8615758 100644 --- a/debian/patches/common/01-make_linux.patch +++ b/debian/patches/common/01-make_linux.patch @@ -1,7 +1,11 @@ -diff -Nur -x '*.orig' -x '*~' swt-gtk/make_linux.mak swt-gtk.new/make_linux.mak swt-gtk/make_linux.mak 2011-12-06 19:13:57.054148957 -0500 -
[SCM] Debian packaging for swt-gtk. branch, master-3.8, updated. debian/3.8.0-m6-1-9-g6e351c8
The following commit has been merged in the master-3.8 branch: commit 6e351c84b195e45d99a4b944f605d16a3ebb8ebf Author: Niels Thykier Date: Wed May 9 17:01:07 2012 +0200 Set dist to experimental Signed-off-by: Niels Thykier diff --git a/debian/changelog b/debian/changelog index f1c9e29..279ca7c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -swt-gtk (3.8.0~m7-1) UNRELEASED; urgency=low +swt-gtk (3.8.0~m7-1) experimental; urgency=low [ Jakub Adam ] * New upstream release. @@ -10,7 +10,7 @@ swt-gtk (3.8.0~m7-1) UNRELEASED; urgency=low to the underlying build system. * Refactored the d/rules files. - -- Jakub Adam Mon, 07 May 2012 00:05:05 +0200 + -- Jakub Adam Wed, 09 May 2012 17:00:58 +0200 swt-gtk (3.8.0~m6-1) experimental; urgency=low -- 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
[SCM] Debian packaging for swt-gtk. branch, master-3.8, updated. debian/3.8.0-m6-1-9-g6e351c8
The following commit has been merged in the master-3.8 branch: commit 7e20fc1877381f329baa5a83d9c3397d962be760 Author: Niels Thykier Date: Wed May 9 16:22:53 2012 +0200 Merge CFLAGS and CPPFLAGS Signed-off-by: Niels Thykier diff --git a/debian/patches/common/01-make_linux.patch b/debian/patches/common/01-make_linux.patch index 8615758..9c75468 100644 --- a/debian/patches/common/01-make_linux.patch +++ b/debian/patches/common/01-make_linux.patch @@ -30,7 +30,7 @@ index c8cc080..998cfcd 100644 GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o -CFLAGS = -O -Wall \ -+override CFLAGS += $(CPPFLAGS) \ ++override CFLAGS = \ -DSWT_VERSION=$(SWT_VERSION) \ $(NATIVE_STATS) \ -DLINUX -DGTK \ @@ -39,7 +39,7 @@ index c8cc080..998cfcd 100644 -fPIC \ ${SWT_PTR_CFLAGS} -LFLAGS = -shared -fPIC ${SWT_LFLAGS} -+override LFLAGS += -shared -fPIC ${SWT_LFLAGS} ++LFLAGS += $(DEB_LDFLAGS) -shared -fPIC ${SWT_LFLAGS} +NO_STRIP=1 ifndef NO_STRIP @@ -77,7 +77,7 @@ index c8cc080..998cfcd 100644 $(AWT_LIB): $(AWT_OBJECTS) - $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) -+ $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) -Wl,--as-needed $(AWT_LIBS) ++ $(CC) $(AWT_LFLAGS) $(DEB_LDFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) -Wl,--as-needed $(AWT_LIBS) # # Atk lib diff --git a/debian/rules b/debian/rules index 675b09c..5577aef 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,9 @@ #!/usr/bin/make -f -DPKG_EXPORT_BUILDFLAGS:=1 +export DEB_CFLAGS_MAINT_APPEND=-fPIC include /usr/share/dpkg/buildflags.mk +CFLAGS+=$(CPPFLAGS) +export DEB_LDFLAGS := $(LDFLAGS) include /usr/share/cdbs/1/class/makefile.mk include /usr/share/cdbs/1/rules/debhelper.mk -- 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