implement debian/rules build-{arch,indep} as required by policy 3.9.4

[apt.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 5051dab4f8caaa32bcd05574dd71fee51a567684..4686f569de06b659a7adb5a4ca8673e0f5929f85 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -66,7 +66,7 @@ LIBAPT_INST=libapt-inst$(LIBAPTINST_MAJOR)
 # do not fail as we are just experimenting with symbol files for now
 export DPKG_GENSYMBOLS_CHECK_LEVEL=0
 
 # do not fail as we are just experimenting with symbol files for now
 export DPKG_GENSYMBOLS_CHECK_LEVEL=0
 

-build: build/build-stamp
+build-binary: build/build-binary-stamp

 build-debiandoc: build/build-debiandoc-stamp
 build-manpages: build/build-manpages-stamp
 
 build-debiandoc: build/build-debiandoc-stamp
 build-manpages: build/build-manpages-stamp
 


@@ -76,7 +76,7 @@ build-manpages: build/build-manpages-stamp
 build/environment.mak: build/configure-stamp
        @true
 
 build/environment.mak: build/configure-stamp
        @true
 

-configure: configure.in
+configure: configure.ac

 build/configure-stamp: configure
        dh_testdir
        -mkdir build
 build/configure-stamp: configure
        dh_testdir
        -mkdir build


@@ -84,7 +84,7 @@ build/configure-stamp: configure
        cd build && CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" ../configure $(confflags)
        touch $@
 
        cd build && CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" ../configure $(confflags)
        touch $@
 

-build/build-stamp: build/configure-stamp
+build/build-binary-stamp: build/configure-stamp

        # Add here commands to compile the package.
        $(MAKE) binary
        # compat symlink for the locale split
        # Add here commands to compile the package.
        $(MAKE) binary
        # compat symlink for the locale split


@@ -110,6 +110,7 @@ build/build-manpages-stamp: build/configure-stamp
 
 clean:
        dh_testdir
 
 clean:
        dh_testdir

+       dh_clean

 
        [ ! -f Makefile ] || $(MAKE) clean distclean
        rm -rf build
 
        [ ! -f Makefile ] || $(MAKE) clean distclean
        rm -rf build


@@ -119,7 +120,6 @@ clean:
 debian/%.install: debian/%.install.in
        sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@
 
 debian/%.install: debian/%.install.in
        sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@
 

-binary-indep: apt-doc libapt-pkg-doc

 # Build architecture-independent files here.
 libapt-pkg-doc: build-debiandoc
        dh_testdir -p$@
 # Build architecture-independent files here.
 libapt-pkg-doc: build-debiandoc
        dh_testdir -p$@


@@ -171,9 +171,8 @@ apt-doc: build-debiandoc
 
 # Build architecture-dependent files here.
 
 
 # Build architecture-dependent files here.
 

-binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-transport-https

 apt_MANPAGES = apt apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list
 apt_MANPAGES = apt apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list

-apt: build build-manpages
+apt: build-binary build-manpages

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


@@ -182,6 +181,8 @@ apt: build build-manpages
 # apt install
 #
        cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
 # apt install
 #
        cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove

+       cp debian/apt.auto-removal.sh debian/$@/etc/kernel/postinst.d/apt-auto-removal
+       chmod 755 debian/$@/etc/kernel/postinst.d/apt-auto-removal

 
        # make rosetta happy and remove pot files in po/ (but leave stuff
        # in po/domains/* untouched) and cp *.po into each domain dir
 
        # make rosetta happy and remove pot files in po/ (but leave stuff
        # in po/domains/* untouched) and cp *.po into each domain dir


@@ -203,7 +204,7 @@ apt: build build-manpages
        dh_bugfiles -p$@
        dh_lintian -p$@
        dh_installexamples -p$@ $(BLD)/docs/examples/*
        dh_bugfiles -p$@
        dh_lintian -p$@
        dh_installexamples -p$@ $(BLD)/docs/examples/*

-       dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES)))
+       dh_installman -p$@ $(wildcard $(patsubst %,doc/en/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES)))

        dh_installcron -p$@
        dh_installdocs -p$@
        dh_installchangelogs -p$@
        dh_installcron -p$@
        dh_installdocs -p$@
        dh_installchangelogs -p$@


@@ -217,7 +218,7 @@ apt: build build-manpages
        dh_md5sums -p$@
        dh_builddeb -p$@
 
        dh_md5sums -p$@
        dh_builddeb -p$@
 

-libapt-pkg-dev: build debian/libapt-pkg-dev.install
+libapt-pkg-dev: build-binary debian/libapt-pkg-dev.install

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


@@ -237,7 +238,7 @@ libapt-pkg-dev: build debian/libapt-pkg-dev.install
        dh_builddeb -p$@
 
 apt-utils_MANPAGES = apt-sortpkgs apt-ftparchive apt-extracttemplates
        dh_builddeb -p$@
 
 apt-utils_MANPAGES = apt-sortpkgs apt-ftparchive apt-extracttemplates

-apt-utils: build build-manpages
+apt-utils: build-binary build-manpages

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


@@ -253,7 +254,7 @@ apt-utils: build build-manpages
        dh_installexamples -p$@
 
        # Install the man pages..
        dh_installexamples -p$@
 
        # Install the man pages..

-       dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt-utils_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt-utils_MANPAGES)))
+       dh_installman -p$@ $(wildcard $(patsubst %,doc/en/%.[158],$(apt-utils_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt-utils_MANPAGES)))

 
        dh_installchangelogs -p$@
        dh_strip -p$@
 
        dh_installchangelogs -p$@
        dh_strip -p$@


@@ -266,7 +267,7 @@ apt-utils: build build-manpages
        dh_md5sums -p$@
        dh_builddeb -p$@
 
        dh_md5sums -p$@
        dh_builddeb -p$@
 

-$(LIBAPT_PKG): build debian/$(LIBAPT_PKG).install
+$(LIBAPT_PKG): build-binary debian/$(LIBAPT_PKG).install

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


@@ -285,7 +286,7 @@ $(LIBAPT_PKG): build debian/$(LIBAPT_PKG).install
        dh_md5sums -p$@
        dh_builddeb -p$@
 
        dh_md5sums -p$@
        dh_builddeb -p$@
 

-$(LIBAPT_INST): build debian/$(LIBAPT_INST).install
+$(LIBAPT_INST): build-binary debian/$(LIBAPT_INST).install

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


@@ -304,7 +305,7 @@ $(LIBAPT_INST): build debian/$(LIBAPT_INST).install
        dh_md5sums -p$@
        dh_builddeb -p$@
 
        dh_md5sums -p$@
        dh_builddeb -p$@
 

-apt-transport-https: build libapt-pkg-dev
+apt-transport-https: build-binary libapt-pkg-dev

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


@@ -330,10 +331,12 @@ apt-transport-https: build libapt-pkg-dev
 configure:
        $(MAKE) configure
 
 configure:
        $(MAKE) configure
 

-really-clean: clean
-       -find . -name Makefile.in -print0 | xargs --null --no-run-if-empty -- rm -f
-       find -name ChangeLog | xargs rm -f
-       rm -f l33ch-stamp
-
+# translate targets to targets required by debian-policy
+binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-transport-https
+binary-indep: apt-doc libapt-pkg-doc

 binary: binary-indep binary-arch
 binary: binary-indep binary-arch

+build-arch: build-binary
+build-indep: build-manpages build-debiandoc
+build: build-indep build-arch
+

 .PHONY: build clean binary-indep binary-arch binary
 .PHONY: build clean binary-indep binary-arch binary