From bb91d7f9bc1615b96234170d539d720e07b81461 Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Tue, 6 Oct 2009 02:28:40 +0200 Subject: - only add stripped binary package name to xpi:Provides, if it equals the source package name - update src/xpi.mk --- src/xpi.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/xpi.mk b/src/xpi.mk index fdd39ea..b100acc 100644 --- a/src/xpi.mk +++ b/src/xpi.mk @@ -174,8 +174,11 @@ endif MOZ_EXT_NAME ?= $(shell echo $(MOZ_EXTENSION_PKG) | sed "s/^firefox-//;s/^iceweasel-//;s/^mozilla-//;s/^xul-ext-//") +ifeq ($(MOZ_EXT_NAME),$(strip $(shell grep ^Source: debian/control | sed "s/^Source://"))) +ADDITIONAL_PROVIDES := $(MOZ_EXT_NAME) +endif strip_version = $(sort $(foreach package,$(1),$(shell echo $(package) | sed "s/-[0-9.]*$$//"))) -XPI_PROVIDES = $(sort $(filter-out $(MOZ_EXTENSION_PKG),$(MOZ_EXT_NAME) $(addsuffix -$(MOZ_EXT_NAME),xul-ext $(call strip_version,$(XPI_RECOMMENDS))))) +XPI_PROVIDES = $(sort $(filter-out $(MOZ_EXTENSION_PKG),$(ADDITIONAL_PROVIDES) $(addsuffix -$(MOZ_EXT_NAME),xul-ext $(call strip_version,$(XPI_RECOMMENDS))))) TEMPDIR := temp-xpi-unpacked -- cgit v1.2.3