summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog9
-rw-r--r--debian/control2
-rwxr-xr-xdh_xul-ext24
3 files changed, 31 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 22964b4..be32f37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mozilla-devscripts (0.46) unstable; urgency=medium
+
+ * Fix generating versions in light of Icedove's new 1: epoch in Debian.
+ Thanks to Guido G√ľnther for the patch (Closes: #825508).
+ * Extend Guido's fix to handle Ubuntu's existing 1: epoch for Thunderbird.
+ * Bump standards version to 3.9.8 (no changes required).
+
+ -- Sean Whitton <spwhitton@spwhitton.name> Thu, 07 Jul 2016 11:28:26 +0900
+
mozilla-devscripts (0.45.1) unstable; urgency=high
* Restore generation of iceweasel entries for Depends:, Enhances:
diff --git a/debian/control b/debian/control
index b0bd5bb..94309db 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ 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>, Sean Whitton <spwhitton@spwhitton.name>
Build-Depends: debhelper (>= 9), python-all (>= 2.6.6-3~), python-librdf
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
X-Python-Version: >= 2.6
VCS-Browser: https://anonscm.debian.org/cgit/pkg-mozext/mozilla-devscripts.git/
VCS-Git: https://anonscm.debian.org/git/pkg-mozext/mozilla-devscripts.git
diff --git a/dh_xul-ext b/dh_xul-ext
index 221135b..bea97cc 100755
--- a/dh_xul-ext
+++ b/dh_xul-ext
@@ -49,6 +49,21 @@ class XulApp(object):
return(self.xul_id + ": " + self.package + " (" + self.sol + " to " +
self.eol + ")")
+ def get_epoch(self, version):
+ """
+ Check whether a version needs an epoch
+ """
+ if (get_vendor() == 'Debian'
+ and self.xul_id == THUNDERBIRD_ID
+ and compare_versions(version, "45") >= 0):
+ return 1
+ elif (get_vendor() == 'Ubuntu'
+ and self.xul_id == THUNDERBIRD_ID
+ and compare_versions(version, "24") >= 0):
+ return 1
+ else:
+ return 0
+
def defaults_to_compatible(self):
"""Returns true if the maximum and all later versions of the XUL
application defaults add-ons to compatible. The XUL extension will be
@@ -65,10 +80,12 @@ class XulApp(object):
"""Return a string for ${xpi:Breaks} for the XUL application."""
breaks = []
if self.min_version:
- deb_min_version = convert_moz_to_debian_version(self.min_version)
+ epoch = self.get_epoch(self.min_version)
+ deb_min_version = convert_moz_to_debian_version(self.min_version, epoch=epoch)
breaks.append(self.package + " (<< " + deb_min_version + ")")
if self.max_version and not self.defaults_to_compatible():
- deb_max_version = moz_to_next_debian_version(self.max_version)
+ epoch = self.get_epoch(self.max_version)
+ deb_max_version = moz_to_next_debian_version(self.max_version, epoch=epoch)
breaks.append(self.package + " (>> " + deb_max_version + ")")
return ", ".join(breaks)
@@ -87,7 +104,8 @@ class XulApp(object):
def get_versioned_package(self):
versioned_package = self.package
if self.min_version:
- deb_min_version = convert_moz_to_debian_version(self.min_version)
+ epoch = self.get_epoch(self.min_version)
+ deb_min_version = convert_moz_to_debian_version(self.min_version, epoch=epoch)
versioned_package += " (>= " + deb_min_version + ")"
return versioned_package