From 599ab3056128723ab7d11b3e7a8906da200b4c67 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Mon, 12 Feb 2007 05:41:53 +0100 Subject: [PATCH] Build-Depend on libpng12-dev instead of libpng-dev. xcursorgen's configure script requires the "libpng12" package from pkg-config. libpng14-dev has a Provides: libpng-dev, libpng12-dev, but doesn't actually install a libpng12.pc, so we try to pull in the real libpng12-dev by build-depending on it explicitely. --- debian/changelog | 8 ++++++++ debian/control | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f7d82b4..21d9516 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xbase-clients (1:7.2.ds1-2) experimental; urgency=low + + * Build-dep on libpng12-dev instead of libpng-dev. xcursorgen requires + libpng12.pc, which is not available in libpng14-dev, despite it providing + libpng-dev and libpng12-dev, *sigh*. + + -- Julien Cristau Mon, 12 Feb 2007 05:35:18 +0100 + xbase-clients (1:7.2.ds1-1) experimental; urgency=low * Patch setxkbmap(1) to refer to the correct location for xkb files, thanks diff --git a/debian/control b/debian/control index 578d7a1..3c1b094 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force Uploaders: David Nusinow , Branden Robinson , Julien Cristau -Build-Depends: debhelper (>= 5.0.0), pkg-config, libfs-dev (>= 2:1.0.0-1), libpng-dev, libx11-dev (>= 2:1.0.0-1), libxaw7-dev (>= 1:1.0.1-1), libxcursor-dev (>= 1.1.5.2-1), libxext-dev (>= 1:1.0.0-1), libxft-dev (>= 2.1.8.2-6), libxi-dev (>= 1:1.0.0-3), libxkbfile-dev (>= 1:1.0.1-1), libxmuu-dev (>= 1:1.0.1-1), libxrandr-dev (>= 2:1.1.0.2-1), libxrender-dev (>= 1:0.9.0.2-2), libxss-dev (>= 1:1.0.1-1), libxt-dev (>= 1:1.0.0-1), libxtrap-dev (>= 1:1.0.0-1), libxtst-dev (>= 1:1.0.1-1), libxxf86dga-dev (>= 1:1.0.1-1), libxv-dev (>= 1:1.0.1-1), libxxf86vm-dev (>= 1:1.0.0-1), x11proto-gl-dev, libgl1-mesa-dev, xbitmaps, quilt, openssh-client | ssh, x11proto-input-dev (>= 1.4) +Build-Depends: debhelper (>= 5.0.0), pkg-config, libfs-dev (>= 2:1.0.0-1), libpng12-dev, libx11-dev (>= 2:1.0.0-1), libxaw7-dev (>= 1:1.0.1-1), libxcursor-dev (>= 1.1.5.2-1), libxext-dev (>= 1:1.0.0-1), libxft-dev (>= 2.1.8.2-6), libxi-dev (>= 1:1.0.0-3), libxkbfile-dev (>= 1:1.0.1-1), libxmuu-dev (>= 1:1.0.1-1), libxrandr-dev (>= 2:1.1.0.2-1), libxrender-dev (>= 1:0.9.0.2-2), libxss-dev (>= 1:1.0.1-1), libxt-dev (>= 1:1.0.0-1), libxtrap-dev (>= 1:1.0.0-1), libxtst-dev (>= 1:1.0.1-1), libxxf86dga-dev (>= 1:1.0.1-1), libxv-dev (>= 1:1.0.1-1), libxxf86vm-dev (>= 1:1.0.0-1), x11proto-gl-dev, libgl1-mesa-dev, xbitmaps, quilt, openssh-client | ssh, x11proto-input-dev (>= 1.4) Standards-Version: 3.7.2.0 Package: xbase-clients