------------------------------------------------------------ revno: 595 committer: Matthias Klose <d...@debian.org> branch nick: openjdk7 timestamp: Thu 2015-09-03 14:21:27 +0200 message: * Make derivatives builds the same as the parent distro. Closes: #797662. modified: changelog rules
-- lp:~openjdk/openjdk/openjdk7 https://code.launchpad.net/~openjdk/openjdk/openjdk7 Your team Debian Java Maintainers is subscribed to branch lp:~openjdk/openjdk/openjdk7. To unsubscribe from this branch go to https://code.launchpad.net/~openjdk/openjdk/openjdk7/+edit-subscription
=== modified file 'changelog' --- changelog 2015-09-03 12:14:09 +0000 +++ changelog 2015-09-03 12:21:27 +0000 @@ -6,6 +6,7 @@ Bourg). Closes: #787159. * Re-enable the atk bridge for releases with a fixed atk bridge. Closes: #797595. + * Make derivatives builds the same as the parent distro. Closes: #797662. -- Matthias Klose <d...@ubuntu.com> Thu, 03 Sep 2015 12:47:16 +0200 === modified file 'rules' --- rules 2015-09-03 12:14:09 +0000 +++ rules 2015-09-03 12:21:27 +0000 @@ -26,6 +26,9 @@ distribution := $(shell lsb_release --id --short) distrel := $(shell lsb_release --codename --short) +derivative := $(shell if dpkg-vendor --derives-from Ubuntu; then echo Ubuntu; \ + elif dpkg-vendor --derives-from Debian; then echo Debian; \ + else echo Unknown; fi) ifeq ($(distrel),n/a) distrel := sid endif @@ -330,7 +333,7 @@ endif ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf)) -ifeq ($(distribution),Ubuntu) +ifeq ($(derivative),Ubuntu) ifneq (,$(filter $(distrel),jaunty)) OPT_CFLAGS/cppInterpreter_arm.o = -O2 -falign-functions=32 -falign-loops=8 -g0 else @@ -377,7 +380,7 @@ on_buildd := $(shell [ -f /CurrentlyBuilding -o "$$LOGNAME" = buildd ] && echo yes) -ifeq ($(distribution),Debian) +ifeq ($(distributio),Debian) with_wm = $(notdir $(firstword $(wildcard /usr/bin/metacity /usr/bin/twm))) ifneq (,$(findstring twm, $(with_wm))) with_wm_args = -f $(CURDIR)/bin/jtreg.tmwrc @@ -691,7 +694,7 @@ jdk_tools = $(filter-out $(all_jre_tools), $(all_jdk_tools)) jdk_tools_alt = $(filter-out apt java-rmi.cgi, $(jdk_tools)) -ifeq ($(distribution),Ubuntu) +ifeq ($(derivative),Ubuntu) pkg_compress = lzma else pkg_compress = bzip2 @@ -781,7 +784,7 @@ rhino_source := $(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W librhino-java) endif -pkg_ffidev = $(if $(filter $(distribution),Ubuntu),$(if $(filter $(distrel),hardy),libffi4-dev,libffi-dev),libffi-dev) +pkg_ffidev = $(if $(filter $(derivative),Ubuntu),$(if $(filter $(distrel),hardy),libffi4-dev,libffi-dev),libffi-dev) bd_zero = \ $(pkg_ffidev) [$(foreach a,$(hotspot_archs),!$(a))], @@ -891,7 +894,7 @@ # .desktop files need to be multiarch installable java_launcher = /$(basedir)/bin/java java_launcher = /usr/bin/java -ifeq ($(distribution),Ubuntu) +ifeq ($(derivative),Ubuntu) ifeq (,$(filter $(distrel),karmic jaunty intrepid hardy)) java_launcher = cautious-launcher %f /$(basedir)/bin/java java_launcher = cautious-launcher %f /usr/bin/java @@ -1567,8 +1570,8 @@ rm -f debian/*.install debian/*.links debian/*.debhelper.log lib_ext_dirs = common $(sort $(foreach arch,$(arch_map),$(firstword $(subst =,$(SPACE),$(arch))))) -ifeq ($(distribution),Ubuntu) - lib_ext_dirs := $(filter-out arm hppa m68k mips% powerpcspe s390% sh%, $(lib_ext_dirs)) +ifeq ($(derivative),Ubuntu) + lib_ext_dirs := $(filter-out arm hppa m68k mips% powerpcspe sh%, $(lib_ext_dirs)) else lib_ext_dirs := $(filter-out arm hppa lpia, $(lib_ext_dirs)) endif
__ This is the maintainer address of Debian's Java team <http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. Please use debian-j...@lists.debian.org for discussions and questions.