Add ${xpi:Breaks} for versioned package dependency for maximum XUL application version.

LP: #839130

8 files changed, 16 insertions, 12 deletions

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 @@
         <!-- Iceweasel/Firefox -->
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>3.5</em:minVersion>
-        <em:maxVersion>7.0a1</em:maxVersion>
+        <em:maxVersion>7.0a</em:maxVersion>
       </Description>
     </em:targetApplication>
     <em:targetApplication>
@@ -25,7 +25,7 @@
         <!-- Iceape/Seamonkey -->
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
         <em:minVersion>2.0</em:minVersion>
-        <em:maxVersion>2.4a1</em:maxVersion>
+        <em:maxVersion>2.4</em:maxVersion>
       </Description>
     </em:targetApplication>
     <em:targetApplication>
@@ -33,7 +33,7 @@
         <!-- Conkeror -->
         <em:id>{a79fe89b-6662-4ff4-8e88-09950ad4dfde}</em:id>
         <em:minVersion>0.1</em:minVersion>
-        <em:maxVersion>100.0</em:maxVersion>
+        <em:maxVersion>100.*</em:maxVersion>
       </Description>
     </em:targetApplication>
   </Description>
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 @@
         <!-- Iceweasel/Firefox -->
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>3.5</em:minVersion>
-        <em:maxVersion>7.0a1</em:maxVersion>
+        <em:maxVersion>7.0a</em:maxVersion>
       </Description>
     </em:targetApplication>
     <em:targetApplication>
@@ -25,7 +25,7 @@
         <!-- Iceape/Seamonkey -->
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
         <em:minVersion>2.0</em:minVersion>
-        <em:maxVersion>2.4a1</em:maxVersion>
+        <em:maxVersion>2.4</em:maxVersion>
       </Description>
     </em:targetApplication>
     <em:targetApplication>
@@ -33,7 +33,7 @@
         <!-- Conkeror -->
         <em:id>{a79fe89b-6662-4ff4-8e88-09950ad4dfde}</em:id>
         <em:minVersion>0.1</em:minVersion>
-        <em:maxVersion>100.0</em:maxVersion>
+        <em:maxVersion>100.*</em:maxVersion>
       </Description>
     </em:targetApplication>
   </Description>
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 @@
         <!-- Iceweasel/Firefox -->
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>3.5</em:minVersion>
-        <em:maxVersion>7.0a1</em:maxVersion>
+        <em:maxVersion>7.0a</em:maxVersion>
       </Description>
     </em:targetApplication>
     <em:targetApplication>
@@ -25,7 +25,7 @@
         <!-- Iceape/Seamonkey -->
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
         <em:minVersion>2.0</em:minVersion>
-        <em:maxVersion>2.4a1</em:maxVersion>
+        <em:maxVersion>2.4</em:maxVersion>
       </Description>
     </em:targetApplication>
     <em:targetApplication>
@@ -33,7 +33,7 @@
         <!-- Conkeror -->
         <em:id>{a79fe89b-6662-4ff4-8e88-09950ad4dfde}</em:id>
         <em:minVersion>0.1</em:minVersion>
-        <em:maxVersion>100.0</em:maxVersion>
+        <em:maxVersion>100.*</em:maxVersion>
       </Description>
     </em:targetApplication>
   </Description>
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 @@
         <!-- Iceweasel/Firefox -->
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>3.5</em:minVersion>
-        <em:maxVersion>7.0a1</em:maxVersion>
+        <em:maxVersion>7.0a</em:maxVersion>
       </Description>
     </em:targetApplication>
     <em:targetApplication>
@@ -25,7 +25,7 @@
         <!-- Iceape/Seamonkey -->
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
         <em:minVersion>2.0</em:minVersion>
-        <em:maxVersion>2.4a1</em:maxVersion>
+        <em:maxVersion>2.4</em:maxVersion>
       </Description>
     </em:targetApplication>
     <em:targetApplication>
@@ -33,7 +33,7 @@
         <!-- Conkeror -->
         <em:id>{a79fe89b-6662-4ff4-8e88-09950ad4dfde}</em:id>
         <em:minVersion>0.1</em:minVersion>
-        <em:maxVersion>100.0</em:maxVersion>
+        <em:maxVersion>100.*</em:maxVersion>
       </Description>
     </em:targetApplication>
   </Description>