diff options
author | Alexander Sack <asac@ubuntu.com> | 2009-07-29 01:45:28 +0200 |
---|---|---|
committer | Alexander Sack <asac@ubuntu.com> | 2009-07-29 01:45:28 +0200 |
commit | 0181a0354d7a84fd16918aafd38f771599f72101 (patch) | |
tree | e07a19ffd9a78a6e5ce02edd81cdc9d68b406fed | |
parent | 5e0a08d1e94e4953a3879d65ab447aa166af1271 (diff) |
- use moz-version-compare in ${xpi:Depends} |CHECK_VERSION| call
instead of the rather flawed dpkg --compare-versions approach.
- update src/xpi.mk
-rw-r--r-- | debian/changelog | 3 | ||||
-rw-r--r-- | src/xpi.mk | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 983177b..3d43596 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,9 @@ mozilla-devscripts (0.14) UNRELEASED; urgency=low - add prism@developers.mozilla.org 1.0 to list of auto detected target application packages - update src/xpi.mk + - use moz-version-compare in ${xpi:Depends} |CHECK_VERSION| call + instead of the rather flawed dpkg --compare-versions approach. + - update src/xpi.mk * build-system: - add bindir_files feature and use that to install med-xpi-*pack as well as moz-version-compare to BINDIR; in turn adjust dh_install helper @@ -83,7 +83,7 @@ target_versions_prism@developers.mozilla.org := 1.0 TARGET_VERSION = $(shell xpath -q -e '//em:targetApplication/Description[em:id="$(1)" or @em:id="$(1)"]/em:$(2)/text() | //em:targetApplication/Description[em:id="$(1)" or @em:id="$(1)"]/@em:$(2)' $(3)/install.rdf) # TODO: Use correct comparison -CHECK_VERSION = $(shell dpkg --compare-versions $(call TARGET_VERSION,$(1),minVersion,$(TEMPDIR)) le $(2) && dpkg --compare-versions $(2) le $(call TARGET_VERSION,$(1),maxVersion,$(TEMPDIR)) && echo $(target_packages_$(1)_$(2))) +CHECK_VERSION = $(shell moz-version-compare $(call TARGET_VERSION,$(1),minVersion,$(TEMPDIR)) le $(2) && moz-version-compare $(2) le $(call TARGET_VERSION,$(1),maxVersion,$(TEMPDIR)) && echo $(target_packages_$(1)_$(2))) MOZ_XPI_BUILD_COMMAND ?= med-xpi-pack $(CURDIR) $(MOZ_EXTENSION_PKG).xpi; |