From c471eeb68e6c9ae6fd5de58e1071e52f7b1b4c74 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Sun, 07 Apr 2019 18:58:39 -0400 Subject: patch: Don't "replace" old busybox --- 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 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} -- cgit v0.9.1