Backed out changeset 30c2520e5b0e (bug 1893603) by request DONTBUILD

--HG--
extra : amend_source : 3ee8cf607b67a00cf7b2694f69ad60425d2ee381

mail/installer/linux/app/debian/changelog.in

@@ -1,5 +0,0 @@
-${DEB_PKG_NAME} (${DEB_PKG_VERSION}) UNRELEASED; urgency=medium
-
-  * N/A
-
- -- Daniel Darnell <daniel@thunderbird.net>  ${DEB_CHANGELOG_DATE}

mail/installer/linux/app/debian/compat

@@ -1 +0,0 @@
-9

mail/installer/linux/app/debian/control.in

@@ -1,10 +0,0 @@
-Source: ${DEB_PKG_NAME}
-Maintainer: Daniel Darnell <daniel@thunderbird.net>
-Priority: optional
-Section: mail
-Build-Depends: debhelper (>= 9)
-
-Package: ${DEB_PKG_NAME}
-Architecture: ${DEB_ARCH_NAME}
-Depends: ${DEB_DEPENDS}
-Description: ${DEB_DESCRIPTION}

mail/installer/linux/app/debian/distribution.ini

@@ -1,9 +0,0 @@
-[Global]
-id=thunderbird-deb
-version=1.0
-about=Mozilla Thunderbird Debian Package
-about.en-US=Mozilla Thunderbird Debian Package en-US
-
-[Preferences]
-intl.locale.requested=""
-mail.shell.checkDefaultClient=false

mail/installer/linux/app/debian/install.in

@@ -1,2 +0,0 @@
-thunderbird/* ${DEB_PKG_INSTALL_PATH}
-debian/${DEB_PKG_NAME}.desktop usr/share/applications

mail/installer/linux/app/debian/links.in

@@ -1,9 +0,0 @@
-${DEB_PKG_INSTALL_PATH}/thunderbird usr/bin/${DEB_PKG_NAME}
-${DEB_PKG_INSTALL_PATH}/chrome/icons/default/default16.png usr/share/icons/hicolor/16x16/apps/org.mozilla.Thunderbird.png
-${DEB_PKG_INSTALL_PATH}/chrome/icons/default/default22.png usr/share/icons/hicolor/22x22/apps/org.mozilla.Thunderbird.png
-${DEB_PKG_INSTALL_PATH}/chrome/icons/default/default24.png usr/share/icons/hicolor/24x24/apps/org.mozilla.Thunderbird.png
-${DEB_PKG_INSTALL_PATH}/chrome/icons/default/default32.png usr/share/icons/hicolor/32x32/apps/org.mozilla.Thunderbird.png
-${DEB_PKG_INSTALL_PATH}/chrome/icons/default/default48.png usr/share/icons/hicolor/48x48/apps/org.mozilla.Thunderbird.png
-${DEB_PKG_INSTALL_PATH}/chrome/icons/default/default64.png usr/share/icons/hicolor/64x64/apps/org.mozilla.Thunderbird.png
-${DEB_PKG_INSTALL_PATH}/chrome/icons/default/default128.png usr/share/icons/hicolor/128x128/apps/org.mozilla.Thunderbird.png
-${DEB_PKG_INSTALL_PATH}/chrome/icons/default/default256.png usr/share/icons/hicolor/256x256/apps/org.mozilla.Thunderbird.png

mail/installer/linux/app/debian/package-prefs.js

@@ -1,6 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-// eslint-disable-next-line no-undef
-pref("dom.ipc.forkserver.enable", true);

mail/installer/linux/app/debian/rules

@@ -1,7 +0,0 @@
-#!/usr/bin/make -f
-
-%:
-	dh $@
-
-override_dh_strip_nondeterminism:
-	dh_strip_nondeterminism -Xxpi

mail/installer/linux/app/debian/thunderbird.desktop.in

@@ -1,199 +0,0 @@
-[Desktop Entry]
-Name=${DEB_DISPLAY_NAME}
-Comment=Send and receive mail with Thunderbird
-Comment[bg]=Изпращане и получаване на  е-поща с Thunderbird
-Comment[ca]=Envieu i rebeu missatges de correu amb el Thunderbird
-Comment[cs]=Odesílání a přijímání pošty pomocí Thunderbirdu
-Comment[cy]=Anfon a derbyn e-bost gyda Thunderbird
-Comment[da]=Send og modtag mails med Thunderbird
-Comment[de]=E-Mails mit Thunderbird senden und empfangen
-Comment[dsb]=E-mail z Thunderbird pósłaś a dostaś
-Comment[el]=Αποστολή και λήψη email με το Thunderbird
-Comment[en-CA]=Send and receive mail with Thunderbird
-Comment[en-GB]=Send and receive mail with Thunderbird
-Comment[es-AR]=Enviar y recibir correo con Thunderbird
-Comment[es-ES]=Enviar y recibir correo con Thunderbird
-Comment[eu]=Bidali eta jaso postak Thunderbirdekin
-Comment[fi]=Lähetä ja vastaanota sähköpostia Thunderbirdillä
-Comment[fr]=Envoyez et recevez des e-mails avec Thunderbird
-Comment[fy-NL]=E-mailberjochten ferstjoere en ûntfange mei Thunderbird
-Comment[gd]=Cuir is faigh post le Thunderbird
-Comment[gl]=Enviar e recibir correo con Thunderbird
-Comment[hr]=Šaljite i primajte e-poštu s Thunderbird
-Comment[hsb]=E-mejl z Thunderbird pósłać a dóstać
-Comment[hu]=Levelek küldése és fogadása a Thunderbird segítségével
-Comment[is]=Sendu og taktu á móti tölvupósti með Thunderbird
-Comment[it]=Invia e ricevi posta con Thunderbird
-Comment[ja]=Thunderbird でメールを送受信します
-Comment[ka]=წერილების მისაღებად და გასაგზავნად გამოიყენეთ Thunderbird
-Comment[kab]=Azen, tenremseḍ imaylen s Thunderbird
-Comment[kk]=Thunderbird арқылы поштаны жіберу және алу
-Comment[nb-NO]=Send og motta e-post med Thunderbird
-Comment[nl]=E-mailberichten verzenden en ontvangen met Thunderbird
-Comment[nn-NO]=Send og ta imot e-post med Thunderbird
-Comment[pl]=Wysyłaj i odbieraj pocztę za pomocą Thunderbirda
-Comment[pt-BR]=Envie e receba emails com o Thunderbird
-Comment[pt-PT]=Enviar e receber correio com o Thunderbird
-Comment[rm]=Trametter e retschaiver e-mails cun Thunderbird
-Comment[ru]=Отправка и получение почты через Thunderbird
-Comment[sk]=Odosielanie a prijímanie pošty pomocou Thunderbirdu
-Comment[sl]=Pošiljajte in prejemajte pošto s Thunderbirdom
-Comment[sq]=Dërgoni dhe merrni email-e me Thunderbird
-Comment[sv-SE]=Skicka och ta emot e-post med Thunderbird
-Comment[tr]=Thunderbird ile e-posta gönderip alın
-Comment[uk]=Надсилайте й отримуйте листи за допомогою Thunderbird
-Comment[vi]=Gửi và nhận thư với Thunderbird
-Comment[zh-CN]=使用 Thunderbird 收发邮件
-Comment[zh-TW]=使用 Thunderbird 收發郵件
-GenericName=Mail Client
-GenericName[bg]=Пощенски клиент
-GenericName[ca]=Client de correu
-GenericName[cs]=Poštovní klient
-GenericName[cy]=Rhaglen E-bost
-GenericName[da]=Mailklient
-GenericName[de]=E-Mail-Client
-GenericName[dsb]=E-mailowy klient
-GenericName[el]=Πρόγραμμα email
-GenericName[en-CA]=Mail Client
-GenericName[en-GB]=Mail Client
-GenericName[es-AR]=Cliente de correo
-GenericName[es-ES]=Cliente de correo
-GenericName[eu]=Posta elektroniko bezeroa
-GenericName[fi]=Sähköpostiohjelma
-GenericName[fr]=Client e-mail
-GenericName[fy-NL]=E-mailclient
-GenericName[gd]=Cliant puist
-GenericName[gl]=Cliente de correo
-GenericName[hr]=Klijent e-pošte
-GenericName[hsb]=E-mejlowy klient
-GenericName[hu]=Levelezőkliens
-GenericName[is]=Tölvupóstforrit
-GenericName[it]=Client di posta
-GenericName[ja]=メールクライアント
-GenericName[ka]=საფოსტო პროგრამა
-GenericName[kab]=Amsaɣ n yimayl
-GenericName[kk]=Пошта клиенті
-GenericName[nb-NO]=E-postklient
-GenericName[nl]=E-mailclient
-GenericName[nn-NO]=E-postklient
-GenericName[pl]=Klient poczty
-GenericName[pt-BR]=Cliente de email
-GenericName[pt-PT]=Cliente de Correio
-GenericName[rm]=Client dad e-mail
-GenericName[ru]=Почтовый клиент
-GenericName[sk]=Poštový klient
-GenericName[sl]=Poštni odjemalec
-GenericName[sq]=Klient Poste
-GenericName[sv-SE]=E-postklient
-GenericName[tr]=E-posta istemcisi
-GenericName[uk]=Поштовий клієнт
-GenericName[vi]=Ứng dụng thư
-GenericName[zh-CN]=邮件客户端
-GenericName[zh-TW]=郵件軟體
-Exec=${DEB_PKG_NAME} %u
-Terminal=false
-Type=Application
-Icon=org.mozilla.Thunderbird
-Categories=Network;Email;
-MimeType=message/rfc822;x-scheme-handler/mailto;text/calendar;text/vcard;text/x-vcard;x-scheme-handler/webcal;x-scheme-handler/webcals;x-scheme-handler/mid;
-StartupNotify=true
-StartupWMClass=thunderbird
-Actions=ComposeMessage;OpenAddressBook;
-
-[Desktop Action ComposeMessage]
-Name=Write New Message
-Name[bg]=Съставяне на ново съобщение
-Name[ca]=Redacta un missatge nou
-Name[cs]=Napsat novou zprávu
-Name[cy]=Ysgrifennu Neges Newydd
-Name[da]=Skriv ny meddelelse
-Name[de]=Neue Nachricht verfassen
-Name[dsb]=Nowu powěsć pisaś
-Name[el]=Σύνταξη νέου μηνύματος
-Name[en-CA]=Write New Message
-Name[en-GB]=Write New Message
-Name[es-AR]=Escribir un nuevo mensaje
-Name[es-ES]=Redactar nuevo mensaje
-Name[eu]=Idatzi mezu berria
-Name[fi]=Kirjoita uusi viesti
-Name[fr]=Rédiger un nouveau message
-Name[fy-NL]=Nij berjocht opstelle
-Name[gd]=Sgrìobh teachdaireachd ùr
-Name[gl]=Escribir unha nova mensaxe
-Name[hr]=Piši novu poruku
-Name[hsb]=Nowu powěsć pisać
-Name[hu]=Új üzenet írása
-Name[is]=Skrifa nýjan póst
-Name[it]=Scrivi un nuovo messaggio
-Name[ja]=新しいメッセージを作成する
-Name[ka]=ახალი წერილის შედგენა
-Name[kab]=Aru izen amaynut
-Name[kk]=Жаңа хабарламаны жазу
-Name[nb-NO]=Skriv ny melding
-Name[nl]=Nieuw bericht opstellen
-Name[nn-NO]=Skriv ny melding
-Name[pl]=Nowa wiadomość
-Name[pt-BR]=Escrever nova mensagem
-Name[pt-PT]=Escrever nova mensagem
-Name[rm]=Scriver in nov messadi
-Name[ru]=Создать новое сообщение
-Name[sk]=Nová e‑mailová správa
-Name[sl]=Sestavi novo sporočilo
-Name[sq]=Shkruani Mesazh të Ri
-Name[sr]=Напиши нову поруку
-Name[sv-SE]=Skriv nytt meddelande
-Name[tr]=Yeni ileti yaz
-Name[uk]=Написати нове повідомлення
-Name[vi]=Viết thư mới
-Name[zh-CN]=撰写新邮件
-Name[zh-TW]=撰寫新訊息
-Exec=${DEB_PKG_NAME} -compose
-
-[Desktop Action OpenAddressBook]
-Name=Open the Address Book
-Name[bg]=Отваряне на адресник
-Name[ca]=Obre la llibreta d'adreces
-Name[cs]=Otevřít kontakty
-Name[cy]=Agor y Llyfr Cyfeiriadau
-Name[da]=Åbn adressebogen
-Name[de]=Adressbuch öffnen
-Name[dsb]=Adresnik wócyniś
-Name[el]=Άνοιγμα ευρετηρίου
-Name[en-CA]=Open the Address Book
-Name[en-GB]=Open the Address Book
-Name[es-AR]=Abrir la libreta de direcciones
-Name[es-ES]=Abrir la libreta de direcciones
-Name[eu]=Ireki helbide-liburua
-Name[fi]=Avaa osoitekirja
-Name[fr]=Ouvrir le carnet d’adresses
-Name[fy-NL]=It adresboek iepenje
-Name[gd]=Fosgail leabhar nan seòladh
-Name[gl]=Abrir a axenda de enderezos
-Name[hr]=Otvori adresar
-Name[hsb]=Adresnik wočinić
-Name[hu]=Címjegyzék megnyitása
-Name[is]=Opna nafnaskrána
-Name[it]=Apri la Rubrica
-Name[ja]=アドレス帳を開く
-Name[ka]=მისამართების წიგნაკის გახსნა
-Name[kab]=Ldi imedlis n tansiwin
-Name[kk]=Адрестік кітапшаны ашу
-Name[nb-NO]=Åpne adresseboken
-Name[nl]=Het adresboek openen
-Name[nn-NO]=Opne adresseboka
-Name[pl]=Książka adresowa
-Name[pt-BR]=Abrir o catálogo de endereços
-Name[pt-PT]=Abrir o livro de endereços
-Name[rm]=Avrir il cudeschet d'adressas
-Name[ru]=Открыть адресную книгу
-Name[sk]=Otvoriť adresár
-Name[sl]=Odpri imenik
-Name[sq]=Hap Librin e Adresave
-Name[sr]=Отвори именик
-Name[sv-SE]=Öppna adressboken
-Name[tr]=Adres defterini aç
-Name[uk]=Відкрити адресну книгу
-Name[vi]=Mở sổ địa chỉ
-Name[zh-CN]=打开通讯录
-Name[zh-TW]=開啟通訊錄
-Exec=${DEB_PKG_NAME} -addressbook

mail/installer/linux/langpack/debian/changelog.in

@@ -1,5 +0,0 @@
-${DEB_PKG_NAME} (${DEB_PKG_VERSION}) UNRELEASED; urgency=medium
-
-  * N/A
-
- -- Daniel Darnell <tb-builds@thunderbird.net>  ${DEB_CHANGELOG_DATE}

mail/installer/linux/langpack/debian/compat

@@ -1 +0,0 @@
-9

mail/installer/linux/langpack/debian/control.in

@@ -1,10 +0,0 @@
-Source: ${DEB_PKG_NAME}
-Maintainer: Daniel Darnell <tb-builds@thunderbird.net>
-Priority: optional
-Section: mail
-Build-Depends: debhelper (>= 9)
-
-Package: ${DEB_PKG_NAME}
-Architecture: ${DEB_ARCH_NAME}
-Depends: ${DEB_DEPENDS}
-Description: ${DEB_DESCRIPTION}

mail/installer/linux/langpack/debian/install.in

@@ -1 +0,0 @@
-thunderbird/* ${DEB_PKG_INSTALL_PATH}

mail/installer/linux/langpack/debian/rules

@@ -1,7 +0,0 @@
-#!/usr/bin/make -f
-
-%:
-	dh $@
-
-override_dh_strip_nondeterminism:
-	dh_strip_nondeterminism -Xxpi

taskcluster/config.yml

@@ -32,7 +32,6 @@ treeherder:
         'c-Up': 'Balrog submission of complete updates'
         'cs': 'Checksum signing'
         'css': 'Checksum signing for source'
-        'Deb': 'Deb archive generation'
         'Flatpak': 'Flatpak image generation'
         'L10n': 'Localised Repacks'
         'L10n-Rpk': 'Localized Repackaged Repacks'

taskcluster/docker/recipes/build_desktop_file.py

@@ -73,31 +73,23 @@ def build_template(
     output: Path,
     template: Path,
     l10n_base: Path,
-    locales_file: Path,
+    locales: List[str],
-    fluent_files: List[str],
+    fluent_resources: List[str],
     is_beta: bool,
     is_esr: bool,
 ):
-    with open(locales_file) as fp:
-        locale_data = json.load(fp)
-        locales = [l for l in locale_data.keys() if l != "ja-JP-mac"]
-        comm_l10n_rev = locale_data.get("en-GB", {}).get("revision")
-
-    get_strings(l10n_base, comm_l10n_rev, fluent_files)
-
     wmclass = "thunderbird"
     if is_beta:
         wmclass = wmclass + "-beta"
     elif is_esr:
         wmclass = wmclass + "-esr"
     locales_plus = locales + ["en-US"]
-    l10n_strings = FluentTranslator(l10n_base.resolve(), locales_plus, fluent_files)
+    l10n_strings = FluentTranslator(l10n_base.resolve(), locales_plus, fluent_resources)
 
     with open(template) as fp:
         jinja_template = jinja2.Template(fp.read())
 
     translate_multi = get_multi_translate(l10n_strings)
-
     result = jinja_template.render(
         strings=l10n_strings, translate=translate_multi, wmclass=wmclass
     )
@@ -161,11 +153,18 @@ def main():
 
     args = parser.parse_args()
 
+    with open(args.locales_file) as fp:
+        locale_data = json.load(fp)
+        locales = [l for l in locale_data.keys() if l != "ja-JP-mac"]
+        comm_l10n_rev = locale_data.get("en-GB", {}).get("revision")
+
+    get_strings(args.l10n_base, comm_l10n_rev, args.fluent_files)
+
     build_template(
         args.output,
         args.template,
         args.l10n_base,
-        args.locales_file,
+        locales,
         args.fluent_files,
         args.is_beta,
         args.is_esr,

taskcluster/kinds/docker-image/kind.yml

@@ -19,7 +19,6 @@ reference-tasks:
     - debian12-base
     - debian12-packages
     - debian12-raw
-    - debian12-repackage
     - fetch
     - fetch-more
     - funsize-update-generator

taskcluster/kinds/release-deb-repackage/kind.yml

@@ -1,53 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
----
-loader: taskgraph.loader.transform:loader
-
-transforms:
-    - taskgraph.transforms.from_deps
-    - gecko_taskgraph.transforms.name_sanity
-    - gecko_taskgraph.transforms.repackage
-    - gecko_taskgraph.transforms.job
-    - gecko_taskgraph.transforms.task
-
-kind-dependencies:
-    - build-signing
-    - toolchain
-
-only-for-build-platforms:
-    - linux-shippable/opt
-    - linux64-shippable/opt
-
-only-for-attributes:
-    - nightly
-    - shippable
-
-tasks:
-    repackage-deb:
-        from-deps:
-            group-by: single-with-filters
-        shipping-phase: promote
-        worker-type: b-linux-gcp
-        worker:
-            docker-image:
-                in-tree: debian12-repackage
-        mozharness:
-            run-as-root: true
-            use-caches: false
-            comm-checkout: true
-            config-paths:
-                - comm/testing/mozharness/configs
-            config:
-                by-build-platform:
-                    linux\b.*:
-                        - repackage/base.py
-                        - repackage/linux32_signed.py
-                    linux64\b.*:
-                        - repackage/base.py
-                        - repackage/linux64_signed.py
-        treeherder:
-            symbol: Deb(r)
-        package-formats:
-            by-build-platform:
-                linux.*: [deb]

testing/mozharness/configs/repackage/base.py

@@ -10,8 +10,6 @@ config = {
     "installer-tag": "comm/mail/installer/windows/app.tag",
     "sfx-stub": "comm/other-licenses/7zstub/thunderbird/7zSD.sfx",
     "stub-installer-tag": "",
-    "deb-templates": "comm/mail/installer/linux/app/debian",
-    "deb-l10n-templates": "comm/mail/installer/linux/langpack/debian",
     "wsx-stub": "comm/mail/installer/windows/msi/installer.wxs",
     "fetch-dir": os.environ.get("MOZ_FETCHES_DIR"),
 }