summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2019-04-04 19:21:21 (EDT)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2019-04-04 19:21:21 (EDT)
commitfc2bf31a56024010f678fdf8383071dba32ac91f (patch)
tree2d7ed205e5aaf70d718595d0046b9edf8c080640
parente08b239f3d46501546e2f68fcdaf199890dc665c (diff)
Move Conflicts from opkg & opkg-gpg to opkg-common
-rw-r--r--changelog2
-rw-r--r--opkg-common.pkg/control1
-rw-r--r--opkg-gpg.pkg/control1
-rw-r--r--opkg.pkg/control1
4 files changed, 2 insertions, 3 deletions
diff --git a/changelog b/changelog
index efb1b14..7f3c40c 100644
--- a/changelog
+++ b/changelog
@@ -2,7 +2,7 @@ opkg (0.2.4-2) trunk
* opkg-common: Manage opkg-key and update-alternatives with
update-alternatives.
- * opkg, opkg-gpg: Conflict with opkg-lede (<< 0+git20190131.d4ba162-2).
+ * opkg-common: Conflict with opkg-lede (<< 0+git20190131.d4ba162-2).
-- Patrick McDermott <patrick.mcdermott@libiquity.com> Thu, 04 Apr 2019 17:42:46 -0400
diff --git a/opkg-common.pkg/control b/opkg-common.pkg/control
index 329e59e..d463d6c 100644
--- a/opkg-common.pkg/control
+++ b/opkg-common.pkg/control
@@ -1,5 +1,6 @@
Architecture: all
Platform: all
+Conflicts: opkg-lede (<< 0+git20190131.d4ba162-2)
Description: Open PacKaGe Management - common files
${Common-Description}
.
diff --git a/opkg-gpg.pkg/control b/opkg-gpg.pkg/control
index 3e1109d..d14d076 100644
--- a/opkg-gpg.pkg/control
+++ b/opkg-gpg.pkg/control
@@ -1,7 +1,6 @@
Architecture: any
Platform: all
Depends: opkg-common (= ${Binary-Version}), ${Shlib-Depends}
-Conflicts: opkg-lede (<< 0+git20190131.d4ba162-2)
Description: Open PacKaGe Management with signature checking
${Common-Description}
.
diff --git a/opkg.pkg/control b/opkg.pkg/control
index 28c7b28..6e7502f 100644
--- a/opkg.pkg/control
+++ b/opkg.pkg/control
@@ -2,7 +2,6 @@ Architecture: any
Platform: all
Essential: yes
Depends: opkg-common (= ${Binary-Version}), ${Shlib-Depends}
-Conflicts: opkg-lede (<< 0+git20190131.d4ba162-2)
Description: Open PacKaGe Management
${Common-Description}
.