Version in base suite: 12.0-1 Base version: folder-account_12.0-1 Target version: folder-account_12.1-1~deb13u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/f/folder-account/folder-account_12.0-1.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/f/folder-account/folder-account_12.1-1~deb13u1.dsc api/FolderAccount/implementation.js | 54 ------------------------------------ api/FolderAccount/schema.json | 14 --------- background.js | 2 - debian/changelog | 22 ++++++++++++++ debian/control | 5 +-- debian/copyright | 4 +- debian/dpb.conf | 16 ++++++++++ debian/gbp.conf | 22 ++++++++++++++ folderAccount.mjs | 17 +---------- manifest.json | 23 ++++----------- 10 files changed, 73 insertions(+), 106 deletions(-) diff -Nru folder-account-12.0/api/FolderAccount/implementation.js folder-account-12.1/api/FolderAccount/implementation.js --- folder-account-12.0/api/FolderAccount/implementation.js 2024-06-12 11:38:23.000000000 +0000 +++ folder-account-12.1/api/FolderAccount/implementation.js 1970-01-01 00:00:00.000000000 +0000 @@ -1,54 +0,0 @@ -var { ExtensionCommon } = ChromeUtils.importESModule( - "resource://gre/modules/ExtensionCommon.sys.mjs" -); - -var { MailServices } = ChromeUtils.importESModule( - "resource:///modules/MailServices.sys.mjs" -); - -var FolderAccount = class extends ExtensionCommon.ExtensionAPI { - getAPI(context) { - return { - FolderAccount: { - async getFolderAccountSettings() { - const folderPrefs = new Map(); - const branch = Services.prefs.getBranch("extensions.folderaccount."); - for (const child of branch.getChildList("")) { - let pref; - try { - pref = branch.getCharPref(child); - } catch (e) { - continue; - } - console.info("Migrating FolderAccount preference\n", child, pref); - const matches = child.match( - /(?addToCcOnReply|overrideReturnAddress|replyTo(OnReplyForward)?|to)?\.?(?.*)/ - ); - const folderURI = matches.groups["folder"]; - const settingKey = matches.groups["setting"] ?? "identityId"; - if ( - /addToCcOnReply|overrideReturnAddress|replyToOnReplyForward/.test( - settingKey - ) - ) { - pref = pref == "true"; - } - folderPrefs.set(folderURI, { - ...folderPrefs.get(folderURI), - [settingKey]: pref, - }); - } - const mailFolderPrefs = new Map(); - folderPrefs.forEach((value, key) => { - const folder = MailServices.folderLookup.getFolderForURL(key); - const mailFolder = context.extension.folderManager.convert(folder); - if (mailFolder) { - mailFolderPrefs.set(mailFolder.id, value); - } - }); - return mailFolderPrefs; - }, - }, - }; - } -}; diff -Nru folder-account-12.0/api/FolderAccount/schema.json folder-account-12.1/api/FolderAccount/schema.json --- folder-account-12.0/api/FolderAccount/schema.json 2024-06-12 10:25:57.000000000 +0000 +++ folder-account-12.1/api/FolderAccount/schema.json 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -[ - { - "namespace": "FolderAccount", - "functions": [ - { - "name": "getFolderAccountSettings", - "description": "Get all the Folder Account settings from its preference branch for migration.", - "type": "function", - "async": true, - "parameters": [] - } - ] - } -] diff -Nru folder-account-12.0/background.js folder-account-12.1/background.js --- folder-account-12.0/background.js 2024-06-12 10:50:27.000000000 +0000 +++ folder-account-12.1/background.js 2025-03-31 10:27:56.000000000 +0000 @@ -1,7 +1,5 @@ import * as folderAccount from "./folderAccount.mjs"; -await folderAccount.checkForMigration(); - let lastFocusedWindow = messenger.windows.WINDOW_ID_NONE; messenger.windows.getCurrent().then((w) => (lastFocusedWindow = w.id)); diff -Nru folder-account-12.0/debian/changelog folder-account-12.1/debian/changelog --- folder-account-12.0/debian/changelog 2024-10-03 08:47:34.000000000 +0000 +++ folder-account-12.1/debian/changelog 2025-09-24 10:05:45.000000000 +0000 @@ -1,3 +1,25 @@ +folder-account (12.1-1~deb13u1) trixie; urgency=medium + + * Rebuild for trixie for thunderbird >= 140.3 + + -- Mechtilde Stehmann Wed, 24 Sep 2025 12:05:45 +0200 + +folder-account (12.1-1) unstable; urgency=medium + + * Rebuild for unstable to use thunderbird >= 140.3 + + -- Mechtilde Stehmann Sun, 21 Sep 2025 12:36:34 +0200 + +folder-account (12.1-1~exp1) experimental; urgency=medium + + [ Mechtilde ] + * [b026f53] New upstream version 12.1 + * [f7da993] Bumped year in d/copyright + * [9f2fef6] Bumped standard version in d/control + * [fc86418] Bumped version of thunderbird + + -- Mechtilde Stehmann Sun, 10 Aug 2025 21:34:24 +0200 + folder-account (12.0-1) unstable; urgency=medium * Source only upload diff -Nru folder-account-12.0/debian/control folder-account-12.1/debian/control --- folder-account-12.0/debian/control 2024-09-17 17:54:49.000000000 +0000 +++ folder-account-12.1/debian/control 2025-08-08 16:12:24.000000000 +0000 @@ -5,7 +5,7 @@ Uploaders: Mechtilde Stehmann Build-Depends: debhelper-compat (=13) , zip -Standards-Version: 4.7.0 +Standards-Version: 4.7.2 Rules-Requires-Root: no Vcs-Git: https://salsa.debian.org/webext-team/folder-account.git Vcs-Browser: https://salsa.debian.org/webext-team/folder-account @@ -14,8 +14,7 @@ Package: webext-folder-account Architecture: all Depends: ${misc:Depends} - , thunderbird (>= 1:128.0) - , thunderbird (<= 1:131.x) + , thunderbird (>= 1:136) Description: Managing folder accounts Lets you associate user accounts and identities with specific folders. Great for multiple users who share TB, or for managing mailing lists. diff -Nru folder-account-12.0/debian/copyright folder-account-12.1/debian/copyright --- folder-account-12.0/debian/copyright 2024-09-17 16:28:57.000000000 +0000 +++ folder-account-12.1/debian/copyright 2025-08-08 16:10:05.000000000 +0000 @@ -7,11 +7,11 @@ Files: * Copyright: 2013 eykamp - 2024 Hartmut Welpmann + 2024-2025 Hartmut Welpmann License: MIT Files: debian/* -Copyright: 2024 Mechtilde Stehmann +Copyright: 2024-2025 Mechtilde Stehmann License: MIT License: MIT diff -Nru folder-account-12.0/debian/dpb.conf folder-account-12.1/debian/dpb.conf --- folder-account-12.0/debian/dpb.conf 1970-01-01 00:00:00.000000000 +0000 +++ folder-account-12.1/debian/dpb.conf 2025-09-24 10:05:45.000000000 +0000 @@ -0,0 +1,16 @@ +#!/bin/bash +# debian/dpb.conf +# ConfigFile for FolderAccount +# This file is used by the scripts from +# debian-package-scripts +## General parameters +SourceName=folder-account +PackName=webext-folder-account +SalsaName=webext-team/folder-account.git +## Parameters for Java packages +JavaFlag=0 +## Parameters for Webext packages +WebextFlag=1 +## Parameters for Python3 packages +PythonFlag=0 +RecentBranchD=trixie diff -Nru folder-account-12.0/debian/gbp.conf folder-account-12.1/debian/gbp.conf --- folder-account-12.0/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ folder-account-12.1/debian/gbp.conf 2025-09-24 10:05:45.000000000 +0000 @@ -0,0 +1,22 @@ +# Configuration file for git-buildpackage and friends + +[DEFAULT] +# use pristine-tar: +pristine-tar = True +# generate gz compressed orig file +compression = xz +debian-branch = debian/trixie +upstream-branch = upstream + +[pq] +patch-numbers = False + +[dch] +id-length = 7 +debian-branch = debian/trixie + +[import-orig] +# filter out unwanted files/dirs from upstream +filter = [ '.cvsignore', '.gitignore', '.github', '.hgtags', '.hgignore', '*.orig', '*.rej' ] +# filter the files out of the tarball passed to pristine-tar +filter-pristine-tar = True diff -Nru folder-account-12.0/folderAccount.mjs folder-account-12.1/folderAccount.mjs --- folder-account-12.0/folderAccount.mjs 2024-06-10 21:25:10.000000000 +0000 +++ folder-account-12.1/folderAccount.mjs 2025-03-31 10:27:46.000000000 +0000 @@ -1,17 +1,3 @@ -export async function checkForMigration() { - const kAlreadyMigrated = "alreadyMigrated"; - let results = await browser.storage.local.get(kAlreadyMigrated); - if (kAlreadyMigrated in results) { - return; - } - - await browser.storage.local.set({ [kAlreadyMigrated]: true }); - const settings = await messenger.FolderAccount.getFolderAccountSettings(); - settings.forEach(async (value, key) => { - await browser.storage.local.set({ [key]: value }); - }); -} - export async function getCustomComposeDetails(details, lastFocusedTabId) { if (details.type == "draft") { return {}; @@ -38,7 +24,7 @@ } if (!settings) { - const parentFolders = await messenger.folders.getParentFolders(folder); + const parentFolders = await messenger.folders.getParentFolders(folder.id); for (let parentFolder of parentFolders) { [settings] = Object.values( await browser.storage.local.get(parentFolder.id) @@ -94,6 +80,7 @@ newDetails.identityId = settings.identityId; } + newDetails.isModified = false; return newDetails; } diff -Nru folder-account-12.0/manifest.json folder-account-12.1/manifest.json --- folder-account-12.0/manifest.json 2024-06-12 11:57:02.000000000 +0000 +++ folder-account-12.1/manifest.json 2025-03-31 10:24:11.000000000 +0000 @@ -2,21 +2,22 @@ "manifest_version": 2, "name": "Folder Account", "description": "Associate an account or identity with a folder", - "version": "12.0", + "version": "12.1", "author": "Hartmut Welpmann", "homepage_url": "https://github.com/Welpy-cw/Folder-Account", "browser_specific_settings": { "gecko": { "id": "{C8534C26-F59A-11DA-9804-B622A1EF5492}", - "strict_min_version": "127.0", - "strict_max_version": "128.*" + "strict_min_version": "136.0" } }, "icons": { "64": "icon.png" }, "background": { - "scripts": ["background.js"], + "scripts": [ + "background.js" + ], "type": "module" }, "options_ui": { @@ -30,15 +31,5 @@ "menus", "messagesRead", "storage" - ], - "experiment_apis": { - "FolderAccount": { - "schema": "api/FolderAccount/schema.json", - "parent": { - "scopes": ["addon_parent"], - "paths": [["FolderAccount"]], - "script": "api/FolderAccount/implementation.js" - } - } - } -} + ] +} \ No newline at end of file