summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Drung <bdrung@debian.org>2012-12-06 01:12:05 +0100
committerBenjamin Drung <bdrung@debian.org>2012-12-06 01:12:05 +0100
commit88346138245f9a73a19bb6ee14110be32921ab2d (patch)
tree51cdf9bda1985f3c7f3a0decb117d1912bcc44a4
parent474ee3b962d4ed005ca36cf9f9ee522d97872784 (diff)
dh_xul-ext: Do not generate a Breaks entry for Thunderbird/Icedove 10 or later.
Thunderbird/Icedove 10 defaults add-ons to compatible.
-rwxr-xr-xdh_xul-ext8
-rw-r--r--tests/dh_xul-ext/default-to-compatible/install.rdf8
-rw-r--r--tests/dh_xul-ext/expected_result/default-to-compatible.substvars8
3 files changed, 18 insertions, 6 deletions
diff --git a/dh_xul-ext b/dh_xul-ext
index e995174..b51b3f7 100755
--- a/dh_xul-ext
+++ b/dh_xul-ext
@@ -31,6 +31,9 @@ _VENDOR_ENV = "DH_XUL_EXT_VENDOR"
COMMAND_LINE_SYNTAX_ERROR = 1
MULTIPLE_INSTALL_RDFS = 2
+FIREFOX_ID = "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
+THUNDERBIRD_ID = "{3550f703-e582-4d05-9a08-453d09bdfdc6}"
+
class XulApp(object):
def __init__(self, xul_id, package, sol, eol):
self.xul_id = xul_id
@@ -50,9 +53,10 @@ class XulApp(object):
enabled even if the version of the XUL application is higher than the
specified maximum version in this case.
- Firefox/Iceweasel 10 defaults add-ons to compatible."""
+ Firefox/Iceweasel 10 and Thunderbird/Icedove 10 defaults add-ons to
+ compatible."""
- if self.xul_id == "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}" and \
+ if self.xul_id in (FIREFOX_ID, THUNDERBIRD_ID) and \
compare_versions(self.max_version, "10") >= 0:
return True
return False
diff --git a/tests/dh_xul-ext/default-to-compatible/install.rdf b/tests/dh_xul-ext/default-to-compatible/install.rdf
index 660f7e1..55550ef 100644
--- a/tests/dh_xul-ext/default-to-compatible/install.rdf
+++ b/tests/dh_xul-ext/default-to-compatible/install.rdf
@@ -12,5 +12,13 @@
<em:maxVersion>11</em:maxVersion>
</Description>
</em:targetApplication>
+ <em:targetApplication>
+ <Description>
+ <!-- Icedove/Thunderbird -->
+ <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+ <em:minVersion>5.0</em:minVersion>
+ <em:maxVersion>12.0</em:maxVersion>
+ </Description>
+ </em:targetApplication>
</Description>
</RDF>
diff --git a/tests/dh_xul-ext/expected_result/default-to-compatible.substvars b/tests/dh_xul-ext/expected_result/default-to-compatible.substvars
index eeb600b..06b38d8 100644
--- a/tests/dh_xul-ext/expected_result/default-to-compatible.substvars
+++ b/tests/dh_xul-ext/expected_result/default-to-compatible.substvars
@@ -1,5 +1,5 @@
-xpi:Depends=iceweasel (>= 4.0)
+xpi:Depends=iceweasel (>= 4.0) | icedove (>= 5.0)
xpi:Recommends=
-xpi:Breaks=iceweasel (<< 4.0)
-xpi:Enhances=iceweasel
-xpi:Provides=iceweasel-test-package, test-package
+xpi:Breaks=icedove (<< 5.0), iceweasel (<< 4.0)
+xpi:Enhances=icedove, iceweasel
+xpi:Provides=icedove-test-package, iceweasel-test-package, test-package