From 1a152d1f6bb35be5f1e4ab2635f912575d316664 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Thu, 04 Apr 2019 19:23:16 -0400
Subject: opkg-lede: Conflict with opkg-common, not opkg and opkg-gpg

---
diff --git a/changelog b/changelog
index 1ddd009..09aa81c 100644
--- a/changelog
+++ b/changelog
@@ -5,7 +5,7 @@ opkg-lede (0+git20190131.d4ba162-2) trunk
   * Set lock file path to "/var/lib/opkg/lock", as it has always been
     with the original opkg.
   * Manage opkg-key and update-alternatives with update-alternatives.
-  * Conflict with opkg and opkg-gpg (<< 0.2.4-2).
+  * Conflict with opkg-common (<< 0.2.4-2).
   * Allow upgrade command without arguments, as with the original opkg.
 
  -- Patrick McDermott <patrick.mcdermott@libiquity.com>  Thu, 04 Apr 2019 16:52:10 -0400
diff --git a/opkg-lede.pkg/control b/opkg-lede.pkg/control
index 7d70f60..c35a967 100644
--- a/opkg-lede.pkg/control
+++ b/opkg-lede.pkg/control
@@ -1,7 +1,7 @@
 Architecture: any
 Platform: all
 Depends: usign, ${Shlib-Depends}
-Conflicts: opkg (<< 0.2.4-2), opkg-gpg (<< 0.2.4-2)
+Conflicts: opkg-common (<< 0.2.4-2)
 Description: Lightweight package management system - LEDE/OpenWrt fork
  The opkg package management system handles installation and removal of packages
  on a system.  It can recursively follow dependencies and download all packages
--
cgit v0.9.1