diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | src/xpi.mk | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index d61449e..1b09cd1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,8 @@ mozilla-devscripts (0.16) UNRELEASED; urgency=low - update src/xpi.mk - support different types of install.rdf files (LP: #422898) - update src/xpi.mk + - add MOZ_EXT_NAME option (used for calculating xpi:Provides) + - update src/xpi.mk * packaging: - allow uploads done by Debian Maintainers @@ -55,7 +57,7 @@ mozilla-devscripts (0.16) UNRELEASED; urgency=low field in debian/control for the target package - update src/xpi.mk - -- Benjamin Drung <bdrung@ubuntu.com> Thu, 24 Sep 2009 12:58:48 +0200 + -- Benjamin Drung <bdrung@ubuntu.com> Thu, 24 Sep 2009 13:52:29 +0200 mozilla-devscripts (0.15) unstable; urgency=low @@ -60,6 +60,12 @@ # license files in debian/copyright appropriately. If not defined # the common license file names are guessed. # +# MOZ_EXT_NAME (OPTIONAL): +# defines the name of the extension (without any prefixes like +# mozilla- or xul-ext-). If not defined MOZ_EXTENSION_PKG with +# stripped prefixes is used. This value is used to determine +# xpi:Provides. +# # Deprecated variables: # # MOZ_XPI_MOZILLA_DIRS /deprecated/ (OPTIONAL/NODEFAULT - see "Note:"): @@ -166,10 +172,10 @@ else XPI_RECOMMENDS = ALL_XPI_RECOMMENDS endif -EXTENSION_BASE_NAME := $(patsubst xul-ext-%,%,$(MOZ_EXTENSION_PKG)) +MOZ_EXT_NAME ?= $(shell echo $(MOZ_EXTENSION_PKG) | sed "s/^firefox-//;s/^iceweasel-//;s/^mozilla-//;s/^xul-ext-//") strip_version = $(sort $(foreach package,$(1),$(shell echo $(package) | sed "s/-[0-9.]*$$//"))) -XPI_PROVIDES = $(EXTENSION_BASE_NAME) $(addsuffix -$(EXTENSION_BASE_NAME),$(call strip_version,$(XPI_RECOMMENDS))) +XPI_PROVIDES = $(sort $(filter-out $(MOZ_EXTENSION_PKG),$(MOZ_EXT_NAME) $(addsuffix -$(MOZ_EXT_NAME),xul-ext $(call strip_version,$(XPI_RECOMMENDS))))) TEMPDIR := temp-xpi-unpacked |