From 570d423532176c39518f3978a203250bef41cfef Mon Sep 17 00:00:00 2001 From: Sam Bingner Date: Sun, 16 Dec 2018 11:52:18 -1000 Subject: A number of updates to make transitioning from electra repo smoother --- data/libapt/_metadata/conflicts | 2 +- data/libapt/make.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'data/libapt') diff --git a/data/libapt/_metadata/conflicts b/data/libapt/_metadata/conflicts index 77c98489a..7e4d0927b 100644 --- a/data/libapt/_metadata/conflicts +++ b/data/libapt/_metadata/conflicts @@ -1 +1 @@ -apt7-lib (<<1:0) +apt7-lib (<<1:0), apt7 (<<1:0), com.mc.xz, apt7-key diff --git a/data/libapt/make.sh b/data/libapt/make.sh index bfc52ca73..c9b62a8ea 100644 --- a/data/libapt/make.sh +++ b/data/libapt/make.sh @@ -4,7 +4,6 @@ cp -a "$(PKG_DEST_ _apt1.4)"/var "${PKG_DEST}" pkg: mkdir -p /usr cp -a "$(PKG_DEST_ _apt1.4)"/usr/lib "${PKG_DEST}"/usr cp -a "$(PKG_DEST_ _apt1.4)"/usr/libexec "${PKG_DEST}"/usr -echo rm -f "${PKG_DEST}"/usr/lib/libapt-pkg.* rm -f "${PKG_DEST}"/usr/lib/libapt-pkg.* pkg: ln -s ../libexec/apt /usr/lib/apt pkg: rm -f /usr/libexec/apt/methods/https -- cgit v1.2.3