summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2019-04-04 19:23:16 (EDT)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2019-04-04 19:23:16 (EDT)
commit1a152d1f6bb35be5f1e4ab2635f912575d316664 (patch)
treeb1aa76437ed61474af4ad9463f727eeecb8b1176
parentca7420f4500e18327ed06df18bbcf99128536ce3 (diff)
opkg-lede: Conflict with opkg-common, not opkg and opkg-gpg
-rw-r--r--changelog2
-rw-r--r--opkg-lede.pkg/control2
2 files changed, 2 insertions, 2 deletions
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