Bug#819031: [Pkg-mozext-maintainers] Update diff
Actually attached. Sorry for the noise.
Sean
diff -Nru mozilla-devscripts-0.39/data/xul-app-data.csv.Debian mozilla-devscripts-0.39+deb8u1/data/xul-app-data.csv.Debian
--- mozilla-devscripts-0.39/data/xul-app-data.csv.Debian 2013-04-15 10:48:05.000000000 +0000
+++ mozilla-devscripts-0.39+deb8u1/data/xul-app-data.csv.Debian 2016-03-23 03:48:21.000000000 +0000
@@ -1,5 +1,8 @@
id,package,sol,eol
{ec8030f7-c20a-464f-9b0e-13a3a9e97384},iceweasel,2.0,*
+{ec8030f7-c20a-464f-9b0e-13a3a9e97384},firefox,2.0,*
+{ec8030f7-c20a-464f-9b0e-13a3a9e97384},firefox-esr,2.0,*
+{3550f703-e582-4d05-9a08-453d09bdfdc6},thunderbird,1.5.0.7,*
{3550f703-e582-4d05-9a08-453d09bdfdc6},icedove,1.5.0.7,*
{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a},iceape,1.0.6,*
{a79fe89b-6662-4ff4-8e88-09950ad4dfde},conkeror,0.9,*
diff -Nru mozilla-devscripts-0.39/debian/changelog mozilla-devscripts-0.39+deb8u1/debian/changelog
--- mozilla-devscripts-0.39/debian/changelog 2014-05-17 17:30:03.000000000 +0000
+++ mozilla-devscripts-0.39+deb8u1/debian/changelog 2016-03-23 04:04:34.000000000 +0000
@@ -1,3 +1,12 @@
+mozilla-devscripts (0.39+deb8u1) jessie; urgency=medium
+
+ * Update dh_xul-ext's substvar generation for the upcoming transitions
+ in stable from iceweasel to firefox-esr, and from icedove to
+ thunderbird. (Closes: ##818013, #818756)
+ * Update test suite expected values accordingly.
+
+ -- Sean Whitton <spwhitton@spwhitton.name> Tue, 22 Mar 2016 21:03:36 -0700
+
mozilla-devscripts (0.39) unstable; urgency=medium
[ Ximin Luo ]
diff -Nru mozilla-devscripts-0.39/debian/control mozilla-devscripts-0.39+deb8u1/debian/control
--- mozilla-devscripts-0.39/debian/control 2013-12-21 22:26:07.000000000 +0000
+++ mozilla-devscripts-0.39+deb8u1/debian/control 2016-03-23 03:12:57.000000000 +0000
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Debian Mozilla Extension Maintainers <pkg-mozext-maintainers@lists.alioth.debian.org>
-Uploaders: Benjamin Drung <bdrung@debian.org>, Andrea Veri <and@debian.org>
+Uploaders: Benjamin Drung <bdrung@debian.org>, Andrea Veri <and@debian.org>, Sean Whitton <spwhitton@spwhitton.name>
Build-Depends: debhelper (>= 9), python-all (>= 2.6.6-3~), python-librdf
Standards-Version: 3.9.5
X-Python-Version: >= 2.6
@@ -19,7 +19,7 @@
${python:Depends}
Description: Development scripts used by Mozilla's addons packages
This package contains mozilla-devscripts, a collection of scripts
- based on Makefile inheritance meant for packaging Iceweasel's and
- Icedove's extensions. These tools will help maintainers to build
+ based on Makefile inheritance meant for packaging Firefox's and
+ Thunderbird's extensions. These tools will help maintainers to build
link and install all XUL extensions properly following the policies
outlined by the Debian Mozilla Extension Maintainers team.
diff -Nru mozilla-devscripts-0.39/tests/dh_xul-ext/expected_result/all_environment.substvars mozilla-devscripts-0.39+deb8u1/tests/dh_xul-ext/expected_result/all_environment.substvars
--- mozilla-devscripts-0.39/tests/dh_xul-ext/expected_result/all_environment.substvars 2012-04-21 22:09:03.000000000 +0000
+++ mozilla-devscripts-0.39+deb8u1/tests/dh_xul-ext/expected_result/all_environment.substvars 2016-03-23 03:53:04.000000000 +0000
@@ -1,5 +1,5 @@
-xpi:Depends=iceweasel (>= 3.5) | icedove (>= 3.0) | iceape (>= 2.0) | conkeror | firefox | thunderbird (>= 3.0) | seamonkey (>= 2.0)
+xpi:Depends=iceweasel (>= 3.5) | firefox (>= 3.5) | firefox-esr (>= 3.5) | thunderbird (>= 3.0) | icedove (>= 3.0) | iceape (>= 2.0) | conkeror | 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
+xpi:Breaks=conkeror (>> 100.+), firefox (<< 3.5), firefox (>> 7.0~a0), firefox-esr (<< 3.5), firefox-esr (>> 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, firefox-esr, iceape, icedove, iceweasel, seamonkey, thunderbird
+xpi:Provides=conkeror-test-package, firefox-esr-test-package, firefox-test-package, iceape-test-package, icedove-test-package, iceweasel-test-package, seamonkey-test-package, test-package, thunderbird-test-package
diff -Nru mozilla-devscripts-0.39/tests/dh_xul-ext/expected_result/all.substvars mozilla-devscripts-0.39+deb8u1/tests/dh_xul-ext/expected_result/all.substvars
--- mozilla-devscripts-0.39/tests/dh_xul-ext/expected_result/all.substvars 2012-04-21 22:09:12.000000000 +0000
+++ mozilla-devscripts-0.39+deb8u1/tests/dh_xul-ext/expected_result/all.substvars 2016-03-23 03:53:04.000000000 +0000
@@ -1,5 +1,5 @@
-xpi:Depends=iceweasel (>= 3.5) | icedove (>= 3.0) | iceape (>= 2.0) | conkeror | firefox | thunderbird (>= 3.0) | seamonkey (>= 2.0)
+xpi:Depends=iceweasel (>= 3.5) | firefox (>= 3.5) | firefox-esr (>= 3.5) | thunderbird (>= 3.0) | icedove (>= 3.0) | iceape (>= 2.0) | conkeror | 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
+xpi:Breaks=conkeror (>> 100.+), firefox (<< 3.5), firefox (>> 7.0~a0), firefox-esr (<< 3.5), firefox-esr (>> 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, firefox-esr, iceape, icedove, iceweasel, seamonkey, thunderbird
+xpi:Provides=conkeror-test-package, firefox-esr-test-package, firefox-test-package, iceape-test-package, icedove-test-package, iceweasel-test-package, seamonkey-test-package, test-package, thunderbird-test-package
diff -Nru mozilla-devscripts-0.39/tests/dh_xul-ext/expected_result/debian.substvars mozilla-devscripts-0.39+deb8u1/tests/dh_xul-ext/expected_result/debian.substvars
--- mozilla-devscripts-0.39/tests/dh_xul-ext/expected_result/debian.substvars 2013-04-15 10:48:05.000000000 +0000
+++ mozilla-devscripts-0.39+deb8u1/tests/dh_xul-ext/expected_result/debian.substvars 2016-03-23 04:03:13.000000000 +0000
@@ -1,5 +1,5 @@
-xpi:Depends=iceweasel (>= 3.5) | icedove (>= 3.0) | iceape (>= 2.0) | conkeror | iceowl
+xpi:Depends=iceweasel (>= 3.5) | firefox (>= 3.5) | firefox-esr (>= 3.5) | thunderbird (>= 3.0) | icedove (>= 3.0) | iceape (>= 2.0) | conkeror | iceowl
xpi:Recommends=
-xpi:Breaks=conkeror (>> 100.+), iceape (<< 2.0), iceape (>> 2.4+), icedove (<< 3.0), icedove (>> 7.0~a1+), iceowl (>> 1.9+), iceweasel (<< 3.5), iceweasel (>> 7.0~a0)
-xpi:Enhances=conkeror, iceape, icedove, iceowl, iceweasel
-xpi:Provides=conkeror-test-package, iceape-test-package, icedove-test-package, iceowl-test-package, iceweasel-test-package, test-package
+xpi:Breaks=conkeror (>> 100.+), firefox (<< 3.5), firefox (>> 7.0~a0), firefox-esr (<< 3.5), firefox-esr (>> 7.0~a0), iceape (<< 2.0), iceape (>> 2.4+), icedove (<< 3.0), icedove (>> 7.0~a1+), iceowl (>> 1.9+), iceweasel (<< 3.5), iceweasel (>> 7.0~a0), thunderbird (<< 3.0), thunderbird (>> 7.0~a1+)
+xpi:Enhances=conkeror, firefox, firefox-esr, iceape, icedove, iceowl, iceweasel, thunderbird
+xpi:Provides=conkeror-test-package, firefox-esr-test-package, firefox-test-package, iceape-test-package, icedove-test-package, iceowl-test-package, iceweasel-test-package, test-package, thunderbird-test-package
diff -Nru mozilla-devscripts-0.39/tests/dh_xul-ext/expected_result/default-to-compatible.substvars mozilla-devscripts-0.39+deb8u1/tests/dh_xul-ext/expected_result/default-to-compatible.substvars
--- mozilla-devscripts-0.39/tests/dh_xul-ext/expected_result/default-to-compatible.substvars 2012-12-06 00:09:15.000000000 +0000
+++ mozilla-devscripts-0.39+deb8u1/tests/dh_xul-ext/expected_result/default-to-compatible.substvars 2016-03-23 03:55:47.000000000 +0000
@@ -1,5 +1,5 @@
-xpi:Depends=iceweasel (>= 4.0) | icedove (>= 5.0)
+xpi:Depends=iceweasel (>= 4.0) | firefox (>= 4.0) | firefox-esr (>= 4.0) | thunderbird (>= 5.0) | icedove (>= 5.0)
xpi:Recommends=
-xpi:Breaks=icedove (<< 5.0), iceweasel (<< 4.0)
-xpi:Enhances=icedove, iceweasel
-xpi:Provides=icedove-test-package, iceweasel-test-package, test-package
+xpi:Breaks=firefox (<< 4.0), firefox-esr (<< 4.0), icedove (<< 5.0), iceweasel (<< 4.0), thunderbird (<< 5.0)
+xpi:Enhances=firefox, firefox-esr, icedove, iceweasel, thunderbird
+xpi:Provides=firefox-esr-test-package, firefox-test-package, icedove-test-package, iceweasel-test-package, test-package, thunderbird-test-package
Reply to: