xorg-server: Changes to 'debian-experimental'
debian/changelog | 5 +++--
debian/control | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit cc1bf4fd680ad8c0fdd8b111af47f101838b001d
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Aug 12 02:59:04 2007 +0200
Update pixman dep
diff --git a/debian/control b/debian/control
index d4fdedf..a05e32f 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 4.0.0), pkg-config, bison, flex,
x11proto-xf86vidmode-dev, xtrans-dev, libxau-dev (>= 1:0.99.1-1),
x11proto-input-dev (>= 1.4.2),
libxdmcp-dev (>= 1:0.99.1-1), libxfont-dev, libfontenc-dev,
- libxkbfile-dev (>= 1:0.99.1-1), libpixman-dev (>= 0.9.2),
+ libxkbfile-dev (>= 1:0.99.1-1), libpixman-1-dev,
x11proto-xf86dri-dev, libdrm-dev (>= 2.3.0) [!hurd-i386],
x11proto-print-dev, libfreetype6-dev, xfonts-utils,
mesa-swx11-source (>> 7.0.1~rc2-1),
commit 742e0dd3c3e4c778e54268b9f57906a71c536571
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Aug 10 15:58:34 2007 +0200
Don't build-dep on libhal-dev and libdbus-1-dev on hurd-i386.
Thanks, Samuel Thibault.
diff --git a/debian/changelog b/debian/changelog
index 327705b..5896eeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,7 +48,8 @@ xorg-server (2:1.3.99.0-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Add build-dep on x11proto-input-dev (>= 1.4.2), libpixman-dev
- (>= 0.9.0), libdbus-1-dev, libhal-dev.
+ (>= 0.9.0), libdbus-1-dev, libhal-dev (except on hurd-i386 for the last
+ two).
* Bump build-dep on mesa-swx11-source to >> 7.0.1~rc2-1.
* Bump serverminver to this version, videoabiver to 1.9, inputabiver to
0.9 (so this doesn't clash with a release and drivers have to be
@@ -61,7 +62,7 @@ xorg-server (2:1.3.99.0-1) UNRELEASED; urgency=low
[ Drew Parsons ]
* Update Xprint build to include pixman.
- -- Julien Cristau <jcristau@debian.org> Thu, 02 Aug 2007 03:17:21 +0200
+ -- Julien Cristau <jcristau@debian.org> Sat, 11 Aug 2007 18:37:57 +0200
xorg-server (2:1.3.0.0.dfsg-12) unstable; urgency=low
diff --git a/debian/control b/debian/control
index b1c22ff..d4fdedf 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,7 @@ Build-Depends: debhelper (>= 4.0.0), pkg-config, bison, flex,
libxpm-dev (>= 1:3.5.3-1), libxaw7-dev (>= 1:0.99.1-1),
libxt-dev (>= 1:0.99.1-1), libxmu-dev (>= 1:0.99.1-1),
libxtst-dev (>= 1:0.99.1-1), libxres-dev (>= 1:0.99.1-1),
- libxfixes-dev (>= 1:3.0.0), libdbus-1-dev, libhal-dev
+ libxfixes-dev (>= 1:3.0.0), libdbus-1-dev [!hurd-i386], libhal-dev [!hurd-i386]
Build-Conflicts: xlibs-static-dev
Standards-Version: 3.7.2.0
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xorg-server
Reply to: