summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2021-01-03 18:46:04 (EST)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2021-01-03 19:55:00 (EST)
commit261391abbdf567f85b276bb479f0085f66728a00 (patch)
tree745d48871f0bd416fe1899a69d623e0f0cdaf4fc
parent42c28ca371367d49f288786f1f98f78bb11d9016 (diff)
libcurl.4:$arch: Conflict with libcurl.4
Fixes: Collected errors: * check_data_file_clashes: Package libcurl.4:amd64-linux-glibc wants to install file /usr/lib/amd64-linux-glibc/libcurl.so.4 But that file is already provided by package * libcurl.4 * opkg_install_cmd: Cannot install package curl.
-rw-r--r--changelog2
-rw-r--r--libcurl.4.pkg/control1
2 files changed, 3 insertions, 0 deletions
diff --git a/changelog b/changelog
index 11b3da7..0d1f6dc 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,8 @@ curl (7.74.0-2) trunk
* curl.4-common: Fix section, which made all packages uninstallable on
a default ProteanOS system.
+ * libcurl.4:$arch: Conflict with the older non-architecture-qualified
+ version.
-- Patrick McDermott <patrick.mcdermott@libiquity.com> Sun, 03 Jan 2021 17:26:13 -0500
diff --git a/libcurl.4.pkg/control b/libcurl.4.pkg/control
index 1dd63ad..0c278c5 100644
--- a/libcurl.4.pkg/control
+++ b/libcurl.4.pkg/control
@@ -4,5 +4,6 @@ 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}