From e91751724cf51f751938cc96ca2babd89ddca704 Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Sun, 13 Sep 2009 19:26:16 +0200 Subject: - rename ${xpi:Depends} to ${xpi:Recommends} and keep ${xpi:Depends} for backwards compatibility - update src/xpi.mk --- debian/changelog | 5 ++++- src/xpi.mk | 23 ++++++++++++++--------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index d2e4759..6f0ecba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,8 +21,11 @@ mozilla-devscripts (0.16) UNRELEASED; urgency=low and add lsb-release as dependency - update src/xpi.mk - update debian/control + - rename ${xpi:Depends} to ${xpi:Recommends} and keep ${xpi:Depends} for + backwards compatibility + - update src/xpi.mk - -- Benjamin Drung Sun, 13 Sep 2009 18:29:26 +0200 + -- Benjamin Drung Sun, 13 Sep 2009 19:23:09 +0200 mozilla-devscripts (0.15) unstable; urgency=low diff --git a/src/xpi.mk b/src/xpi.mk index 1a52866..5d6b881 100644 --- a/src/xpi.mk +++ b/src/xpi.mk @@ -71,7 +71,7 @@ # your code to MOZ_XPI_MOZILLA_EXTRA_DIRS # -# data for XPI_DEPENDS/CHECK_VERSION magic - start/end of life of binary packages +# data for XPI_RECOMMENDS/CHECK_VERSION magic - start/end of life of binary packages abrowser-3.0_sol := 3.0a8 abrowser-3.0_eol := 3.0.* abrowser-3.5_sol := 3.5b4 @@ -121,7 +121,7 @@ xulrunner-1.9.2_eol := 1.9.2.* xulrunner-1.9.3_sol := 1.9.3a1pre xulrunner-1.9.3_eol := 1.9.3.* -# data for XPI_DEPENDS/CHECK_VERSION magic - targetApplication packages +# data for XPI_RECOMMENDS/CHECK_VERSION magic - targetApplication packages packages_{ec8030f7-c20a-464f-9b0e-13a3a9e97384} := abrowser-3.0 abrowser-3.5 abrowser-3.6 abrowser-3.7 firefox-3.0 firefox-3.5 firefox-3.6 firefox-3.7 iceweasel packages_{3550f703-e582-4d05-9a08-453d09bdfdc6} := icedove thunderbird thunderbird-3.0 packages_{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} := iceape seamonkey @@ -133,7 +133,7 @@ packages_toolkit@mozilla.org := xulrunner-1.9 xulrunner-1.9.1 xulrunner-1.9.2 xu Debian_packages := iceweasel icedove iceape conkeror xulrunner-1.9 xulrunner-1.9.1 Ubuntu_packages := abrowser-3.5 firefox-3.0 firefox-3.5 thunderbird seamonkey conkeror prism xulrunner-1.9 xulrunner-1.9.1 -# data for XPI_DEPENDS/CHECK_VERSION magic - targetApplication min-/maxVersions +# data for XPI_RECOMMENDS/CHECK_VERSION magic - targetApplication min-/maxVersions # call parameters_ # 1- target app id # 2- maxVersion | minVersion @@ -154,15 +154,15 @@ MOZ_XPI_BUILD_COMMAND ?= med-xpi-pack $(CURDIR) $(MOZ_EXTENSION_PKG).xpi; MOZ_XPI_DOCUMENTED_LICENSE_FILES ?= $(strip $(shell find * -iname copying -o -iname licen[cs]e -o -iname licen[cs]e.txt)) -ALL_XPI_DEPENDS = $(sort $(foreach id,$(call XPI_TARGET_EMIDs,$(TEMPDIR)), \ +ALL_XPI_RECOMMENDS = $(sort $(foreach id,$(call XPI_TARGET_EMIDs,$(TEMPDIR)), \ $(foreach package,$(packages_$(id)),$(call CHECK_VERSION,$(id),$(package))))) # list only packages, which are available in the distribution DISTRIBUTION := $(shell lsb_release -si) ifneq ($($(DISTRIBUTION)_packages),) -XPI_DEPENDS = $(filter $($(DISTRIBUTION)_packages),$(ALL_XPI_DEPENDS)) +XPI_RECOMMENDS = $(filter $($(DISTRIBUTION)_packages),$(ALL_XPI_RECOMMENDS)) else -XPI_DEPENDS = ALL_XPI_DEPENDS +XPI_RECOMMENDS = ALL_XPI_RECOMMENDS endif TEMPDIR := temp-xpi-unpacked @@ -219,12 +219,17 @@ install-%-stamp: unzip-%-stamp dh_install -p$(MOZ_EXTENSION_PKG) $(wildcard $(TEMPDIR)/*) /usr/share/$(MOZ_EXTENSION_PKG) touch $@ -xpi-depends-stamp: unzip-$(XPI_BASE_FILE)-stamp +xpi-recommends-stamp: unzip-$(XPI_BASE_FILE)-stamp + if test -f debian/$(MOZ_EXTENSION_PKG).substvars; then sed -i '/^xpi:Recommends=/d' debian/$(MOZ_EXTENSION_PKG).substvars; fi + echo "xpi:Recommends=$(XPI_RECOMMENDS)" | sed "s/ / | /g" >> debian/$(MOZ_EXTENSION_PKG).substvars +ifneq ($(shell grep '$${xpi:Depends}' debian/control),) + @echo 'xpi.mk: $${xpi:Depends} is deprecated, please use $${xpi:Recommends} instead.' if test -f debian/$(MOZ_EXTENSION_PKG).substvars; then sed -i '/^xpi:Depends=/d' debian/$(MOZ_EXTENSION_PKG).substvars; fi - echo "xpi:Depends=$(XPI_DEPENDS)" | sed "s/ / | /g" >> debian/$(MOZ_EXTENSION_PKG).substvars + echo "xpi:Depends=$(XPI_RECOMMENDS)" | sed "s/ / | /g" >> debian/$(MOZ_EXTENSION_PKG).substvars +endif touch $@ -xpi-install: install-$(XPI_BASE_FILE)-stamp autolinks-stamp xpi-depends-stamp +xpi-install: install-$(XPI_BASE_FILE)-stamp autolinks-stamp xpi-recommends-stamp # clean build and remove all .xpi in top-level if a MOZ_XPI_BUILD_COMMAND is defined clean:: -- cgit v1.2.3