From cc52fe459c05b2588f635d5bf90ff9eaddb1f0f1 Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Tue, 11 Oct 2011 22:40:18 +0200 Subject: Add ${xpi:Breaks} for versioned package dependency for maximum XUL application version. LP: #839130 --- tests/dh_xul-ext/all/install.rdf | 6 +++--- tests/dh_xul-ext/all_environment/install.rdf | 6 +++--- tests/dh_xul-ext/debian/install.rdf | 6 +++--- tests/dh_xul-ext/expected_result/all.substvars | 1 + tests/dh_xul-ext/expected_result/all_environment.substvars | 1 + tests/dh_xul-ext/expected_result/debian.substvars | 1 + tests/dh_xul-ext/expected_result/ubuntu.substvars | 1 + tests/dh_xul-ext/ubuntu/install.rdf | 6 +++--- 8 files changed, 16 insertions(+), 12 deletions(-) (limited to 'tests') diff --git a/tests/dh_xul-ext/all/install.rdf b/tests/dh_xul-ext/all/install.rdf index 773eaa0..cee21e9 100644 --- a/tests/dh_xul-ext/all/install.rdf +++ b/tests/dh_xul-ext/all/install.rdf @@ -9,7 +9,7 @@ {ec8030f7-c20a-464f-9b0e-13a3a9e97384} 3.5 - 7.0a1 + 7.0a @@ -25,7 +25,7 @@ {92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} 2.0 - 2.4a1 + 2.4 @@ -33,7 +33,7 @@ {a79fe89b-6662-4ff4-8e88-09950ad4dfde} 0.1 - 100.0 + 100.* diff --git a/tests/dh_xul-ext/all_environment/install.rdf b/tests/dh_xul-ext/all_environment/install.rdf index 773eaa0..cee21e9 100644 --- a/tests/dh_xul-ext/all_environment/install.rdf +++ b/tests/dh_xul-ext/all_environment/install.rdf @@ -9,7 +9,7 @@ {ec8030f7-c20a-464f-9b0e-13a3a9e97384} 3.5 - 7.0a1 + 7.0a @@ -25,7 +25,7 @@ {92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} 2.0 - 2.4a1 + 2.4 @@ -33,7 +33,7 @@ {a79fe89b-6662-4ff4-8e88-09950ad4dfde} 0.1 - 100.0 + 100.* diff --git a/tests/dh_xul-ext/debian/install.rdf b/tests/dh_xul-ext/debian/install.rdf index 773eaa0..cee21e9 100644 --- a/tests/dh_xul-ext/debian/install.rdf +++ b/tests/dh_xul-ext/debian/install.rdf @@ -9,7 +9,7 @@ {ec8030f7-c20a-464f-9b0e-13a3a9e97384} 3.5 - 7.0a1 + 7.0a @@ -25,7 +25,7 @@ {92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} 2.0 - 2.4a1 + 2.4 @@ -33,7 +33,7 @@ {a79fe89b-6662-4ff4-8e88-09950ad4dfde} 0.1 - 100.0 + 100.* diff --git a/tests/dh_xul-ext/expected_result/all.substvars b/tests/dh_xul-ext/expected_result/all.substvars index 0b86163..656cf41 100644 --- a/tests/dh_xul-ext/expected_result/all.substvars +++ b/tests/dh_xul-ext/expected_result/all.substvars @@ -1,4 +1,5 @@ xpi:Depends=iceweasel (>= 3.5) | icedove (>= 3.0) | iceape (>= 2.0) | conkeror | firefox | thunderbird (>= 3.0) | seamonkey (>= 2.0) xpi:Recommends= +xpi:Breaks=conkeror (>= 100.+), firefox (>= 7.0~a0), iceape (<< 2.0), iceape (>= 2.4+), icedove (<< 3.0), icedove (>= 7.0~a1+), iceweasel (<< 3.5), iceweasel (>= 7.0~a0), seamonkey (<< 2.0), seamonkey (>= 2.4+), thunderbird (<< 3.0), thunderbird (>= 7.0~a1+) xpi:Enhances=conkeror, firefox, iceape, icedove, iceweasel, seamonkey, thunderbird xpi:Provides=conkeror-test-package, firefox-test-package, iceape-test-package, icedove-test-package, iceweasel-test-package, seamonkey-test-package, test-package, thunderbird-test-package diff --git a/tests/dh_xul-ext/expected_result/all_environment.substvars b/tests/dh_xul-ext/expected_result/all_environment.substvars index 0b86163..656cf41 100644 --- a/tests/dh_xul-ext/expected_result/all_environment.substvars +++ b/tests/dh_xul-ext/expected_result/all_environment.substvars @@ -1,4 +1,5 @@ xpi:Depends=iceweasel (>= 3.5) | icedove (>= 3.0) | iceape (>= 2.0) | conkeror | firefox | thunderbird (>= 3.0) | seamonkey (>= 2.0) xpi:Recommends= +xpi:Breaks=conkeror (>= 100.+), firefox (>= 7.0~a0), iceape (<< 2.0), iceape (>= 2.4+), icedove (<< 3.0), icedove (>= 7.0~a1+), iceweasel (<< 3.5), iceweasel (>= 7.0~a0), seamonkey (<< 2.0), seamonkey (>= 2.4+), thunderbird (<< 3.0), thunderbird (>= 7.0~a1+) xpi:Enhances=conkeror, firefox, iceape, icedove, iceweasel, seamonkey, thunderbird xpi:Provides=conkeror-test-package, firefox-test-package, iceape-test-package, icedove-test-package, iceweasel-test-package, seamonkey-test-package, test-package, thunderbird-test-package diff --git a/tests/dh_xul-ext/expected_result/debian.substvars b/tests/dh_xul-ext/expected_result/debian.substvars index 923b41b..a70bdc9 100644 --- a/tests/dh_xul-ext/expected_result/debian.substvars +++ b/tests/dh_xul-ext/expected_result/debian.substvars @@ -1,4 +1,5 @@ xpi:Depends=iceweasel (>= 3.5) | icedove (>= 3.0) | iceape (>= 2.0) | conkeror xpi:Recommends= +xpi:Breaks=conkeror (>= 100.+), iceape (<< 2.0), iceape (>= 2.4+), icedove (<< 3.0), icedove (>= 7.0~a1+), iceweasel (<< 3.5), iceweasel (>= 7.0~a0) xpi:Enhances=conkeror, iceape, icedove, iceweasel xpi:Provides=conkeror-test-package, iceape-test-package, icedove-test-package, iceweasel-test-package, test-package diff --git a/tests/dh_xul-ext/expected_result/ubuntu.substvars b/tests/dh_xul-ext/expected_result/ubuntu.substvars index 6f7e3be..285ae09 100644 --- a/tests/dh_xul-ext/expected_result/ubuntu.substvars +++ b/tests/dh_xul-ext/expected_result/ubuntu.substvars @@ -1,4 +1,5 @@ xpi:Depends=firefox | thunderbird (>= 3.0) | seamonkey (>= 2.0) xpi:Recommends= +xpi:Breaks=firefox (>= 7.0~a0), seamonkey (<< 2.0), seamonkey (>= 2.4+), thunderbird (<< 3.0), thunderbird (>= 7.0~a1+) xpi:Enhances=firefox, seamonkey, thunderbird xpi:Provides=firefox-test-package, seamonkey-test-package, test-package, thunderbird-test-package diff --git a/tests/dh_xul-ext/ubuntu/install.rdf b/tests/dh_xul-ext/ubuntu/install.rdf index 773eaa0..cee21e9 100644 --- a/tests/dh_xul-ext/ubuntu/install.rdf +++ b/tests/dh_xul-ext/ubuntu/install.rdf @@ -9,7 +9,7 @@ {ec8030f7-c20a-464f-9b0e-13a3a9e97384} 3.5 - 7.0a1 + 7.0a @@ -25,7 +25,7 @@ {92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} 2.0 - 2.4a1 + 2.4 @@ -33,7 +33,7 @@ {a79fe89b-6662-4ff4-8e88-09950ad4dfde} 0.1 - 100.0 + 100.* -- cgit v1.2.3