summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2016-01-17 17:35:44 -0700
committerSean Whitton <spwhitton@spwhitton.name>2016-01-17 17:35:44 -0700
commit803c03cc06e3ac3cde9aa14d8595d9367113ab2d (patch)
tree3820f1c7a267f88de6413e172c13d3649f4f9433
parentbd841858e183b01fb7675924017f0396508b5db6 (diff)
drop support for Iceape
No longer available in Debian.
-rw-r--r--data/xul-app-data.csv.Debian1
-rw-r--r--debian/changelog9
-rw-r--r--debian/control2
-rw-r--r--tests/dh_xul-ext/expected_result/all.substvars8
-rw-r--r--tests/dh_xul-ext/expected_result/all_environment.substvars8
-rw-r--r--tests/dh_xul-ext/expected_result/debian.substvars8
6 files changed, 22 insertions, 14 deletions
diff --git a/data/xul-app-data.csv.Debian b/data/xul-app-data.csv.Debian
index cd03c8a..3f8061c 100644
--- a/data/xul-app-data.csv.Debian
+++ b/data/xul-app-data.csv.Debian
@@ -1,6 +1,5 @@
id,package,sol,eol
{ec8030f7-c20a-464f-9b0e-13a3a9e97384},iceweasel,2.0,*
{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,*
{718e30fb-e89b-41dd-9da7-e25a45638b28},iceowl,1.5,*
diff --git a/debian/changelog b/debian/changelog
index d75bc19..40e1598 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mozilla-devscripts (0.44) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Drop support for Iceape which is no longer available in Debian.
+ Prevents generating Depends: that can never be satisfied in packages
+ built with dh_xul-ext.
+
+ -- Sean Whitton <spwhitton@spwhitton.name> Sun, 17 Jan 2016 17:31:33 -0700
+
mozilla-devscripts (0.43) unstable; urgency=medium
* install-xpi: sort file list in preferences files to make package builds
diff --git a/debian/control b/debian/control
index 86e1ce3..06656ed 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: mozilla-devscripts
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.6
X-Python-Version: >= 2.6
diff --git a/tests/dh_xul-ext/expected_result/all.substvars b/tests/dh_xul-ext/expected_result/all.substvars
index c56454d..0df9239 100644
--- a/tests/dh_xul-ext/expected_result/all.substvars
+++ b/tests/dh_xul-ext/expected_result/all.substvars
@@ -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) | icedove (>= 3.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
+xpi:Breaks=conkeror (>> 100.+), firefox (>> 7.0~a0), 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, icedove, iceweasel, seamonkey, thunderbird
+xpi:Provides=conkeror-test-package, firefox-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 c56454d..0df9239 100644
--- a/tests/dh_xul-ext/expected_result/all_environment.substvars
+++ b/tests/dh_xul-ext/expected_result/all_environment.substvars
@@ -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) | icedove (>= 3.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
+xpi:Breaks=conkeror (>> 100.+), firefox (>> 7.0~a0), 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, icedove, iceweasel, seamonkey, thunderbird
+xpi:Provides=conkeror-test-package, firefox-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 f1c1023..d9cfdf1 100644
--- a/tests/dh_xul-ext/expected_result/debian.substvars
+++ b/tests/dh_xul-ext/expected_result/debian.substvars
@@ -1,5 +1,5 @@
-xpi:Depends=iceweasel (>= 3.5) | icedove (>= 3.0) | iceape (>= 2.0) | conkeror | iceowl
+xpi:Depends=iceweasel (>= 3.5) | icedove (>= 3.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.+), icedove (<< 3.0), icedove (>> 7.0~a1+), iceowl (>> 1.9+), iceweasel (<< 3.5), iceweasel (>> 7.0~a0)
+xpi:Enhances=conkeror, icedove, iceowl, iceweasel
+xpi:Provides=conkeror-test-package, icedove-test-package, iceowl-test-package, iceweasel-test-package, test-package