sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (bbb85a87fbd5b6db68bff191123a6d74206e103a)
- From: Pavel Vinogradov <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (bbb85a87fbd5b6db68bff191123a6d74206e103a)
- Date: Sun, 7 Jul 2024 00:22:04 +0000
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:
crypto/gnupg-2.2/CONFLICTS | 1 +
crypto/gnupg-2.2/HISTORY | 3 +++
crypto/gnupg-2.4/CONFLICTS | 1 +
crypto/gnupg-2.4/HISTORY | 3 +++
4 files changed, 8 insertions(+)
New commits:
commit bbb85a87fbd5b6db68bff191123a6d74206e103a
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
crypto/gnupg-2.4: conflicts with gnupg-2.5
commit 8ecaa02b0d7c2a7fe558ad54b99822003859cc1b
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
crypto/gnupg-2.2: conflicts with gnupg-2.5
diff --git a/crypto/gnupg-2.2/CONFLICTS b/crypto/gnupg-2.2/CONFLICTS
index 11e6162..eba3ef7 100755
--- a/crypto/gnupg-2.2/CONFLICTS
+++ b/crypto/gnupg-2.2/CONFLICTS
@@ -2,3 +2,4 @@ conflicts gnupg y
conflicts gnupg-exp y
conflicts gnupg-2.1 y
conflicts gnupg-2.4 y
+conflicts gnupg-2.5 y
diff --git a/crypto/gnupg-2.2/HISTORY b/crypto/gnupg-2.2/HISTORY
index ca14b39..8e9b666 100644
--- a/crypto/gnupg-2.2/HISTORY
+++ b/crypto/gnupg-2.2/HISTORY
@@ -1,3 +1,6 @@
+2024-07-06 Pavel Vinogradov <public AT sourcemage.org>
+ * CONFLICTS: added gnupg-2.5
+
2022-07-27 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: switch to PKG-CONFIG provider (automated)
diff --git a/crypto/gnupg-2.4/CONFLICTS b/crypto/gnupg-2.4/CONFLICTS
index 7202d34..9a866d5 100755
--- a/crypto/gnupg-2.4/CONFLICTS
+++ b/crypto/gnupg-2.4/CONFLICTS
@@ -2,3 +2,4 @@ conflicts gnupg y
conflicts gnupg-exp y
conflicts gnupg-2.1 y
conflicts gnupg-2.2 y
+conflicts gnupg-2.5 y
diff --git a/crypto/gnupg-2.4/HISTORY b/crypto/gnupg-2.4/HISTORY
index 3fe52e8..0b93b51 100644
--- a/crypto/gnupg-2.4/HISTORY
+++ b/crypto/gnupg-2.4/HISTORY
@@ -1,3 +1,6 @@
+2024-07-06 Pavel Vinogradov <public AT sourcemage.org>
+ * CONFLICTS: added gnupg-2.5
+
2024-03-07 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 2.4.5
- [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (bbb85a87fbd5b6db68bff191123a6d74206e103a), Pavel Vinogradov, 07/06/2024
Archive powered by MHonArc 2.6.24.