diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | src/xpi.mk | 7 |
2 files changed, 12 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 1d4a8ab..18ea288 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,10 @@ mozilla-devscripts (0.16) UNRELEASED; urgency=low - rename ${xpi:Depends} to ${xpi:Recommends} and keep ${xpi:Depends} for backwards compatibility - update src/xpi.mk + - add ${xpi:Provides} and ${xpi:Enhances} to support the Debian policy for + packaging extensions: http://wiki.debian.org/Teams/DebianMozExtTeam + - update src/xpi.mk + * packaging: - allow uploads done by Debian Maintainers - update debian/control @@ -45,7 +49,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> Tue, 22 Sep 2009 09:50:31 +0200 + -- Benjamin Drung <bdrung@ubuntu.com> Wed, 23 Sep 2009 01:34:48 +0200 mozilla-devscripts (0.15) unstable; urgency=low @@ -166,6 +166,9 @@ else XPI_RECOMMENDS = ALL_XPI_RECOMMENDS endif +strip_version = $(sort $(foreach package,$(1),$(shell echo $(package) | sed "s/-[0-9.]*$$//"))) +XPI_PROVIDES = $(addsuffix -$(patsubst xul-ext-%,%,$(MOZ_EXTENSION_PKG)),$(call strip_version,$(XPI_RECOMMENDS))) + TEMPDIR := temp-xpi-unpacked ifneq (,$(MOZ_XPI_FILE)) @@ -239,6 +242,10 @@ ifneq ($(shell grep '$${xpi:Depends}' debian/control),) if test -f debian/$(MOZ_EXTENSION_PKG).substvars; then sed -i '/^xpi:Depends=/d' debian/$(MOZ_EXTENSION_PKG).substvars; fi echo "xpi:Depends=$(XPI_RECOMMENDS)" | sed "s/ / | /g" >> debian/$(MOZ_EXTENSION_PKG).substvars endif + if test -f debian/$(MOZ_EXTENSION_PKG).substvars; then sed -i '/^xpi:Provides=/d' debian/$(MOZ_EXTENSION_PKG).substvars; fi + echo "xpi:Provides=$(XPI_PROVIDES)" | sed "s/ /, /g" >> debian/$(MOZ_EXTENSION_PKG).substvars + if test -f debian/$(MOZ_EXTENSION_PKG).substvars; then sed -i '/^xpi:Enhances=/d' debian/$(MOZ_EXTENSION_PKG).substvars; fi + echo "xpi:Enhances=$(XPI_RECOMMENDS)" | sed "s/ /, /g" >> debian/$(MOZ_EXTENSION_PKG).substvars touch $@ xpi-install: install-$(XPI_BASE_FILE)-stamp autolinks-stamp xpi-recommends-stamp |