Source: pkg-config Version: 0.28-1 Severity: wishlist Tags: patch Hi, me again! :)
As promised, here's the separate bug report to simplify the changes needed for the intermediate bootstrapping package by using the proper build profile annotations in the debian/control file. If something goes wrong with this patch, it is also available in my Gitorious repository at https://gitorious.org/roam-debian-bootstrap/pkg-config-debian/commits/roam-stage1-control Thanks in advance for your time! G'luck, Peter -- System Information: Debian Release: jessie/sid APT prefers testing APT policy: (990, 'testing') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.14-1-amd64 (SMP w/4 CPU cores) Locale: LANG=bg_BG.UTF-8, LC_CTYPE=bg_BG.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -- no debconf information
From 696f030c9d682b1afc48923e051cd720d0a31426 Mon Sep 17 00:00:00 2001 From: Peter Pentchev <[email protected]> Date: Tue, 17 Jun 2014 19:39:39 +0300 Subject: [PATCH] Add the build profile annotations to d/control. Simplify the profile build a lot by using profile annotations in the debian/control file. - mark the libglib2.0-dev dependency as "not for the stage1 profile" - mark the pkg-config package as "not for stage1" and the pkg-config-stage1 one as "stage1 only" - depend on the proper versions of debhelper and dpkg-dev for parsing build profile information in debian/control - now that debhelper knows that it will only build a single package, revert the "list all files in *.install and *.manpages" part of the initial patch - no longer pass -N... to debhelper, it understands Build-Profiles --- debian/control | 6 ++++-- debian/pkg-config.install | 4 ---- debian/pkg-config.manpages | 1 - debian/rules | 4 +--- 4 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 debian/pkg-config.manpages diff --git a/debian/control b/debian/control index 2c82193..1b43b5d 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,14 @@ Source: pkg-config Section: devel Priority: optional Maintainer: Tollef Fog Heen <[email protected]> -# For stage1 builds, remove the libglib2.0-dev dependency. -Build-Depends: debhelper (>= 7.0.50), dh-autoreconf, libglib2.0-dev +Build-Depends: debhelper (>= 9.20140227), dpkg-dev (>= 1.17.2), dh-autoreconf, + libglib2.0-dev <!profile.stage1> Homepage: http://pkg-config.freedesktop.org Standards-Version: 3.8.4 Package: pkg-config Architecture: any +Build-Profiles: !stage1 Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends} Description: manage compile and link flags for libraries @@ -21,6 +22,7 @@ Description: manage compile and link flags for libraries Package: pkg-config-stage1 Architecture: any +Build-Profiles: stage1 Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends} Provides: pkg-config diff --git a/debian/pkg-config.install b/debian/pkg-config.install index c1ee38e..89c190e 100644 --- a/debian/pkg-config.install +++ b/debian/pkg-config.install @@ -1,5 +1 @@ -usr/bin/*-pkg-config -usr/bin/pkg-config -usr/share/aclocal/pkg.m4 -usr/share/doc/pkg-config/pkg-config-guide.html debian/pkg-config-crosswrapper usr/share diff --git a/debian/pkg-config.manpages b/debian/pkg-config.manpages deleted file mode 100644 index 22492ef..0000000 --- a/debian/pkg-config.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/share/man/man1/pkg-config.1 diff --git a/debian/rules b/debian/rules index fd37613..ae3a470 100755 --- a/debian/rules +++ b/debian/rules @@ -17,15 +17,13 @@ SYSTEM_LIBDIRS := $(shell for opt in '' $$($${CC-$(GCC)} -print-multi-lib | sed done | sort -u | tr '\n' : | sed 's/:$$//') ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES))) -dh_exclude= -Npkg-config-stage1 conf_glib= --without-internal-glib else -dh_exclude= -Npkg-config conf_glib= --with-internal-glib endif %: - dh $@ --with autoreconf $(dh_exclude) + dh $@ --with autoreconf override_dh_auto_configure: $(SET_PKG_CONFIG) ./configure --prefix=/usr \ -- 2.0.0
signature.asc
Description: Digital signature
