summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/apt-doc.docs2
-rw-r--r--debian/apt-utils.dirs2
-rw-r--r--debian/apt.dirs2
-rwxr-xr-xdebian/rules6
-rw-r--r--debian/tests/run-tests2
5 files changed, 7 insertions, 7 deletions
diff --git a/debian/apt-doc.docs b/debian/apt-doc.docs
index dd2a1eee8..2058000c1 100644
--- a/debian/apt-doc.docs
+++ b/debian/apt-doc.docs
@@ -2,5 +2,5 @@ build/docs/guide*
build/docs/offline*
README.progress-reporting
doc/external-dependency-solver-protocol.txt
-doc/external-installation-planer-protocol.txt
+doc/external-installation-planner-protocol.txt
doc/acquire-additional-files.txt
diff --git a/debian/apt-utils.dirs b/debian/apt-utils.dirs
index cb3a9ebef..de7fa756e 100644
--- a/debian/apt-utils.dirs
+++ b/debian/apt-utils.dirs
@@ -1,3 +1,3 @@
usr/lib/apt/solvers
-usr/lib/apt/planers
+usr/lib/apt/planners
usr/bin
diff --git a/debian/apt.dirs b/debian/apt.dirs
index 7486a7b69..7d46801df 100644
--- a/debian/apt.dirs
+++ b/debian/apt.dirs
@@ -1,7 +1,7 @@
usr/bin
usr/lib/apt/methods
usr/lib/apt/solvers
-usr/lib/apt/planers
+usr/lib/apt/planners
usr/lib/dpkg/methods/apt
etc/apt
etc/apt/apt.conf.d
diff --git a/debian/rules b/debian/rules
index 43e979dc8..18b3f34f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -189,9 +189,9 @@ apt: build-binary build-manpages debian/apt.install
dh_install -p$@ --sourcedir=$(BLD)
# Remove the bits that are in apt-utils
- rm $(addprefix debian/$@/usr/bin/apt-,$(APT_UTILS) dump-solver internal-solver internal-planer)
+ rm $(addprefix debian/$@/usr/bin/apt-,$(APT_UTILS) dump-solver internal-solver internal-planner)
cp $(BLD)/bin/apt-dump-solver debian/$@/usr/lib/apt/solvers/dump
- ln -s ../solvers/dump debian/$@/usr/lib/apt/planers/dump
+ ln -s ../solvers/dump debian/$@/usr/lib/apt/planners/dump
# https has its own package
rm debian/$@/usr/lib/apt/methods/https
@@ -253,7 +253,7 @@ apt-utils: build-binary build-manpages
cp $(addprefix $(BLD)/bin/apt-,$(APT_UTILS)) debian/$@/usr/bin/
cp $(BLD)/bin/apt-internal-solver debian/$@/usr/lib/apt/solvers/apt
- cp $(BLD)/bin/apt-internal-planer debian/$@/usr/lib/apt/planers/apt
+ cp $(BLD)/bin/apt-internal-planner debian/$@/usr/lib/apt/planners/apt
dh_install -p$@ --sourcedir=$(BLD)
dh_link -p$@
diff --git a/debian/tests/run-tests b/debian/tests/run-tests
index 11139e3cd..e33992b28 100644
--- a/debian/tests/run-tests
+++ b/debian/tests/run-tests
@@ -17,7 +17,7 @@ APT_INTEGRATION_TESTS_METHODS_DIR=/usr/lib/apt/methods \
APT_INTEGRATION_TESTS_LIBEXEC_DIR=/usr/lib/apt/ \
APT_INTEGRATION_TESTS_INTERNAL_SOLVER=/usr/lib/apt/solvers/apt \
APT_INTEGRATION_TESTS_DUMP_SOLVER=/usr/lib/apt/solvers/dump \
-APT_INTEGRATION_TESTS_INTERNAL_PLANER=/usr/lib/apt/planers/apt \
+APT_INTEGRATION_TESTS_INTERNAL_PLANNER=/usr/lib/apt/planners/apt \
APT_INTEGRATION_TESTS_BUILD_DIR=/usr/bin \
APT_INTEGRATION_TESTS_LIBRARY_PATH=/dev/null/does/not/exist \
./test/integration/run-tests -q