Tags: patch
Here's a series of patches for packaging the latest version.
0435-Use-upstream-repository-for-watch.patch should be applied first, so
import-orig --uscan will pick up tags from the upstream repo. I don't
think the signature option is working as intended, but I don't know how
to fix it so signatures are imported as well.
Then, after importing the newer upstream releases, the other patches can
be applied.
I haven't tested the resulting xpi yet.
From 028146af85f65766d92af20088b8644630880fd7 Mon Sep 17 00:00:00 2001
From: Gregor Riepl
Date: Sun, 13 Sep 2020 11:45:02 +0200
Subject: [PATCH 435/439] Use upstream repository for watch
---
debian/watch | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/debian/watch b/debian/watch
index 17a6fb86..56be7ccf 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
version=4
-opts=pgpsigurlmangle=s/$/.asc/,dversionmangle=s/\+ds1$//,repacksuffix=+ds1 \
- https://www.enigmail.net/download/source.php .*/enigmail-([\d\.]*).tar.gz
+opts="pgpmode=next" https://gitlab.com/enigmail/enigmail/tags?sort=updated_desc archive/enigmail-@ANY_VERSION@/enigmail-enigmail-\d\S*@ARCHIVE_EXT@
--
2.28.0
From 33c721d334fd45853eac174a8e0954b51517ba44 Mon Sep 17 00:00:00 2001
From: Gregor Riepl
Date: Sun, 13 Sep 2020 14:03:20 +0200
Subject: [PATCH 436/439] Fix up dependencies
---
debian/control | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/debian/control b/debian/control
index 89632375..2d7a2078 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders:
Alexander Sack ,
Willi Mann ,
Daniel Kahn Gillmor ,
+ Gregor Riepl
Build-Depends:
debhelper-compat (= 12),
perl,
@@ -23,7 +24,7 @@ Architecture: all
Depends:
gnupg (>= 2.2.8-2~),
gnupg-agent,
- thunderbird (>= 1:68.0) | icedove (>= 1:68.0),
+ thunderbird (>= 1:78.0) | icedove (>= 1:78.0),
${misc:Depends},
Recommends:
pinentry-x11,
@@ -35,12 +36,16 @@ Enhances:
icedove,
thunderbird,
Breaks:
- icedove (<< 1:68.0),
- thunderbird (<< 1:68.0),
+ icedove (<< 1:78.0),
+ thunderbird (<< 1:78.0),
Description: GPG support for Thunderbird and Debian Icedove
OpenPGP extension for Thunderbird. Enigmail allows users to access the
features provided by the popular GnuPG software from within Thunderbird.
.
+ This version of the extension provides a migration assistant for
+ converting Enigmail configurations to the built-in OpenPGP support in
+ Thunderbird 78.
+ .
Enigmail is capable of signing, authenticating, encrypting and decrypting
email. Additionally, it supports both the inline PGP format, as well as the
PGP/MIME format as described in RFC 3156.
--
2.28.0
From 41e46e01ff8c61f2327b0d5eb7a0f6b0fd4d310e Mon Sep 17 00:00:00 2001
From: Gregor Riepl
Date: Sun, 13 Sep 2020 14:09:43 +0200
Subject: [PATCH 437/439] Remove obsolete eslint patch
---
debian/control| 1 +
.../0001-avoid-eslint-during-buildtest.patch | 24 ---
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 25 deletions(-)
delete mode 100644 debian/patches/0001-avoid-eslint-during-buildtest.patch
diff --git a/debian/control b/debian/control
index 2d7a2078..0de2db4f 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Build-Depends:
python3,
unzip,
zip,
+ eslint,
Standards-Version: 4.5.0
Homepage: https://www.enigmail.net/
Vcs-Git: https://salsa.debian.org/debian/enigmail.git -b debian/experimental
diff --git a/debian/patches/0001-avoid-eslint-during-buildtest.patch b/debian/patches/0001-avoid-eslint-during-buildtest.patch
deleted file mode 100644
index 19b77389..
--- a/debian/patches/0001-avoid-eslint-during-buildtest.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Daniel Kahn Gillmor
-Date: Mon, 25 Jan 2016 13:22:44 -0500
-Subject: avoid eslint during buildtest
-
-eslint is not yet in debian (see https://bugs.debian.org/743404).
-once it is packaged, we should remove this patch and allow the full
-testsuite to run on the debian buildd infrastructure.
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 308c34a..f74f9e5 100644
a/Makefile
-+++ b/Makefile
-@@ -43,7 +43,7 @@ unit:
- make -C ui/tests
- make -C ipc/tests
-
--test: eslint check unit
-+test: check unit
-
- clean:
- rm -f build/$(XPIFILE) .eslintcache
diff --git a/debian/patches/series b/debian/patches/series
index d5fbba93..ec657037 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0001-avoid-eslint-during-buildtest.patch
0002-Avoid-auto-download-of-pEpEngine-Closes-891882.patch
0003-avoid-OpenPGP.js-when-building.patch
0004-copy-enums.armor-from-OpenPGP.js.patch
--
2.28.0
From 9853f70f9d2d8a46049929d1c9e4e15bace2b5ea Mon Sep 17 00:00:00 2001
From: Gregor Riepl
Date: Sun, 13 Sep 2020 14:30:06 +0200
Subject: [PATCH 438/439] Drop obsolete patches
---
