summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/apt-key/_metadata/conflicts2
-rw-r--r--data/base/make.sh2
-rw-r--r--data/libapt/_metadata/conflicts2
-rw-r--r--data/xz/_metadata/zlib1
4 files changed, 3 insertions, 4 deletions
diff --git a/data/apt-key/_metadata/conflicts b/data/apt-key/_metadata/conflicts
index 9e36532b4..93773cd14 100644
--- a/data/apt-key/_metadata/conflicts
+++ b/data/apt-key/_metadata/conflicts
@@ -1 +1 @@
-apt7-key
+apt7-key (<<1:0)
diff --git a/data/base/make.sh b/data/base/make.sh
index fbd4f1b14..bc1cdd0b5 100644
--- a/data/base/make.sh
+++ b/data/base/make.sh
@@ -1 +1 @@
-tar -zxvf "${PKG_DATA}/base.tgz" -C "${PKG_DEST}"
+${FAKEROOT} tar -zxvf "${PKG_DATA}/base.tgz" -C "${PKG_DEST}"
diff --git a/data/libapt/_metadata/conflicts b/data/libapt/_metadata/conflicts
index 7e4d0927b..c3b5d6eb4 100644
--- a/data/libapt/_metadata/conflicts
+++ b/data/libapt/_metadata/conflicts
@@ -1 +1 @@
-apt7-lib (<<1:0), apt7 (<<1:0), com.mc.xz, apt7-key
+apt7-lib (<<1:0), apt7 (<<1:0), apt7-key (<<1:0), com.mc.xz
diff --git a/data/xz/_metadata/zlib b/data/xz/_metadata/zlib
deleted file mode 100644
index 7a4571271..000000000
--- a/data/xz/_metadata/zlib
+++ /dev/null
@@ -1 +0,0 @@
-bzip2