* apt-pkg/clean.cc:

[apt.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 7b221fc2a051df20a04fb2cfbcc3b08a9e18f7d6..83e23881c49b17469b0ad67cd43ed5bf179beb4a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -51,7 +51,7 @@ override BLD := ./build
 endif
 
 # APT Programs in apt-utils
 endif
 
 # APT Programs in apt-utils

-APT_UTILS=ftparchive sortpkgs extracttemplates internal-solver
+APT_UTILS=ftparchive sortpkgs extracttemplates

 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1


@@ -67,7 +67,7 @@ LIBAPT_INST=libapt-inst$(LIBAPTINST_MAJOR)
 export DPKG_GENSYMBOLS_CHECK_LEVEL=0
 
 build: build/build-stamp
 export DPKG_GENSYMBOLS_CHECK_LEVEL=0
 
 build: build/build-stamp

-build-doc: build-manpages build/build-doc-stamp
+build-debiandoc: build/build-debiandoc-stamp

 build-manpages: build/build-manpages-stamp
 
 # Note that this is unconditionally done first as part of loading environment.mak
 build-manpages: build/build-manpages-stamp
 
 # Note that this is unconditionally done first as part of loading environment.mak


@@ -98,9 +98,9 @@ else
 endif
        touch $@
 
 endif
        touch $@
 

-build/build-doc-stamp: build/build-manpages-stamp build/configure-stamp
+build/build-debiandoc-stamp: build/configure-stamp

        # Add here commands to compile the package.
        # Add here commands to compile the package.

-       $(MAKE) doc
+       $(MAKE) debiandoc

        touch $@
 
 build/build-manpages-stamp: build/configure-stamp
        touch $@
 
 build/build-manpages-stamp: build/configure-stamp


@@ -121,7 +121,7 @@ debian/%.install: debian/%.install.in
 
 binary-indep: apt-doc libapt-pkg-doc
 # Build architecture-independent files here.
 
 binary-indep: apt-doc libapt-pkg-doc
 # Build architecture-independent files here.

-libapt-pkg-doc: build-doc
+libapt-pkg-doc: build-debiandoc

        dh_testdir -p$@
        dh_testroot -p$@
        dh_prep -p$@
        dh_testdir -p$@
        dh_testroot -p$@
        dh_prep -p$@


@@ -147,7 +147,7 @@ libapt-pkg-doc: build-doc
        dh_md5sums -p$@
        dh_builddeb -p$@
 
        dh_md5sums -p$@
        dh_builddeb -p$@
 

-apt-doc: build-doc
+apt-doc: build-debiandoc

        dh_testdir -p$@
        dh_testroot -p$@
        dh_prep -p$@
        dh_testdir -p$@
        dh_testroot -p$@
        dh_prep -p$@


@@ -191,7 +191,7 @@ apt: build build-manpages
        dh_install -p$@ --sourcedir=$(BLD)
 
        # Remove the bits that are in apt-utils
        dh_install -p$@ --sourcedir=$(BLD)
 
        # Remove the bits that are in apt-utils

-       rm $(addprefix debian/$@/usr/bin/apt-,$(APT_UTILS) dump-solver)
+       rm $(addprefix debian/$@/usr/bin/apt-,$(APT_UTILS) dump-solver internal-solver)

 
        # https has its own package
        rm debian/$@/usr/lib/apt/methods/https
 
        # https has its own package
        rm debian/$@/usr/lib/apt/methods/https


@@ -245,6 +245,7 @@ apt-utils: build build-manpages
 
        cp $(addprefix $(BLD)/bin/apt-,$(APT_UTILS)) debian/$@/usr/bin/
        cp $(BLD)/bin/apt-dump-solver debian/$@/usr/lib/apt/solvers/dump
 
        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

 
        dh_install -p$@ --sourcedir=$(BLD)
        dh_link -p$@
 
        dh_install -p$@ --sourcedir=$(BLD)
        dh_link -p$@