From bcf4ae002a5e79d7595927a8d49264abef0ef98c Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Tue, 16 Nov 2010 22:18:57 +0100 Subject: * Use versioned target applications in Depends instead of unversioned target applications in Recommends. All extensions have to add ${xpi:Depends} to Depends. (Closes: #602051) - update src/dh_xul-ext - update src/xpi.mk --- src/dh_xul-ext | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src/dh_xul-ext') 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") -- cgit v1.2.3