Source: xfonts-utils Version: 1:7.7+2 Severity: wishlist Tags: patch Hi, This is a follow-up to #717843 to add the build profile annotations to the control file (the <!profile.stage1> annotation to the build dependencies so that sbuild, debhelper and dpkg-dev know not to install or require them and the Build-Profiles: header to the binary packages so that debhelper knows not to attempt to build them). Since it requires support for the build profile syntax in sbuild, debhelper and dpkg-dev, these changes will probably have to wait for the release of Jessie to be actually uploaded to the Debian archive. If anything goes wrong with the patch, it is also available at https://gitorious.org/roam-debian-bootstrap/xfonts-utils-debian/commits/roam-stage1-control Thanks again for your work on Debian! 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 -- Peter Pentchev roam@ringlet.net roam@FreeBSD.org p.penchev@storpool.com PGP key: http://people.FreeBSD.org/~roam/roam.key.asc Key fingerprint 2EE7 A7A5 17FC 124C F115 C354 651E EFB0 2527 DF13
From 67ef396e7e86c40928cbe04a94a5d6086653db46 Mon Sep 17 00:00:00 2001
From: Peter Pentchev <roam@ringlet.net>
Date: Sat, 21 Jun 2014 13:53:15 +0300
Subject: [PATCH] Add build profile annotations to debian/control.
Add the <!profile.stage1> annotation to the build dependencies and the
Build-Profile: headers to the binary packages. Add versioned
dependencies on debhelper and dpkg-dev for build profile support.
Remove the -N... options passed to debhelper in the rules file.
---
debian/control | 17 +++++++++--------
debian/rules | 6 ++----
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/debian/control b/debian/control
index 09bc6f4..6c96074 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,17 @@ Source: xfonts-utils
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-# For stage1 builds, remove the libxfont-dev, libx11-dev, x11proto-core-dev,
-# libfreetype6-dev, and libfontenc-dev dependencies.
Build-Depends:
- debhelper (>= 7),
+ debhelper (>= 9.20140227),
+ dpkg-dev (>= 1.17.2),
pkg-config,
quilt,
autotools-dev,
- libxfont-dev (>= 1:1.0.0),
- libx11-dev (>= 2:1.0.0),
- x11proto-core-dev,
- libfreetype6-dev,
- libfontenc-dev,
+ libxfont-dev (>= 1:1.0.0) <!profile.stage1>,
+ libx11-dev (>= 2:1.0.0) <!profile.stage1>,
+ x11proto-core-dev <!profile.stage1>,
+ libfreetype6-dev <!profile.stage1>,
+ libfontenc-dev <!profile.stage1>,
xutils-dev (>= 1:7.5+4),
Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/font/xfonts-utils
@@ -22,6 +21,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/font/xfonts-utils.git
Package: xfonts-utils
Architecture: any
Multi-Arch: foreign
+Build-Profiles: !stage1
Depends:
${shlibs:Depends},
${misc:Depends},
@@ -43,6 +43,7 @@ Description: X Window System font utility programs
Package: xfonts-utils-stage1
Architecture: any
Multi-Arch: foreign
+Build-Profiles: stage1
Depends:
${shlibs:Depends},
${misc:Depends},
diff --git a/debian/rules b/debian/rules
index e0c50aa..184fc71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,14 +12,12 @@
ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
SUBDIRS = bdftopcf mkfontdir mkfontscale font-util fonttosfnt
-dh_exclude = -Nxfonts-utils-stage1
else
SUBDIRS = font-util
-dh_exclude = -Nxfonts-utils
endif
%:
- dh $@ --with autotools-dev,quilt $(dh_exclude)
+ dh $@ --with autotools-dev,quilt
STAMP_DIR = stampdir
@@ -66,7 +64,7 @@ override_dh_auto_install:
done
override_dh_install:
- dh_install --fail-missing $(dh_exclude)
+ dh_install --fail-missing
override_dh_installxfonts:
# we don't actually install any fonts
--
2.0.0
Attachment:
signature.asc
Description: Digital signature