summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2019-04-07 18:58:39 (EDT)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2019-04-07 18:58:39 (EDT)
commitc471eeb68e6c9ae6fd5de58e1071e52f7b1b4c74 (patch)
tree9388100fcf6fea85927e806eb62e0794e5ac5d8e
parent8827d14fc58d8dd17c85e67a39e49c7a22f50112 (diff)
patch: Don't "replace" old busybox
-rw-r--r--changelog1
-rw-r--r--patch.pkg/control1
2 files changed, 1 insertions, 1 deletions
diff --git a/changelog b/changelog
index 6a51fae..be7cd84 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,7 @@ patch (2.7.6-1) trunk
* New upstream version.
* Rebuild to fix the "<<" version relation operator incorrectly parsed and
generated by an old version of opkbuild.
+ * patch: Only conflict with busybox (<< 1.21.1-12); don't replace it.
-- Patrick McDermott <patrick.mcdermott@libiquity.com> Sun, 07 Apr 2019 18:53:34 -0400
diff --git a/patch.pkg/control b/patch.pkg/control
index b011b65..d1c652e 100644
--- a/patch.pkg/control
+++ b/patch.pkg/control
@@ -1,6 +1,5 @@
Architecture: any
Platform: all
-Replaces: busybox (<< 1.21.1-12)
Conflicts: busybox (<< 1.21.1-12)
Description: Utility to apply diff files to original files
${Common-Description}