report progress for removing while purging pkgs

[apt.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index bdc539fefce242669a3be3b140c2c15d4fb23b7e..18b3f34f3085c859ef9947a5200461bfc5c9bfe3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -133,13 +133,7 @@ libapt-pkg-doc: build-docbook
 # libapt-pkg-doc install
 #
        rm -f $(BLD)/doc/doxygen/html/*.map $(BLD)/doc/doxygen/html/*.md5
-       dh_installdocs -p$@ $(BLD)/docs/design* \
-                           $(BLD)/docs/dpkg-tech* \
-                           $(BLD)/docs/files* \
-                           $(BLD)/docs/method* \
-                           doc/libapt-pkg2_to_3.txt \
-                           doc/style.txt \
-                           $(BLD)/doc/doxygen/html
+       dh_installdocs -p$@
        dh_installexamples -p$@
        dh_lintian -p$@
        dh_installchangelogs -p$@
@@ -159,10 +153,7 @@ apt-doc: build-docbook
 # apt-doc install
 #
        # Copy the guides
-       dh_installdocs -p$@ $(BLD)/docs/guide*.text \
-                           $(BLD)/docs/guide*.html \
-                           $(BLD)/docs/offline*.text \
-                           $(BLD)/docs/offline*.html
+       dh_installdocs -p$@
        dh_installchangelogs -p$@
        dh_compress -p$@
        dh_fixperms -p$@
@@ -198,7 +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-planner)
+       cp $(BLD)/bin/apt-dump-solver debian/$@/usr/lib/apt/solvers/dump
+       ln -s ../solvers/dump debian/$@/usr/lib/apt/planners/dump
 
        # https has its own package
        rm debian/$@/usr/lib/apt/methods/https
@@ -214,7 +207,7 @@ apt: build-binary build-manpages debian/apt.install
 
        dh_bugfiles -p$@
        dh_lintian -p$@
-       dh_installexamples -p$@ $(BLD)/docs/examples/*
+       dh_installexamples -p$@
        dh_installman -p$@ $(wildcard $(patsubst %,doc/en/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES)))
        dh_installcron -p$@ --name=apt-compat
        dh_systemd_enable -p$@ apt-daily.timer
@@ -259,8 +252,8 @@ apt-utils: build-binary build-manpages
        dh_installdirs -p$@
 
        cp $(addprefix $(BLD)/bin/apt-,$(APT_UTILS)) debian/$@/usr/bin/
-       cp $(BLD)/bin/apt-dump-solver debian/$@/usr/lib/apt/solvers/dump
        cp $(BLD)/bin/apt-internal-solver debian/$@/usr/lib/apt/solvers/apt
+       cp $(BLD)/bin/apt-internal-planner debian/$@/usr/lib/apt/planners/apt
 
        dh_install -p$@ --sourcedir=$(BLD)
        dh_link -p$@
@@ -314,7 +307,7 @@ $(LIBAPT_INST): build-binary debian/$(LIBAPT_INST).install
        dh_fixperms -p$@
        dh_makeshlibs -p$@
        dh_installdeb -p$@
-       dh_shlibdeps -p$@ 
+       dh_shlibdeps -p$@
        dh_gencontrol -p$@
        dh_md5sums -p$@
        dh_builddeb -p$@
@@ -326,7 +319,7 @@ apt-transport-https: build-binary libapt-pkg-dev
        dh_installdirs -p$@
 
        dh_install -p$@ --sourcedir=$(BLD)
-       dh_installdocs -p$@ debian/apt-transport-https.README
+       dh_installdocs -p$@
        dh_installexamples -p$@
 
        # Install the man pages..
@@ -337,7 +330,7 @@ apt-transport-https: build-binary libapt-pkg-dev
        dh_compress -p$@
        dh_fixperms -p$@
        dh_installdeb -p$@
-       dh_shlibdeps -p$@ 
+       dh_shlibdeps -p$@
        dh_gencontrol -p$@
        dh_md5sums -p$@
        dh_builddeb -p$@