From f74d99c6a78caafdc6e32d8cb135683b7154795c Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sat, 28 May 2016 15:40:59 +0200
Subject: eipp: provide the internal planer as an external one

Testing the current implementation can benefit from being able to be
feed an EIPP request and produce a fully compliant response. It is also
a great test for EIPP in general.
---
 debian/apt-utils.dirs        | 1 +
 debian/apt.dirs              | 3 ++-
 debian/apt.lintian-overrides | 2 --
 debian/rules                 | 4 +++-
 debian/tests/run-tests       | 1 +
 5 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'debian')

diff --git a/debian/apt-utils.dirs b/debian/apt-utils.dirs
index 681e55192..cb3a9ebef 100644
--- a/debian/apt-utils.dirs
+++ b/debian/apt-utils.dirs
@@ -1,2 +1,3 @@
 usr/lib/apt/solvers
+usr/lib/apt/planers
 usr/bin
diff --git a/debian/apt.dirs b/debian/apt.dirs
index 4a83d1151..7486a7b69 100644
--- a/debian/apt.dirs
+++ b/debian/apt.dirs
@@ -1,6 +1,7 @@
 usr/bin
 usr/lib/apt/methods
 usr/lib/apt/solvers
+usr/lib/apt/planers
 usr/lib/dpkg/methods/apt
 etc/apt
 etc/apt/apt.conf.d
@@ -16,4 +17,4 @@ var/lib/apt/periodic
 var/log/apt
 usr/share/bug/apt
 usr/share/bash-completion/completions/
-lib/systemd/system/
\ No newline at end of file
+lib/systemd/system/
diff --git a/debian/apt.lintian-overrides b/debian/apt.lintian-overrides
index 0c4d42d1b..e51d1119f 100644
--- a/debian/apt.lintian-overrides
+++ b/debian/apt.lintian-overrides
@@ -1,4 +1,2 @@
 # the private library is for internal sharing only
 apt: package-name-doesnt-match-sonames
-# external solvers are shipped in here:
-apt: package-contains-empty-directory
diff --git a/debian/rules b/debian/rules
index cd21f30ef..43e979dc8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -189,8 +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)
+	rm $(addprefix debian/$@/usr/bin/apt-,$(APT_UTILS) dump-solver internal-solver internal-planer)
 	cp $(BLD)/bin/apt-dump-solver debian/$@/usr/lib/apt/solvers/dump
+	ln -s ../solvers/dump debian/$@/usr/lib/apt/planers/dump
 
 	# https has its own package
 	rm debian/$@/usr/lib/apt/methods/https
@@ -252,6 +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
 
 	dh_install -p$@ --sourcedir=$(BLD)
 	dh_link -p$@
diff --git a/debian/tests/run-tests b/debian/tests/run-tests
index f858adf5f..11139e3cd 100644
--- a/debian/tests/run-tests
+++ b/debian/tests/run-tests
@@ -17,6 +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_BUILD_DIR=/usr/bin \
 APT_INTEGRATION_TESTS_LIBRARY_PATH=/dev/null/does/not/exist \
 ./test/integration/run-tests -q
-- 
cgit v1.2.3