sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (2b1a3f2a6cd04aecc8034aa412e96a949367e185)

From: Treeve Jelbert <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (2b1a3f2a6cd04aecc8034aa412e96a949367e185)
Date: Tue, 13 Apr 2021 12:12:15 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

ChangeLog | 3 +++
crypto/gnupg-2.2/CONFLICTS | 1 +
crypto/gnupg-2.2/HISTORY | 3 +++
3 files changed, 7 insertions(+)

New commits:
commit 2b1a3f2a6cd04aecc8034aa412e96a949367e185
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

gnupg-2.2 - extra conflicts

commit 110e3ec781096d3f62d28647e40d8209eb9b97a6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

gnupg-2.4 - version 2.3.0

diff --git a/ChangeLog b/ChangeLog
index 4470bd7..c8bcf8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2021-04-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * crypto/gnupg-2.4: added, development towards 2.4.x
+
2021-04-11 Treeve Jelbert <treeve AT sourcemage.org>
* FUNCTIONS: add qt6 support to cmake_build

diff --git a/crypto/gnupg-2.2/CONFLICTS b/crypto/gnupg-2.2/CONFLICTS
index 965212a..11e6162 100755
--- a/crypto/gnupg-2.2/CONFLICTS
+++ b/crypto/gnupg-2.2/CONFLICTS
@@ -1,3 +1,4 @@
conflicts gnupg y
conflicts gnupg-exp y
conflicts gnupg-2.1 y
+conflicts gnupg-2.4 y
diff --git a/crypto/gnupg-2.2/HISTORY b/crypto/gnupg-2.2/HISTORY
index 47338f9..f50afb2 100644
--- a/crypto/gnupg-2.2/HISTORY
+++ b/crypto/gnupg-2.2/HISTORY
@@ -1,3 +1,6 @@
+2021-04-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFLICTS: add gnupg-2.4
+
2021-01-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.2.27

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (2b1a3f2a6cd04aecc8034aa412e96a949367e185), Treeve Jelbert, 04/13/2021