diff --git a/debian/changelog b/debian/changelog index 4c36745..5f77aec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +xbase-clients (1:7.0.1-3) unstable; urgency=low + + * Drop broken build-dependency on xprint-utils, no thanks to anonymous + someone. + * Pass --disable-xprint to invocations of configure instead, which is + the real fix for the symptoms described: we want the xbase-clients + package to consistently build *without* xprint support, instead of + autodetecting (and possibly failing) based on whether libxp-dev is + installed. Properly closes: #366275. + + -- Steve Langasek Tue, 23 May 2006 12:13:37 -0700 + xbase-clients (1:7.0.1-2) unstable; urgency=low * Add xprint-utils to build-depends. Thanks anonymous someone. diff --git a/debian/control b/debian/control index 5460db5..befd41d 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 , Fabio M. Di Nitto -Build-Depends: debhelper (>= 4.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), ssh | rsh, x11proto-gl-dev, libgl1-mesa-dev, xbitmaps, quilt, xprint-utils +Build-Depends: debhelper (>= 4.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), ssh | rsh, x11proto-gl-dev, libgl1-mesa-dev, xbitmaps, quilt Standards-Version: 3.6.1.0 Package: xbase-clients diff --git a/debian/rules b/debian/rules index 58f1c0d..a10b3e7 100755 --- a/debian/rules +++ b/debian/rules @@ -48,6 +48,7 @@ build-stamp: (cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && \ ../"$$FILE"/configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info $(confflags) \ + --disable-xprint \ CFLAGS="$(CFLAGS)" && \ $(MAKE)) || exit 1; \ done