From a34e6d3f957c9a619b10d7b9917e292429d3bf29 Mon Sep 17 00:00:00 2001
From: Luis Guzman <ark@switnet.org>
Date: Thu, 21 Mar 2024 22:46:40 +0000
Subject: [PATCH] thunderbird: remove gitignore_from_source and move repo
 source.

---
 helpers/make-thunderbird | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/helpers/make-thunderbird b/helpers/make-thunderbird
index 5c8233f..b70c751 100644
--- a/helpers/make-thunderbird
+++ b/helpers/make-thunderbird
@@ -19,7 +19,9 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=21
+VERSION=22
+EXTERNAL='deb-src http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $UPSTREAM main'
+REPOKEY=9BDB3D89CE49EC21
 
 . ./config
 
@@ -30,17 +32,6 @@ cp $DATA/branding/* comm/mail/branding/thunderbird/ -r
 #  cp $DATA/branding/* browser/branding/$i/ -r
 #done
 
-# Remove .gitignore call as those files get cleaned out on dpkg tarball by default.
-remove_gitignore_from_json(){
-    jq . ${1} |sed '/.gitignore/d'|awk -v RS= '{$1=$1}1'|tr -d ' '|tee ${1}.new
-    mv ${1}.new ${1}
-}
-
-for json in $(find -name \.cargo-checksum.json|xargs grep -rl gitignore)
-do
-    remove_gitignore_from_json $json
-done
-
 # Privacy and branding via prefs
 cat << EOF >> debian/vendor.js