From 89862859fc54bd450885341e4891248248d554d0 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Tue, 05 Jan 2021 02:48:01 -0500
Subject: libcurl.4:$arch: Drop conflict with libcurl.4

---
diff --git a/changelog b/changelog
index 194a414..1302d36 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,12 @@
+curl (7.74.0-3) trunk
+
+  * libcurl.4:$arch: Drop conflict with the older non-architecture-
+    qualified version.  A package by the name "libcurl.4" will be built
+    by src:malt to allow dependent packages (cmake) to still be
+    installed.
+
+ -- Patrick McDermott <patrick.mcdermott@libiquity.com>  Tue, 05 Jan 2021 02:43:03 -0500
+
 curl (7.74.0-2) trunk
 
   * curl.4-common: Fix section, which made all packages uninstallable on
diff --git a/libcurl.4.pkg/control b/libcurl.4.pkg/control
index 0c278c5..1dd63ad 100644
--- a/libcurl.4.pkg/control
+++ b/libcurl.4.pkg/control
@@ -4,6 +4,5 @@ Section: lib
 Depends: curl.4-common (= ${Source-Version}),
  libwolfssl.24:${Host-Arch}, ${Shlib-Depends},
  nss-certdata-server-auth
-Conflicts: libcurl.4
 Description: Client-side URL transfer library
  ${Libcurl-Description}
--
cgit v0.9.1