From a40310a5e60d880ce1bd82f0513c5d6658bb48ef Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 30 Nov 2013 13:15:01 +0100 Subject: enable NOISE for build logs to enable analyse MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It was enabled for a (long) while in Ubuntu, but it shouldn't hurt to enable it in Debian as well – especially now that Debian has automatic analyses of the buildlogs which don't work that well without the 'noise' --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 06ccdac31..28525af50 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,9 @@ # 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_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -- cgit v1.2.3 From 0005fa07886135d6adfec59f2d722df229b7af12 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 30 Nov 2013 22:07:38 +0100 Subject: use a substvar to set the archive-keyring in debian/control Adds a small helper to extract the small information bits we store in apt-vendor.ent and uses it in debian/rules to set apt:keyring as a substvar for debian/control populated with the &keyring-package; info --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 28525af50..f4f7ec06b 100755 --- a/debian/rules +++ b/debian/rules @@ -219,7 +219,7 @@ apt: build-binary build-manpages debian/apt.install dh_fixperms -p$@ dh_installdeb -p$@ dh_shlibdeps -p$@ - dh_gencontrol -p$@ + dh_gencontrol -p$@ -- -Vapt:keyring="$(shell ./vendor/getinfo keyring-package)" dh_md5sums -p$@ dh_builddeb -p$@ -- cgit v1.2.3 From e093518c03b49a2def83d8b680be4490fed6e69c Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sun, 5 Jan 2014 19:41:15 +0100 Subject: debian/rules: Call dh_makeshlibs for 'apt' The package ships libapt-private now, so we need an ldconfig call in postinst. dh_makeshlibs creates one for us. Reported-by: lintian --- debian/rules | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index f4f7ec06b..3aa86480e 100755 --- a/debian/rules +++ b/debian/rules @@ -217,6 +217,7 @@ apt: build-binary build-manpages debian/apt.install dh_strip -p$@ dh_compress -p$@ dh_fixperms -p$@ + dh_makeshlibs -p$@ dh_installdeb -p$@ dh_shlibdeps -p$@ dh_gencontrol -p$@ -- -Vapt:keyring="$(shell ./vendor/getinfo keyring-package)" -- cgit v1.2.3 From c7a7271840cfc92d447f73d9a3b8ee146532b893 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 14 Feb 2014 00:55:20 +0100 Subject: do not compress .xhtml files and remove junk files dh_compress compresses .xhtml files by default, which breaks our doxygen documentation. doxygen has also a bunch of temporary files it creates which stay in the build directory and so we remove them before installing them as documentation. Closes: 738933 --- debian/rules | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 3aa86480e..1b3782ab6 100755 --- a/debian/rules +++ b/debian/rules @@ -134,6 +134,7 @@ libapt-pkg-doc: build-debiandoc # # 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* \ @@ -145,7 +146,7 @@ libapt-pkg-doc: build-debiandoc dh_installchangelogs -p$@ dh_strip -p$@ - dh_compress -p$@ + dh_compress -p$@ -X.xhtml dh_fixperms -p$@ dh_installdeb -p$@ dh_gencontrol -p$@ -- cgit v1.2.3