Package: icedove
Version: 1:45.1.0-1
Severity: wishlist

Hi,
now that 45.1 is out it would be the perfect time to wrap and sort all
headers (see attache patch). This would ease backporting and a possible
migration to thunderbird since it reduces merge conflicts a lot.

I'm happy to push this to master if it looks good.
Cheers,
 -- Guido


-- System Information:
Debian Release: stretch/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'stable-updates'), (500, 'unstable'), 
(500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.5.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages icedove depends on:
ii  debianutils               4.7
ii  fontconfig                2.11.0-6.4
ii  libasound2                1.1.0-1
ii  libatk1.0-0               2.20.0-1
ii  libc6                     2.22-9
ii  libcairo2                 1.14.6-1+b1
ii  libdbus-1-3               1.10.8-1
ii  libdbus-glib-1-2          0.106-1
ii  libevent-2.0-5            2.0.21-stable-2+b1
ii  libffi6                   3.2.1-4
ii  libfontconfig1            2.11.0-6.4
ii  libfreetype6              2.6.3-3+b1
ii  libgcc1                   1:6.1.1-4
ii  libgdk-pixbuf2.0-0        2.34.0-1
ii  libglib2.0-0              2.48.1-1
ii  libgtk2.0-0               2.24.30-1.1
ii  libhunspell-1.4-0         1.4.1-2
ii  libicu55                  55.1-7
ii  libnspr4                  2:4.12-2
ii  libnss3                   2:3.23-2
ii  libpango-1.0-0            1.40.1-1
ii  libpangocairo-1.0-0       1.40.1-1
ii  libpangoft2-1.0-0         1.40.1-1
ii  libpixman-1-0             0.33.6-1
ii  libsqlite3-0              3.12.2-1
ii  libstartup-notification0  0.12-4
ii  libstdc++6                6.1.1-4
ii  libvpx3                   1.5.0-3
ii  libx11-6                  2:1.6.3-1
ii  libxcomposite1            1:0.4.4-1
ii  libxdamage1               1:1.1.4-2+b1
ii  libxext6                  2:1.3.3-1
ii  libxfixes3                1:5.0.1-2+b2
ii  libxrender1               1:0.9.9-2
ii  libxt6                    1:1.1.5-1
ii  psmisc                    22.21-2.1+b1
ii  zlib1g                    1:1.2.8.dfsg-2+b1

Versions of packages icedove recommends:
ii  hunspell-en-us [hunspell-dictionary]  20070829-6
ii  iceowl-extension                      1:45.1.0-1

Versions of packages icedove suggests:
ii  fonts-lyx         2.1.4-2
ii  libgssapi-krb5-2  1.13.2+dfsg-5

-- no debconf information
>From 502289675e5c812d692ccdad8add30e3ff9c2755 Mon Sep 17 00:00:00 2001
Message-Id: <502289675e5c812d692ccdad8add30e3ff9c2755.1464593214.git....@sigxcpu.org>
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <a...@sigxcpu.org>
Date: Mon, 30 May 2016 09:24:50 +0200
Subject: [PATCH] Wrap and sort control information

via  'wrap-and-sort -ast' to simplify backporting
---
 debian/control                | 1104 +++++++++++++++++++++++++++--------------
 debian/copyright              |    4 +-
 debian/icedove-dev.install    |    2 +-
 debian/icedove-dev.links      |    2 +-
 debian/icedove.install        |   22 +-
 debian/icedove.links          |    6 +-
 debian/iceowl-extension.dirs  |    2 +-
 debian/iceowl-extension.links |    3 +-
 8 files changed, 762 insertions(+), 383 deletions(-)

diff --git a/debian/control b/debian/control
index 0897707..10dc658 100644
--- a/debian/control
+++ b/debian/control
@@ -2,47 +2,50 @@ Source: icedove
 Section: mail
 Priority: optional
 Maintainer: Christoph Goehre <ch...@sigxcpu.org>
-Uploaders: Guido Günther <a...@sigxcpu.org>, Carsten Schoenert <c.schoen...@t-online.de>
-Build-Depends: autoconf2.13,
-	autotools-dev,
-	bzip2,
-	debhelper (>= 7.0.50~),
-	dpkg-dev (>= 1.16.1~),
-	libasound2-dev [linux-any],
-	libbz2-dev,
-	libcairo2-dev (>= 1.10.2-1.1~),
-	libdbus-glib-1-dev (>= 0.60),
-	libevent-dev (>= 1.4.1),
-	libffi-dev,
-	libfontconfig1-dev,
-	libglib2.0-dev (>= 2.22.0),
-	libgnomeui-dev (>= 2.22),
-	libgstreamer-plugins-base1.0-dev,
-	libgstreamer1.0-dev,
-	libhunspell-dev (>= 1.2),
-	libidl-dev (>= 0.8.0),
-	libiw-dev [linux-any],
-	libnotify-dev,
-	libnspr4-dev (>= 2:4.12~),
-	libnss3-dev (>= 2:3.21.1~),
-	libreadline-dev,
-	libpng-dev,
-	libpulse-dev,
-	libsqlite3-dev (>= 3.9.1~),
-	libstartup-notification0-dev,
-	libvpx-dev (>= 1.5.0),
-	libxau-dev,
-	libxft-dev,
-	libxt-dev,
-	mesa-common-dev,
-	mozilla-devscripts,
-	python-minimal (>= 2.6.6-13~),
-	python-ply,
-	python2.7,
-	unzip,
-	yasm (>= 1.1),
-	zip,
-	zlib1g-dev
+Uploaders:
+ Guido Günther <a...@sigxcpu.org>,
+ Carsten Schoenert <c.schoen...@t-online.de>,
+Build-Depends:
+ autoconf2.13,
+ autotools-dev,
+ bzip2,
+ debhelper (>= 7.0.50~),
+ dpkg-dev (>= 1.16.1~),
+ libasound2-dev [linux-any],
+ libbz2-dev,
+ libcairo2-dev (>= 1.10.2-1.1~),
+ libdbus-glib-1-dev (>= 0.60),
+ libevent-dev (>= 1.4.1),
+ libffi-dev,
+ libfontconfig1-dev,
+ libglib2.0-dev (>= 2.22.0),
+ libgnomeui-dev (>= 2.22),
+ libgstreamer-plugins-base1.0-dev,
+ libgstreamer1.0-dev,
+ libhunspell-dev (>= 1.2),
+ libidl-dev (>= 0.8.0),
+ libiw-dev [linux-any],
+ libnotify-dev,
+ libnspr4-dev (>= 2:4.12~),
+ libnss3-dev (>= 2:3.21.1~),
+ libpng-dev,
+ libpulse-dev,
+ libreadline-dev,
+ libsqlite3-dev (>= 3.9.1~),
+ libstartup-notification0-dev,
+ libvpx-dev (>= 1.5.0),
+ libxau-dev,
+ libxft-dev,
+ libxt-dev,
+ mesa-common-dev,
+ mozilla-devscripts,
+ python-minimal (>= 2.6.6-13~),
+ python-ply,
+ python2.7,
+ unzip,
+ yasm (>= 1.1),
+ zip,
+ zlib1g-dev,
 Vcs-Git: https://anonscm.debian.org/cgit/pkg-mozilla/icedove.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-mozilla/icedove.git
 Homepage: http://www.mozilla.org/thunderbird/
@@ -51,66 +54,91 @@ Standards-Version: 3.9.8
 
 Package: icedove
 Architecture: any
-Depends: fontconfig, psmisc, debianutils (>= 1.16), ${shlibs:Depends}, ${misc:Depends}
-Recommends: iceowl-extension (= ${binary:Version}), myspell-en-us | hunspell-dictionary | myspell-dictionary
-Suggests: fonts-lyx, libgssapi-krb5-2, ${gnome:Depends}
-Provides: mail-reader
+Depends:
+ debianutils (>= 1.16),
+ fontconfig,
+ psmisc,
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
+ iceowl-extension (= ${binary:Version}),
+ myspell-en-us | hunspell-dictionary | myspell-dictionary,
+Suggests:
+ fonts-lyx,
+ libgssapi-krb5-2,
+ ${gnome:Depends},
+Provides:
+ mail-reader,
 Xb-Xul-AppId: {3550f703-e582-4d05-9a08-453d09bdfdc6}
-Replaces: icedove-gnome-support (<< 3.0-1~)
-Breaks: enigmail (<< 2:1.8),
-	iceowl-extension (<< ${binary:Version}),
-	icedove-gnome-support (<< 3.0-1~),
-	hunspell-ar (<< 0.0.0+20080110-1.1),
-	hunspell-da (<< 1:3.1.0-3),
-	hunspell-de-at (<< 20071211-2), hunspell-de-ch (<< 20071211-2), hunspell-de-de (<< 20071211-2), hunspell-de-med (<< 20090825-1),
-	hunspell-en-ca (<< 1:3.1.0-3), hunspell-en-us (<< 20070829-3),
-	hunspell-fr (<< 1:3.1.0-3),
-	hunspell-gl-es (<< 2.2a-6),
-	hunspell-hu (<< 1:3.1.0-3),
-	hunspell-ko (<< 0.3.3-1),
-	hunspell-ne (<< 1:3.1.0-3),
-	hunspell-se (<< 1.0~beta6.20081222-1.1),
-	hunspell-sh (<< 1:3.1.0-3),
-	hunspell-sr (<< 1:3.1.0-3),
-	hunspell-uz (<< 0.6-3.1),
-	hunspell-vi (<< 1:3.1.0-3),
-	myspell-af (<< 1:3.1.0-3),
-	myspell-ca (<< 0.6-8),
-	myspell-cs-cz (<< 20040229-4.1),
-	myspell-da (<< 1.6.18-1.1),
-	myspell-de-at (<< 20071211-2), myspell-de-ch (<< 20071211-2), myspell-de-de (<< 20071211-2), myspell-de-de-oldspell (<< 1:2-25.1),
-	myspell-el-gr (<< 0.3-1.1),
-	myspell-en-au (<< 2.1-5), myspell-en-gb (<< 1:3.1.0-3), myspell-en-us (<< 1:3.1.0-3), myspell-en-za (<< 1:3.1.0-3),
-	myspell-eo (<< 2.1.2000.02.25-41),
-	myspell-es (<< 1.10-7),
-	myspell-et (<< 1:20030606-12.1),
-	myspell-fa (<< 0.20070816-2),
-	myspell-fi (<< 0.7-17.2),
-	myspell-fo (<< 0.2.36-3),
-	myspell-fr (<< 1.4-25), myspell-fr-gut (<< 1:1.0-26.1),
-	myspell-ga (<< 2.0-19),
-	myspell-gd (<< 0.50-7),
-	myspell-gv (<< 0.50-8),
-	myspell-hr (<< 20060617-2),
-	myspell-hu (<< 0.99.4-1.2),
-	myspell-hy (<< 0.10.1-1.1),
-	myspell-it (<< 1:3.1.0-3),
-	myspell-ku (<< 0.20.0-1.1),
-	myspell-lv (<< 0.7.3-3.1),
-	myspell-nb (<< 2.0.10-3.1),
-	myspell-ne (<< 1.0-4.1),
-	myspell-nl (<< 1:1.10-3),
-	myspell-nn (<< 2.0.10-3.1),
-	myspell-pl (<< 20090830-1),
-	myspell-pt-br (<< 2009.03.30-1.1), myspell-pt-pt (<< 20090309-1.1),
-	myspell-ru (<< 0.99g5-8.1),
-	myspell-sk (<< 0.5.5a-2.1),
-	myspell-sv-se (<< 1.3.8-6-2.2),
-	myspell-sw (<< 1:3.1.0-3),
-	myspell-th (<< 1:3.1.0-3),
-	myspell-tl (<< 0.4-0-5),
-	xul-ext-compactheader (<< 2.1.0~),
-	xul-ext-foxyproxy-standard (>> 3.4-1),
+Replaces:
+ icedove-gnome-support (<< 3.0-1~),
+Breaks:
+ enigmail (<< 2:1.8),
+ hunspell-ar (<< 0.0.0+20080110-1.1),
+ hunspell-da (<< 1:3.1.0-3),
+ hunspell-de-at (<< 20071211-2),
+ hunspell-de-ch (<< 20071211-2),
+ hunspell-de-de (<< 20071211-2),
+ hunspell-de-med (<< 20090825-1),
+ hunspell-en-ca (<< 1:3.1.0-3),
+ hunspell-en-us (<< 20070829-3),
+ hunspell-fr (<< 1:3.1.0-3),
+ hunspell-gl-es (<< 2.2a-6),
+ hunspell-hu (<< 1:3.1.0-3),
+ hunspell-ko (<< 0.3.3-1),
+ hunspell-ne (<< 1:3.1.0-3),
+ hunspell-se (<< 1.0~beta6.20081222-1.1),
+ hunspell-sh (<< 1:3.1.0-3),
+ hunspell-sr (<< 1:3.1.0-3),
+ hunspell-uz (<< 0.6-3.1),
+ hunspell-vi (<< 1:3.1.0-3),
+ icedove-gnome-support (<< 3.0-1~),
+ iceowl-extension (<< ${binary:Version}),
+ myspell-af (<< 1:3.1.0-3),
+ myspell-ca (<< 0.6-8),
+ myspell-cs-cz (<< 20040229-4.1),
+ myspell-da (<< 1.6.18-1.1),
+ myspell-de-at (<< 20071211-2),
+ myspell-de-ch (<< 20071211-2),
+ myspell-de-de (<< 20071211-2),
+ myspell-de-de-oldspell (<< 1:2-25.1),
+ myspell-el-gr (<< 0.3-1.1),
+ myspell-en-au (<< 2.1-5),
+ myspell-en-gb (<< 1:3.1.0-3),
+ myspell-en-us (<< 1:3.1.0-3),
+ myspell-en-za (<< 1:3.1.0-3),
+ myspell-eo (<< 2.1.2000.02.25-41),
+ myspell-es (<< 1.10-7),
+ myspell-et (<< 1:20030606-12.1),
+ myspell-fa (<< 0.20070816-2),
+ myspell-fi (<< 0.7-17.2),
+ myspell-fo (<< 0.2.36-3),
+ myspell-fr (<< 1.4-25),
+ myspell-fr-gut (<< 1:1.0-26.1),
+ myspell-ga (<< 2.0-19),
+ myspell-gd (<< 0.50-7),
+ myspell-gv (<< 0.50-8),
+ myspell-hr (<< 20060617-2),
+ myspell-hu (<< 0.99.4-1.2),
+ myspell-hy (<< 0.10.1-1.1),
+ myspell-it (<< 1:3.1.0-3),
+ myspell-ku (<< 0.20.0-1.1),
+ myspell-lv (<< 0.7.3-3.1),
+ myspell-nb (<< 2.0.10-3.1),
+ myspell-ne (<< 1.0-4.1),
+ myspell-nl (<< 1:1.10-3),
+ myspell-nn (<< 2.0.10-3.1),
+ myspell-pl (<< 20090830-1),
+ myspell-pt-br (<< 2009.03.30-1.1),
+ myspell-pt-pt (<< 20090309-1.1),
+ myspell-ru (<< 0.99g5-8.1),
+ myspell-sk (<< 0.5.5a-2.1),
+ myspell-sv-se (<< 1.3.8-6-2.2),
+ myspell-sw (<< 1:3.1.0-3),
+ myspell-th (<< 1:3.1.0-3),
+ myspell-tl (<< 0.4-0-5),
+ xul-ext-compactheader (<< 2.1.0~),
+ xul-ext-foxyproxy-standard (>> 3.4-1),
 Description: mail/news client with RSS and integrated spam filter support
  Icedove is an unbranded Thunderbird mail client suitable for free
  distribution. It supports different mail accounts (POP, IMAP, Gmail), has an
@@ -123,12 +151,13 @@ Description: mail/news client with RSS and integrated spam filter support
 
 Package: icedove-dev
 Architecture: any
-Depends: icedove (= ${binary:Version}),
-	${misc:Depends},
-	${shlibs:Depends},
-	python,
-	libnspr4-dev,
-	libnss3-dev
+Depends:
+ icedove (= ${binary:Version}),
+ libnspr4-dev,
+ libnss3-dev,
+ python,
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Development files for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free
  distribution. It supports different mail accounts (POP, IMAP, Gmail), has an
@@ -143,7 +172,9 @@ Package: icedove-dbg
 Architecture: any
 Priority: extra
 Section: debug
-Depends: icedove (= ${binary:Version}), ${misc:Depends}
+Depends:
+ icedove (= ${binary:Version}),
+ ${misc:Depends},
 Description: Debug Symbols for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free
  distribution. It supports different mail accounts (POP, IMAP, Gmail), has an
@@ -156,13 +187,19 @@ Description: Debug Symbols for Icedove
 
 Package: iceowl-extension
 Architecture: any
-Depends: icedove (>= ${binary:Version}),
- ${shlibs:Depends}, ${misc:Depends}
-Suggests: fonts-lyx,
- calendar-google-provider
-Provides: calendar-timezones
-Breaks: calendar-timezones
-Replaces: calendar-timezones
+Depends:
+ icedove (>= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Suggests:
+ calendar-google-provider,
+ fonts-lyx,
+Provides:
+ calendar-timezones,
+Breaks:
+ calendar-timezones,
+Replaces:
+ calendar-timezones,
 Description: Calendar Extension for Thunderbird/Icedove
  Iceowl Extension is an unbranded Lightning Calendar extension for
  Thunderbird/Icedove. It can handle events, event invitations and
@@ -172,10 +209,12 @@ Description: Calendar Extension for Thunderbird/Icedove
 
 Package: calendar-google-provider
 Architecture: all
-Depends: iceowl-extension (>= ${binary:Version}),
+Depends:
+ iceowl-extension (>= ${binary:Version}),
  ${misc:Depends},
-Enhances: iceowl-extension,
- icedove
+Enhances:
+ icedove,
+ iceowl-extension,
 Description: Google Calendar support for lightning- and iceowl-extension
  This extension adds support for accessing google calendars in Icedove
  via iceowl-extension.
@@ -187,7 +226,6 @@ Package: icedove-l10n-all
 Architecture: all
 Section: localization
 Depends:
- ${misc:Depends},
  icedove-l10n-ar,
  icedove-l10n-ast,
  icedove-l10n-be,
@@ -241,7 +279,8 @@ Depends:
  icedove-l10n-uk,
  icedove-l10n-vi,
  icedove-l10n-zh-cn,
- icedove-l10n-zh-tw
+ icedove-l10n-zh-tw,
+ ${misc:Depends},
 Description: All language packages for Icedove (meta)
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -253,9 +292,13 @@ Description: All language packages for Icedove (meta)
 Package: icedove-l10n-ar
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:ar
-Recommends: hunspell-ar
+Recommends:
+ hunspell-ar,
 Description: Arabic language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -266,7 +309,10 @@ Description: Arabic language package for Icedove
 Package: icedove-l10n-ast
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:ast
 Description: Asturian language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
@@ -278,7 +324,10 @@ Description: Asturian language package for Icedove
 Package: icedove-l10n-be
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:be
 Description: Belarusian language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
@@ -290,9 +339,13 @@ Description: Belarusian language package for Icedove
 Package: icedove-l10n-bg
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:bg
-Recommends: myspell-bg
+Recommends:
+ myspell-bg,
 Description: Bulgarian language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -303,7 +356,10 @@ Description: Bulgarian language package for Icedove
 Package: icedove-l10n-bn-bd
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:bd-BD
 Description: Bengali language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
@@ -315,7 +371,10 @@ Description: Bengali language package for Icedove
 Package: icedove-l10n-br
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:br
 Description: Breton language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
@@ -327,9 +386,13 @@ Description: Breton language package for Icedove
 Package: icedove-l10n-ca
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:ca
-Recommends: myspell-ca
+Recommends:
+ myspell-ca,
 Description: Catalan/Valencian language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -340,9 +403,13 @@ Description: Catalan/Valencian language package for Icedove
 Package: icedove-l10n-cs
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:cs
-Recommends: myspell-cs-cz
+Recommends:
+ myspell-cs-cz,
 Description: Czech language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -353,9 +420,13 @@ Description: Czech language package for Icedove
 Package: icedove-l10n-da
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:da
-Recommends: myspell-da | hunspell-da
+Recommends:
+ myspell-da | hunspell-da,
 Description: Danish language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -366,9 +437,13 @@ Description: Danish language package for Icedove
 Package: icedove-l10n-de
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:de
-Recommends: hunspell-de-de | hunspell-de-at | hunspell-de-ch
+Recommends:
+ hunspell-de-de | hunspell-de-at | hunspell-de-ch,
 Description: German language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -379,9 +454,13 @@ Description: German language package for Icedove
 Package: icedove-l10n-el
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:el
-Recommends: myspell-el-gr
+Recommends:
+ myspell-el-gr,
 Description: Greek language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -392,9 +471,13 @@ Description: Greek language package for Icedove
 Package: icedove-l10n-en-gb
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:en-GB
-Recommends: myspell-en-gb | myspell-en-us | hunspell-en-us
+Recommends:
+ myspell-en-gb | myspell-en-us | hunspell-en-us,
 Description: English (Great Britain) language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -405,9 +488,13 @@ Description: English (Great Britain) language package for Icedove
 Package: icedove-l10n-es-ar
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:es-AR
-Recommends: myspell-es
+Recommends:
+ myspell-es,
 Description: Spanish (Argentina) language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -418,9 +505,13 @@ Description: Spanish (Argentina) language package for Icedove
 Package: icedove-l10n-es-es
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:es-ES
-Recommends: myspell-es
+Recommends:
+ myspell-es,
 Description: Spanish (Spain) language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -431,9 +522,13 @@ Description: Spanish (Spain) language package for Icedove
 Package: icedove-l10n-et
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:et
-Recommends: myspell-et
+Recommends:
+ myspell-et,
 Description: Estonian language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -444,7 +539,10 @@ Description: Estonian language package for Icedove
 Package: icedove-l10n-eu
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:eu
 Description: Basque language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
@@ -456,9 +554,13 @@ Description: Basque language package for Icedove
 Package: icedove-l10n-fi
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:fi
-Recommends: myspell-fi
+Recommends:
+ myspell-fi,
 Description: Finnish language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -469,9 +571,13 @@ Description: Finnish language package for Icedove
 Package: icedove-l10n-fr
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:fr
-Recommends: myspell-fr | myspell-fr-gut | hunspell-fr
+Recommends:
+ myspell-fr | myspell-fr-gut | hunspell-fr,
 Description: French language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -482,7 +588,10 @@ Description: French language package for Icedove
 Package: icedove-l10n-fy-nl
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:fy-NL
 Description: Frisian language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
@@ -494,7 +603,10 @@ Description: Frisian language package for Icedove
 Package: icedove-l10n-ga-ie
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:ga-IE
 Description: Irish (Ireland) language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
@@ -506,9 +618,13 @@ Description: Irish (Ireland) language package for Icedove
 Package: icedove-l10n-gd
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:gd
-Recommends: myspell-gd
+Recommends:
+ myspell-gd,
 Description: Gaelic (Scottish) language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -519,9 +635,13 @@ Description: Gaelic (Scottish) language package for Icedove
 Package: icedove-l10n-gl
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:gl
-Recommends: hunspell-gl-es
+Recommends:
+ hunspell-gl-es,
 Description: Galician language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -532,9 +652,13 @@ Description: Galician language package for Icedove
 Package: icedove-l10n-he
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:he
-Recommends: myspell-he
+Recommends:
+ myspell-he,
 Description: Hebrew language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -545,9 +669,13 @@ Description: Hebrew language package for Icedove
 Package: icedove-l10n-hr
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:hr
-Recommends: myspell-hr
+Recommends:
+ myspell-hr,
 Description: Croatian language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -558,9 +686,13 @@ Description: Croatian language package for Icedove
 Package: icedove-l10n-hu
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:hu
-Recommends: myspell-hu | hunspell-hu
+Recommends:
+ myspell-hu | hunspell-hu,
 Description: Hungarian language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -571,9 +703,13 @@ Description: Hungarian language package for Icedove
 Package: icedove-l10n-hy-am
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:hy-AM
-Recommends: myspell-hy
+Recommends:
+ myspell-hy,
 Description: Armenian language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -584,7 +720,10 @@ Description: Armenian language package for Icedove
 Package: icedove-l10n-id
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:id
 Description: Indonesian language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
@@ -596,7 +735,10 @@ Description: Indonesian language package for Icedove
 Package: icedove-l10n-is
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:is
 Description: Icelandic language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
@@ -608,9 +750,13 @@ Description: Icelandic language package for Icedove
 Package: icedove-l10n-it
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:it
-Recommends: myspell-it
+Recommends:
+ myspell-it,
 Description: Italian language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -621,7 +767,10 @@ Description: Italian language package for Icedove
 Package: icedove-l10n-ja
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:ja
 Description: Japanese language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
@@ -633,9 +782,13 @@ Description: Japanese language package for Icedove
 Package: icedove-l10n-ko
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:ko
-Recommends: hunspell-ko
+Recommends:
+ hunspell-ko,
 Description: Korean language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -646,9 +799,13 @@ Description: Korean language package for Icedove
 Package: icedove-l10n-lt
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:lt
-Recommends: myspell-lt
+Recommends:
+ myspell-lt,
 Description: Lithuanian language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -659,9 +816,13 @@ Description: Lithuanian language package for Icedove
 Package: icedove-l10n-nb-no
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:nb-NO
-Recommends: myspell-nb
+Recommends:
+ myspell-nb,
 Description: Bokmaal (Norway) language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -672,9 +833,13 @@ Description: Bokmaal (Norway) language package for Icedove
 Package: icedove-l10n-nl
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:nl
-Recommends: myspell-nl
+Recommends:
+ myspell-nl,
 Description: Dutch language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -685,9 +850,13 @@ Description: Dutch language package for Icedove
 Package: icedove-l10n-nn-no
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:nn-NO
-Recommends: myspell-nn
+Recommends:
+ myspell-nn,
 Description: Nynorsk (Norway) language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -698,7 +867,10 @@ Description: Nynorsk (Norway) language package for Icedove
 Package: icedove-l10n-pa-in
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:pa
 Description: Punjabi (India) language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
@@ -710,9 +882,13 @@ Description: Punjabi (India) language package for Icedove
 Package: icedove-l10n-pl
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:pl
-Recommends: myspell-pl
+Recommends:
+ myspell-pl,
 Description: Polish language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -723,9 +899,13 @@ Description: Polish language package for Icedove
 Package: icedove-l10n-pt-br
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:pt-BR
-Recommends: myspell-pt-br | myspell-pt
+Recommends:
+ myspell-pt-br | myspell-pt,
 Description: Portuguese (Brazil) language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -736,9 +916,13 @@ Description: Portuguese (Brazil) language package for Icedove
 Package: icedove-l10n-pt-pt
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:pt-PT
-Recommends: myspell-pt-pt | myspell-pt
+Recommends:
+ myspell-pt-pt | myspell-pt,
 Description: Portuguese (Portugal) language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -749,7 +933,10 @@ Description: Portuguese (Portugal) language package for Icedove
 Package: icedove-l10n-rm
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:rm
 Description: Romansh language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
@@ -761,9 +948,13 @@ Description: Romansh language package for Icedove
 Package: icedove-l10n-ro
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:ro
-Recommends: hunspell-ro
+Recommends:
+ hunspell-ro,
 Description: Romania language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -774,9 +965,13 @@ Description: Romania language package for Icedove
 Package: icedove-l10n-ru
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:ru
-Recommends: myspell-ru
+Recommends:
+ myspell-ru,
 Description: Russian language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -787,7 +982,10 @@ Description: Russian language package for Icedove
 Package: icedove-l10n-si
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:si
 Description: Sinhala language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
@@ -799,9 +997,13 @@ Description: Sinhala language package for Icedove
 Package: icedove-l10n-sk
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:sk
-Recommends: myspell-sk
+Recommends:
+ myspell-sk,
 Description: Slovak language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -812,9 +1014,13 @@ Description: Slovak language package for Icedove
 Package: icedove-l10n-sl
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:sl
-Recommends: myspell-sl
+Recommends:
+ myspell-sl,
 Description: Slovenian language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -825,7 +1031,10 @@ Description: Slovenian language package for Icedove
 Package: icedove-l10n-sq
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:sq
 Description: Albanian language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
@@ -837,9 +1046,13 @@ Description: Albanian language package for Icedove
 Package: icedove-l10n-sr
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:sr
-Recommends: hunspell-sr
+Recommends:
+ hunspell-sr,
 Description: Serbian language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -850,9 +1063,13 @@ Description: Serbian language package for Icedove
 Package: icedove-l10n-sv-se
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:sv-SE
-Recommends: myspell-sv-se
+Recommends:
+ myspell-sv-se,
 Description: Swedish (Sweden) language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -863,7 +1080,10 @@ Description: Swedish (Sweden) language package for Icedove
 Package: icedove-l10n-ta-lk
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:ta-LK
 Description: Tamil language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
@@ -875,7 +1095,10 @@ Description: Tamil language package for Icedove
 Package: icedove-l10n-tr
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:tr
 Description: Turkish language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
@@ -887,7 +1110,10 @@ Description: Turkish language package for Icedove
 Package: icedove-l10n-uk
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:uk
 Description: Ukrainian language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
@@ -899,9 +1125,13 @@ Description: Ukrainian language package for Icedove
 Package: icedove-l10n-vi
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:vi
-Recommends: hunspell-vi
+Recommends:
+ hunspell-vi,
 Description: Vietnamese language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
  The goal of Thunderbird is to produce a cross platform stand-alone mail
@@ -912,7 +1142,10 @@ Description: Vietnamese language package for Icedove
 Package: icedove-l10n-zh-cn
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:zh-CN
 Description: Chinese (China) language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
@@ -924,7 +1157,10 @@ Description: Chinese (China) language package for Icedove
 Package: icedove-l10n-zh-tw
 Architecture: all
 Section: localization
-Depends: ${misc:Depends}, icedove (>= ${source:Version}), icedove (<< ${source:Version}.1~)
+Depends:
+ icedove (<< ${source:Version}.1~),
+ icedove (>= ${source:Version}),
+ ${misc:Depends},
 Homepage: https://wiki.mozilla.org/L10n:Teams:zh-TW
 Description: Chinese (Taiwan) language package for Icedove
  Icedove is an unbranded Thunderbird mail client suitable for free distribution.
@@ -936,9 +1172,12 @@ Description: Chinese (Taiwan) language package for Icedove
 Package: iceowl-l10n-ar
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-ar
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-ar,
 Description: Arabic language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -949,9 +1188,12 @@ Description: Arabic language package for iceowl-extension
 Package: iceowl-l10n-be
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-be
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-be,
 Description: Belarusian language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -962,9 +1204,12 @@ Description: Belarusian language package for iceowl-extension
 Package: iceowl-l10n-bg
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-bg | myspell-bg
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-bg | myspell-bg,
 Description: Bulgarian language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -975,9 +1220,12 @@ Description: Bulgarian language package for iceowl-extension
 Package: iceowl-l10n-bn-bd
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-bn
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-bn,
 Description: Bengali (Bangladesh) language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -989,9 +1237,12 @@ Description: Bengali (Bangladesh) language package for iceowl-extension
 Package: iceowl-l10n-br
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-br
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-br,
 Description: Breton language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1002,9 +1253,12 @@ Description: Breton language package for iceowl-extension
 Package: iceowl-l10n-ca
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-ca | myspell-ca
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-ca | myspell-ca,
 Description: Catalan/Valencian language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1016,9 +1270,12 @@ Description: Catalan/Valencian language package for iceowl-extension
 Package: iceowl-l10n-cs
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-cs | myspell-cs-cz
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-cs | myspell-cs-cz,
 Description: Czech language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1029,8 +1286,10 @@ Description: Czech language package for iceowl-extension
 Package: iceowl-l10n-cy
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
 Description: Welsh language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1041,9 +1300,12 @@ Description: Welsh language package for iceowl-extension
 Package: iceowl-l10n-da
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: myspell-da | hunspell-da
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ myspell-da | hunspell-da,
 Description: Danish language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1054,10 +1316,12 @@ Description: Danish language package for iceowl-extension
 Package: iceowl-l10n-de
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-de-de | hunspell-de-at | hunspell-de-ch |
- myspell-de-de | myspell-de-at | myspell-de-ch
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-de-de | hunspell-de-at | hunspell-de-ch | myspell-de-de | myspell-de-at | myspell-de-ch,
 Description: German language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1068,9 +1332,12 @@ Description: German language package for iceowl-extension
 Package: iceowl-l10n-el
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-el | myspell-el-gr
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-el | myspell-el-gr,
 Description: Greek language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1081,9 +1348,12 @@ Description: Greek language package for iceowl-extension
 Package: iceowl-l10n-es-ar
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-es | myspell-es
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-es | myspell-es,
 Description: Spanish (Argentina) language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1095,9 +1365,12 @@ Description: Spanish (Argentina) language package for iceowl-extension
 Package: iceowl-l10n-es-es
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-es | myspell-es
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-es | myspell-es,
 Description: Spanish (Spain) language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1108,9 +1381,12 @@ Description: Spanish (Spain) language package for iceowl-extension
 Package: iceowl-l10n-en-gb
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-en-gb | hunspell-en-au | hunspell-en-ca | hunspell-en-za
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-en-gb | hunspell-en-au | hunspell-en-ca | hunspell-en-za,
 Description: British English language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1121,9 +1397,12 @@ Description: British English language package for iceowl-extension
 Package: iceowl-l10n-et
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: myspell-et
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ myspell-et,
 Description: Estonian language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1134,9 +1413,12 @@ Description: Estonian language package for iceowl-extension
 Package: iceowl-l10n-eu
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-eu
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-eu,
 Description: Basque language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1147,9 +1429,13 @@ Description: Basque language package for iceowl-extension
 Package: iceowl-l10n-fi
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: myspell-fi, xul-ext-mozvoikko
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ myspell-fi,
+ xul-ext-mozvoikko,
 Description: Finnish language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1160,9 +1446,12 @@ Description: Finnish language package for iceowl-extension
 Package: iceowl-l10n-fr
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-fr | myspell-fr | myspell-fr-gut
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-fr | myspell-fr | myspell-fr-gut,
 Description: French language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1173,8 +1462,10 @@ Description: French language package for iceowl-extension
 Package: iceowl-l10n-fy-nl
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
 Description: Western Frisian language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1185,8 +1476,10 @@ Description: Western Frisian language package for iceowl-extension
 Package: iceowl-l10n-ga-ie
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
 Description: Irish (Ireland) language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1197,9 +1490,12 @@ Description: Irish (Ireland) language package for iceowl-extension
 Package: iceowl-l10n-gd
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-gd
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-gd,
 Description: Scottish Gaelic language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1210,9 +1506,12 @@ Description: Scottish Gaelic language package for iceowl-extension
 Package: iceowl-l10n-gl
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-gl | hunspell-gl-es
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-gl | hunspell-gl-es,
 Description: Galician language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1223,9 +1522,12 @@ Description: Galician language package for iceowl-extension
 Package: iceowl-l10n-he
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-he | myspell-he
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-he | myspell-he,
 Description: Hebrew language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1236,9 +1538,12 @@ Description: Hebrew language package for iceowl-extension
 Package: iceowl-l10n-hr
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-hr | myspell-hr
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-hr | myspell-hr,
 Description: Croatian language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1249,9 +1554,12 @@ Description: Croatian language package for iceowl-extension
 Package: iceowl-l10n-hu
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-hu | myspell-hu
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-hu | myspell-hu,
 Description: Hungarian language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1262,9 +1570,12 @@ Description: Hungarian language package for iceowl-extension
 Package: iceowl-l10n-hy-am
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: myspell-hy
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ myspell-hy,
 Description: Armenian language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1276,8 +1587,10 @@ Description: Armenian language package for iceowl-extension
 Package: iceowl-l10n-id
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
 Description: Indonesian language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1288,9 +1601,12 @@ Description: Indonesian language package for iceowl-extension
 Package: iceowl-l10n-is
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-is
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-is,
 Description: Icelandic language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1301,9 +1617,12 @@ Description: Icelandic language package for iceowl-extension
 Package: iceowl-l10n-it
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-it | myspell-it
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-it | myspell-it,
 Description: Italian language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1314,9 +1633,12 @@ Description: Italian language package for iceowl-extension
 Package: iceowl-l10n-ko
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-ko
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-ko,
 Description: Korean language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1327,8 +1649,10 @@ Description: Korean language package for iceowl-extension
 Package: iceowl-l10n-ja
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
 Description: Japanese language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1339,9 +1663,12 @@ Description: Japanese language package for iceowl-extension
 Package: iceowl-l10n-lt
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-lt | myspell-lt
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-lt | myspell-lt,
 Description: Lithuanian language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1352,9 +1679,12 @@ Description: Lithuanian language package for iceowl-extension
 Package: iceowl-l10n-nb-no
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-no | myspell-nb
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-no | myspell-nb,
 Description: Bokmaal (Norway) language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1366,9 +1696,12 @@ Description: Bokmaal (Norway) language package for iceowl-extension
 Package: iceowl-l10n-nl
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-nl | myspell-nl
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-nl | myspell-nl,
 Description: Dutch language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1379,9 +1712,12 @@ Description: Dutch language package for iceowl-extension
 Package: iceowl-l10n-nn-no
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-no | myspell-nn
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-no | myspell-nn,
 Description: Nynorsk (Norway) language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1393,8 +1729,10 @@ Description: Nynorsk (Norway) language package for iceowl-extension
 Package: iceowl-l10n-pa-in
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
 Description: Punjabi language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1405,9 +1743,12 @@ Description: Punjabi language package for iceowl-extension
 Package: iceowl-l10n-pl
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-pl | myspell-pl
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-pl | myspell-pl,
 Description: Polish language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1418,9 +1759,12 @@ Description: Polish language package for iceowl-extension
 Package: iceowl-l10n-pt-br
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-pt-br | myspell-pt-br | myspell-pt
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-pt-br | myspell-pt-br | myspell-pt,
 Description: Portuguese (Brazil) language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1432,9 +1776,12 @@ Description: Portuguese (Brazil) language package for iceowl-extension
 Package: iceowl-l10n-pt-pt
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-pt-br | myspell-pt-pt | myspell-pt
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-pt-br | myspell-pt-pt | myspell-pt,
 Description: Portuguese (Portugal) language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1446,8 +1793,10 @@ Description: Portuguese (Portugal) language package for iceowl-extension
 Package: iceowl-l10n-rm
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
 Description: Romansh language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1458,9 +1807,12 @@ Description: Romansh language package for iceowl-extension
 Package: iceowl-l10n-ro
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-ro
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-ro,
 Description: Romanian language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1471,9 +1823,12 @@ Description: Romanian language package for iceowl-extension
 Package: iceowl-l10n-ru
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-ru | myspell-ru
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-ru | myspell-ru,
 Description: Russian language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1484,9 +1839,12 @@ Description: Russian language package for iceowl-extension
 Package: iceowl-l10n-si
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-si
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-si,
 Description: Sinhala language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1497,9 +1855,12 @@ Description: Sinhala language package for iceowl-extension
 Package: iceowl-l10n-sk
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-sk | myspell-sk
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-sk | myspell-sk,
 Description: Slovak language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1510,9 +1871,12 @@ Description: Slovak language package for iceowl-extension
 Package: iceowl-l10n-sl
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-si | myspell-sl
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-si | myspell-sl,
 Description: Slovenian language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1523,9 +1887,12 @@ Description: Slovenian language package for iceowl-extension
 Package: iceowl-l10n-sr
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-sr
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-sr,
 Description: Serbian language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1536,8 +1903,10 @@ Description: Serbian language package for iceowl-extension
 Package: iceowl-l10n-sq
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
 Description: Albanian language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1548,9 +1917,12 @@ Description: Albanian language package for iceowl-extension
 Package: iceowl-l10n-sv-se
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-sv | myspell-sv-se
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-sv | myspell-sv-se,
 Description: Swedish language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1561,8 +1933,10 @@ Description: Swedish language package for iceowl-extension
 Package: iceowl-l10n-ta-lk
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
 Description: Tamil language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1574,8 +1948,10 @@ Description: Tamil language package for iceowl-extension
 Package: iceowl-l10n-tr
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
 Description: Turkish language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1586,9 +1962,12 @@ Description: Turkish language package for iceowl-extension
 Package: iceowl-l10n-uk
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-uk | myspell-uk
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-uk | myspell-uk,
 Description: Ukrainian language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1599,9 +1978,12 @@ Description: Ukrainian language package for iceowl-extension
 Package: iceowl-l10n-vi
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
-Recommends: hunspell-vi
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ hunspell-vi,
 Description: Vietnamese language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1612,8 +1994,10 @@ Description: Vietnamese language package for iceowl-extension
 Package: iceowl-l10n-zh-cn
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
 Description: Chinese (China) language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
@@ -1624,8 +2008,10 @@ Description: Chinese (China) language package for iceowl-extension
 Package: iceowl-l10n-zh-tw
 Architecture: all
 Section: localization
-Depends: ${misc:Depends},
- iceowl-extension (>= ${source:Version}), iceowl-extension (<< ${source:Version}.1~)
+Depends:
+ iceowl-extension (<< ${source:Version}.1~),
+ iceowl-extension (>= ${source:Version}),
+ ${misc:Depends},
 Description: Chinese (Taiwan) language package for iceowl-extension
  The iceowl-extension is a Mozilla based calendar extension for Icedove.
  It's goal is to integrate a Calendar and Task application using the XUL
diff --git a/debian/copyright b/debian/copyright
index aea118d..243f44f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1759,7 +1759,7 @@ Copyright: 2013, Tensilica, Inc.
 License: Expat
 
 Files: mozilla/js/src/ctypes/libffi/texinfo.tex
-Copyright: 1985-1986, 1988, 1990-1995, 
+Copyright: 1985-1986, 1988, 1990-1995,
 License: GPL-3
 
 Files: mozilla/js/src/devtools/rootAnalysis/analyze.py
@@ -2629,7 +2629,7 @@ License: BSD-3-clause
 
 Files: mozilla/netwerk/sctp/src/netinet/sctp_sha1.c
 Copyright: 2013, Lally Singh
-           2008-2013, Michael Tuexen 
+           2008-2013, Michael Tuexen
            2008-2012, Randall Stewart
            2001-2007, Cisco Systems, Inc.
 License: BSD-3-clause
diff --git a/debian/icedove-dev.install b/debian/icedove-dev.install
index 46479c8..e47d77a 100644
--- a/debian/icedove-dev.install
+++ b/debian/icedove-dev.install
@@ -2,5 +2,5 @@ debian/icedove.pc                  usr/lib/pkgconfig/
 debian/tmp/usr/include/icedove/*   usr/include/icedove/
 debian/tmp/usr/lib/icedove-devel   usr/lib/
 debian/tmp/usr/share/idl/icedove/* usr/share/idl/icedove/
-mozilla/python/mozbuild/mozbuild/action/buildlist.py        usr/lib/icedove-devel/config/
 mozilla/config/MozZipFile.py       usr/lib/icedove-devel/config/
+mozilla/python/mozbuild/mozbuild/action/buildlist.py        usr/lib/icedove-devel/config/
diff --git a/debian/icedove-dev.links b/debian/icedove-dev.links
index e1687d4..7cec870 100644
--- a/debian/icedove-dev.links
+++ b/debian/icedove-dev.links
@@ -1,4 +1,4 @@
-usr/lib/icedove/libprldap60.so   usr/lib/icedove-devel/sdk/lib/libprldap60.so
 usr/lib/icedove/libldap60.so     usr/lib/icedove-devel/sdk/lib/libldap60.so
 usr/lib/icedove/libldif60.so     usr/lib/icedove-devel/sdk/lib/libldif60.so
+usr/lib/icedove/libprldap60.so   usr/lib/icedove-devel/sdk/lib/libprldap60.so
 usr/lib/icedove/libxul.so        usr/lib/icedove-devel/sdk/lib/libxul.so
diff --git a/debian/icedove.install b/debian/icedove.install
index d1a33a0..b3dfb0e 100644
--- a/debian/icedove.install
+++ b/debian/icedove.install
@@ -1,21 +1,17 @@
+debian/account-autoconfig/*                   usr/share/icedove/isp
+debian/icedove.desktop                        usr/share/applications
+debian/icedove.js                             etc/icedove/pref
+debian/tmp/usr/lib/icedove/*.ini
 debian/tmp/usr/lib/icedove/blocklist.xml
+debian/tmp/usr/lib/icedove/chrome             usr/share/icedove
+debian/tmp/usr/lib/icedove/defaults/messenger usr/share/icedove/defaults
+debian/tmp/usr/lib/icedove/defaults/pref      usr/share/icedove/defaults
 debian/tmp/usr/lib/icedove/dependentlibs.list
 debian/tmp/usr/lib/icedove/icedove*
+debian/tmp/usr/lib/icedove/isp                usr/share/icedove
 debian/tmp/usr/lib/icedove/lib*
-debian/tmp/usr/lib/icedove/*.ini
+debian/tmp/usr/lib/icedove/omni.ja            usr/share/icedove
 debian/tmp/usr/lib/icedove/plugin-container
 debian/tmp/usr/lib/icedove/removed-files
 debian/tmp/usr/lib/icedove/run-mozilla.sh
-
-debian/tmp/usr/lib/icedove/chrome             usr/share/icedove
-debian/tmp/usr/lib/icedove/isp                usr/share/icedove
-debian/tmp/usr/lib/icedove/omni.ja            usr/share/icedove
-
-debian/tmp/usr/lib/icedove/defaults/pref      usr/share/icedove/defaults
-debian/tmp/usr/lib/icedove/defaults/messenger usr/share/icedove/defaults
-
-debian/icedove.js                             etc/icedove/pref
 debian/vendor.js                              usr/share/icedove/defaults/pref
-debian/icedove.desktop                        usr/share/applications
-
-debian/account-autoconfig/*                   usr/share/icedove/isp
diff --git a/debian/icedove.links b/debian/icedove.links
index 7acab4f..bdeee7e 100644
--- a/debian/icedove.links
+++ b/debian/icedove.links
@@ -1,9 +1,7 @@
+/etc/icedove/pref               /usr/share/icedove/defaults/syspref
+/usr/share/hunspell             /usr/lib/icedove/dictionaries
 usr/lib/icedove/icedove         usr/bin/icedove
 usr/share/icedove/chrome        usr/lib/icedove/chrome
 usr/share/icedove/defaults      usr/lib/icedove/defaults
 usr/share/icedove/isp           usr/lib/icedove/isp
 usr/share/icedove/omni.ja       usr/lib/icedove/omni.ja
-
-/etc/icedove/pref               /usr/share/icedove/defaults/syspref
-
-/usr/share/hunspell             /usr/lib/icedove/dictionaries
diff --git a/debian/iceowl-extension.dirs b/debian/iceowl-extension.dirs
index e2d07aa..9880eb6 100644
--- a/debian/iceowl-extension.dirs
+++ b/debian/iceowl-extension.dirs
@@ -1,3 +1,3 @@
-usr/lib/thunderbird/extensions/
 usr/lib/icedove/extensions/
+usr/lib/thunderbird/extensions/
 usr/share/iceowl-extension/chrome
diff --git a/debian/iceowl-extension.links b/debian/iceowl-extension.links
index 1c8bc8a..73e642c 100644
--- a/debian/iceowl-extension.links
+++ b/debian/iceowl-extension.links
@@ -1,3 +1,2 @@
-usr/lib/iceowl-extension usr/lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}
 usr/lib/iceowl-extension usr/lib/icedove/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}
-
+usr/lib/iceowl-extension usr/lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}
-- 
2.8.1

Reply via email to