summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--changelog6
-rw-r--r--opkg-gpg.pkg/control1
-rw-r--r--opkg.pkg/control1
3 files changed, 8 insertions, 0 deletions
diff --git a/changelog b/changelog
index 0574092..680bae6 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+opkg (0.2.4-2) trunk
+
+ * opkg, opkg-gpg: Conflict with opkg-lede (<< 0+git20190131.d4ba162-2).
+
+ -- Patrick McDermott <patrick.mcdermott@libiquity.com> Thu, 04 Apr 2019 17:42:46 -0400
+
opkg (0.2.4-1) trunk
* New upstream version.
diff --git a/opkg-gpg.pkg/control b/opkg-gpg.pkg/control
index d14d076..3e1109d 100644
--- a/opkg-gpg.pkg/control
+++ b/opkg-gpg.pkg/control
@@ -1,6 +1,7 @@
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 6e7502f..28c7b28 100644
--- a/opkg.pkg/control
+++ b/opkg.pkg/control
@@ -2,6 +2,7 @@ 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}
.