improve test for #731853 and comments

[apt.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 6409006788aa17e2b12e0138b9b8ff0fbba81f62..f4f7ec06bd803413137cca5deaf0a836d36f392e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,12 @@
 # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
 # Some lines taken from debmake, by Christoph Lameter.
 
 # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
 # Some lines taken from debmake, by Christoph Lameter.
 

+# build in verbose mode by default to make it easy to diangose issues
+export NOISY=1
+

 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)

+export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)

 
 # FOR AUTOCONF 2.52 AND NEWER ONLY
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
 
 # FOR AUTOCONF 2.52 AND NEWER ONLY
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))


@@ -18,6 +22,8 @@ endif
 
 ifneq (,$(shell which dpkg-buildflags))
   export CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS)
 
 ifneq (,$(shell which dpkg-buildflags))
   export CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS)

+  export LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
+  export CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)

 else
   ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
     export CXXFLAGS = -O0 -g -Wall
 else
   ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
     export CXXFLAGS = -O0 -g -Wall


@@ -31,9 +37,6 @@ build:
 
 PKG=apt
 DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS)
 
 PKG=apt
 DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS)

-APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p' | sed -e 's/\+.*$$//')
-APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(VERSION,"\(.*\)")/\1/p' configure.in)
-APT_CVSTAG=$(shell echo "$(APT_DEBVER)" | sed -e 's/^/v/' -e 's/\./_/g')

 
 # Determine the build directory to use
 BASE=.
 
 # Determine the build directory to use
 BASE=.


@@ -50,17 +53,6 @@ ifeq ($(words $(BLD)),0)
 override BLD := ./build
 endif
 
 override BLD := ./build
 endif
 

-# Rebuild configure.in to have the correct version from the change log
-ifneq ($(APT_DEBVER),$(APT_CONFVER))
-ifneq ($(APT_DEBVER),)
-.PHONY: configure.in
-configure.in:
-       sed -e 's/$(APT_CONFVER)/$(APT_DEBVER)/' $@ > $@.$$$$ && mv $@.$$$$ $@
-endif
-else
-configure.in:
-endif
-

 # APT Programs in apt-utils
 APT_UTILS=ftparchive sortpkgs extracttemplates
 
 # APT Programs in apt-utils
 APT_UTILS=ftparchive sortpkgs extracttemplates
 


@@ -70,15 +62,16 @@ APT_UTILS=ftparchive sortpkgs extracttemplates
 # Find the libapt-pkg major version for use in other control files
 include buildlib/libversion.mak
 
 # Find the libapt-pkg major version for use in other control files
 include buildlib/libversion.mak
 

-# Determine which package we should provide in the control files
-LIBAPTPKG_PROVIDE=libapt-pkg$(LIBAPTPKG_MAJOR)
-LIBAPTINST_PROVIDE=libapt-inst$(LIBAPTINST_MAJOR)
+# Determine which library package names to use
+LIBAPT_PKG=libapt-pkg$(LIBAPTPKG_MAJOR)
+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-doc: build/build-doc-stamp
+build-binary: build/build-binary-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
 # The true is needed to force make to reload environment.mak after running
 
 # Note that this is unconditionally done first as part of loading environment.mak
 # The true is needed to force make to reload environment.mak after running


@@ -86,33 +79,54 @@ build-doc: build/build-doc-stamp
 build/environment.mak: build/configure-stamp
        @true
 
 build/environment.mak: build/configure-stamp
        @true
 

-configure: configure.in
-build/configure-stamp: configure
+configure: configure.ac
+build/configure-stamp: configure buildlib/config.sub buildlib/config.guess

        dh_testdir
        -mkdir build
        cp COPYING debian/copyright
        dh_testdir
        -mkdir build
        cp COPYING debian/copyright

-       cd build && CXXFLAGS="$(CXXFLAGS)" ../configure $(confflags)
+       cd build && CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" ../configure $(confflags)

        touch $@
 
        touch $@
 

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

        # Add here commands to compile the package.
        $(MAKE) binary
        # Add here commands to compile the package.
        $(MAKE) binary

+       # compat symlink for the locale split
+       mkdir -p build/usr/share 
+       cd build/usr/share && ln -f -s ../../locale .
+       # compile and run tests
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+       $(MAKE) test
+else
+       @echo "Tests DISABLED"
+endif

        touch $@
 
        touch $@
 

-build/build-doc-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
+       # Add here commands to compile the package.
+       $(MAKE) manpages

        touch $@
 
 clean:
        dh_testdir
        touch $@
 
 clean:
        dh_testdir

+       dh_clean

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

+       rm -f debian/$(LIBAPT_PKG).install debian/$(LIBAPT_INST).install \
+             debian/libapt-pkg-dev.install debian/apt.install
+       test ! -L buildlib/config.guess || rm -f buildlib/config.guess
+       test ! -L buildlib/config.sub || rm -f buildlib/config.sub
+
+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.
 # 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$@


@@ -134,11 +148,11 @@ libapt-pkg-doc: build-doc
        dh_compress -p$@
        dh_fixperms -p$@
        dh_installdeb -p$@
        dh_compress -p$@
        dh_fixperms -p$@
        dh_installdeb -p$@

-       dh_gencontrol -p$@ -- -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE)
+       dh_gencontrol -p$@

        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$@


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

-binary-arch: apt libapt-pkg-dev apt-utils apt-transport-https
-apt_MANPAGES = apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list
-apt: build build-doc
+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-binary build-manpages debian/apt.install

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


@@ -173,6 +186,8 @@ apt: build build-doc
 # 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


@@ -182,7 +197,7 @@ apt: build build-doc
        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))
+       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


@@ -194,7 +209,7 @@ apt: build build-doc
        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$@


@@ -202,14 +217,13 @@ apt: build build-doc
        dh_strip -p$@
        dh_compress -p$@
        dh_fixperms -p$@
        dh_strip -p$@
        dh_compress -p$@
        dh_fixperms -p$@

-       dh_makeshlibs -p$@

        dh_installdeb -p$@
        dh_installdeb -p$@

-       dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib
-       dh_gencontrol -p$@ -- -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE)
+       dh_shlibdeps -p$@
+       dh_gencontrol -p$@ -- -Vapt:keyring="$(shell ./vendor/getinfo keyring-package)"

        dh_md5sums -p$@
        dh_builddeb -p$@
 
        dh_md5sums -p$@
        dh_builddeb -p$@
 

-libapt-pkg-dev: build
+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$@


@@ -224,25 +238,28 @@ libapt-pkg-dev: build
        dh_compress -p$@
        dh_fixperms -p$@
        dh_installdeb -p$@
        dh_compress -p$@
        dh_fixperms -p$@
        dh_installdeb -p$@

-       dh_gencontrol -p$@ -- -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE) -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE)
+       dh_gencontrol -p$@ -- -Vlibapt-pkg-name=$(LIBAPT_PKG) -Vlibapt-inst-name=$(LIBAPT_INST)

        dh_md5sums -p$@
        dh_builddeb -p$@
 
 apt-utils_MANPAGES = apt-sortpkgs apt-ftparchive apt-extracttemplates
        dh_md5sums -p$@
        dh_builddeb -p$@
 
 apt-utils_MANPAGES = apt-sortpkgs apt-ftparchive apt-extracttemplates

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

        dh_testdir -p$@
        dh_testroot -p$@
        dh_prep -p$@
        dh_installdirs -p$@
 
        cp $(addprefix $(BLD)/bin/apt-,$(APT_UTILS)) debian/$@/usr/bin/
        dh_testdir -p$@
        dh_testroot -p$@
        dh_prep -p$@
        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

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

+       dh_link -p$@

        dh_installdocs -p$@
        dh_installexamples -p$@
 
        # Install the man pages..
        dh_installdocs -p$@
        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$@


@@ -250,12 +267,50 @@ apt-utils: build
        dh_fixperms -p$@
        dh_makeshlibs -p$@
        dh_installdeb -p$@
        dh_fixperms -p$@
        dh_makeshlibs -p$@
        dh_installdeb -p$@

-       dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib
-       dh_gencontrol -p$@ -- -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE)
+       dh_shlibdeps -p$@
+       dh_gencontrol -p$@

        dh_md5sums -p$@
        dh_builddeb -p$@
 
        dh_md5sums -p$@
        dh_builddeb -p$@
 

-apt-transport-https: build libapt-pkg-dev
+$(LIBAPT_PKG): build-binary debian/$(LIBAPT_PKG).install
+       dh_testdir -p$@
+       dh_testroot -p$@
+       dh_prep -p$@
+       dh_installdirs -p$@
+
+       dh_install -p$@ --sourcedir=$(BLD)
+       dh_installdocs -p$@
+       dh_installchangelogs -p$@
+       dh_strip -p$@
+       dh_compress -p$@
+       dh_fixperms -p$@
+       dh_makeshlibs -p$@
+       dh_installdeb -p$@
+       dh_shlibdeps -p$@ 
+       dh_gencontrol -p$@
+       dh_md5sums -p$@
+       dh_builddeb -p$@
+
+$(LIBAPT_INST): build-binary debian/$(LIBAPT_INST).install
+       dh_testdir -p$@
+       dh_testroot -p$@
+       dh_prep -p$@
+       dh_installdirs -p$@
+
+       dh_install -p$@ --sourcedir=$(BLD)
+       dh_installdocs -p$@
+       dh_installchangelogs -p$@
+       dh_strip -p$@
+       dh_compress -p$@
+       dh_fixperms -p$@
+       dh_makeshlibs -p$@
+       dh_installdeb -p$@
+       dh_shlibdeps -p$@ 
+       dh_gencontrol -p$@
+       dh_md5sums -p$@
+       dh_builddeb -p$@
+
+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$@


@@ -273,18 +328,23 @@ apt-transport-https: build libapt-pkg-dev
        dh_compress -p$@
        dh_fixperms -p$@
        dh_installdeb -p$@
        dh_compress -p$@
        dh_fixperms -p$@
        dh_installdeb -p$@

-       dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib
+       dh_shlibdeps -p$@ 

        dh_gencontrol -p$@
        dh_md5sums -p$@
        dh_builddeb -p$@
 
        dh_gencontrol -p$@
        dh_md5sums -p$@
        dh_builddeb -p$@
 

+buildlib/config.guess buildlib/config.sub:
+       $(MAKE) "$@"
+

 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