From f1e4258badd06182b6fba35cfb1ade9c5506af81 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 21 Jun 2017 10:37:16 +0100 Subject: [PATCH] Implement build profile --- debian/changelog | 1 + debian/control | 10 ++++++---- debian/ostree.install | 4 +++- debian/rules | 34 ++++++++++++++++++++++------------ 4 files changed, 32 insertions(+), 17 deletions(-) mode change 100644 => 100755 debian/ostree.install diff --git a/debian/changelog b/debian/changelog index 5a47ecd7..4850e530 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ ostree (2017.7-1) UNRELEASED; urgency=medium - Use https URL for copyright-format * debian/dist/: Add ostree-trivial-httpd.xml, which was incorrectly excluded from the upstream release + * Implement build profile -- Simon McVittie Wed, 21 Jun 2017 10:07:42 +0100 diff --git a/debian/control b/debian/control index 8be2126d..24ab5a90 100644 --- a/debian/control +++ b/debian/control @@ -14,14 +14,15 @@ Build-Depends: ca-certificates, cpio, debhelper (>= 10~), - docbook-xml, - docbook-xsl, + dh-exec, + docbook-xml , + docbook-xsl , e2fslibs-dev, elfutils, fuse, gjs [!sparc64], gobject-introspection, - gtk-doc-tools, + gtk-doc-tools , libarchive-dev, libattr1-dev, libcap-dev, @@ -38,7 +39,7 @@ Build-Depends: procps, python , python-yaml , - xsltproc, + xsltproc , zlib1g-dev, Standards-Version: 4.0.0 Homepage: https://github.com/ostreedev/ostree/ @@ -105,6 +106,7 @@ Description: Development files for the ostree library This package contains development headers and the pkg-config file for ostree. Package: libostree-doc +Build-Profiles: Architecture: all Multi-Arch: foreign Section: doc diff --git a/debian/ostree.install b/debian/ostree.install old mode 100644 new mode 100755 index 4e555f92..b4b1a181 --- a/debian/ostree.install +++ b/debian/ostree.install @@ -1,5 +1,7 @@ +#!/usr/bin/dh-exec + etc/ostree usr/bin/ostree usr/bin/rofiles-fuse -usr/share/man +usr/share/man usr/share/ostree/trusted.gpg.d diff --git a/debian/rules b/debian/rules index c8e38178..269f66d8 100755 --- a/debian/rules +++ b/debian/rules @@ -16,19 +16,27 @@ override_dh_autoreconf: env NOCONFIGURE=1 dh_autoreconf ./autogen.sh cp debian/dist/ostree-trivial-httpd.xml man/ +configure_options = \ + --enable-installed-tests \ + --enable-trivial-httpd-cmdline \ + --libexecdir='$${prefix}/lib' \ + --with-dracut \ + --with-grub2 \ + --with-grub2-mkconfig-path=/usr/sbin/grub-mkconfig \ + --with-systemdsystemgeneratordir=/lib/systemd/system-generators \ + --with-systemdsystemunitdir=/lib/systemd/system \ + $(NULL) + +ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES))) +configure_options += --enable-gtk-doc +configure_options += --enable-man +else +configure_options += --disable-gtk-doc +configure_options += --disable-man +endif + override_dh_auto_configure: - dh_auto_configure -- \ - --disable-silent-rules \ - --enable-gtk-doc \ - --enable-installed-tests \ - --enable-trivial-httpd-cmdline \ - --libexecdir='$${prefix}/lib' \ - --with-dracut \ - --with-grub2 \ - --with-grub2-mkconfig-path=/usr/sbin/grub-mkconfig \ - --with-systemdsystemgeneratordir=/lib/systemd/system-generators \ - --with-systemdsystemunitdir=/lib/systemd/system \ - $(NULL) + dh_auto_configure -- $(configure_options) override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) @@ -37,12 +45,14 @@ endif override_dh_auto_install: dh_auto_install +ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES))) # docbook-xsl capitalizes the whole heading, including the macro # used to represent a single quote... https://bugs.debian.org/821235 sed -i -e 's,\*(AQ,*(Aq,g' \ debian/tmp/usr/share/man/man1/ostree-remote.1 \ debian/tmp/usr/share/man/man1/ostree-static-delta.1 \ $(NULL) +endif override_dh_install: rm -f debian/tmp/usr/lib/*/*.la