diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/dh_xul-ext | 14 | ||||
| -rw-r--r-- | src/xpi.mk | 5 |
2 files changed, 13 insertions, 6 deletions
diff --git a/src/dh_xul-ext b/src/dh_xul-ext index 6a61bd4..832ba9b 100755 --- a/src/dh_xul-ext +++ b/src/dh_xul-ext @@ -155,6 +155,10 @@ def get_source_package_name(): break return source +def has_no_xpi_depends(): + lines = open("debian/control").readlines() + xpi_depends_lines = filter(lambda x: x.find("${xpi:Depends}") >= 0, lines) + return len(xpi_depends_lines) == 0 def get_provided_package_names(package, supported_apps): ext_name = package @@ -228,8 +232,16 @@ def generate_substvars(script_name, xul_apps, package, verbose=False): supported_apps = get_supported_apps(script_name, xul_apps, install_rdf, package, verbose) + packages = map(lambda a: a.get_versioned_package(), supported_apps) + if has_no_xpi_depends(): + # Use xpi:Recommends instead of xpi:Depends for backwards compatibility + print ("%s: Warning: Please add ${xpi:Depends} to Depends. Using only " + "${xpi:Recommends} is deprecated.") % (script_name) + lines.append("xpi:Recommends=" + " | ".join(packages) + "\n") + else: + lines.append("xpi:Depends=" + " | ".join(packages) + "\n") + lines.append("xpi:Recommends=\n") packages = map(lambda a: a.get_package(), supported_apps) - lines.append("xpi:Recommends=" + " | ".join(packages) + "\n") lines.append("xpi:Enhances=" + ", ".join(sorted(packages)) + "\n") packages = get_provided_package_names(package, supported_apps) lines.append("xpi:Provides=" + ", ".join(sorted(packages)) + "\n") @@ -125,11 +125,6 @@ install/$(MOZ_EXTENSION_PKG):: xpi-install xpi-install: install-xpi -p$(MOZ_EXTENSION_PKG) $(xpi_file) $(install_xpi_extra_parameter) dh_xul-ext -p$(MOZ_EXTENSION_PKG) -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 - grep '^xpi:Recommends=' debian/$(MOZ_EXTENSION_PKG).substvars | sed "s/^xpi:Recommends=/xpi:Depends=/g" >> debian/$(MOZ_EXTENSION_PKG).substvars -endif # clean build and remove all .xpi in top-level if a MOZ_XPI_BUILD_COMMAND is defined ifneq (,$(MOZ_XPI_BUILD_COMMAND)) |