debian/changelog | 5 +++
debian/control | 87 +++++++++++++++++++++++++++++++++++++++----------------
debian/rules | 3 +
3 files changed, 70 insertions(+), 25 deletions(-)
New commits:
commit d0093ea1a0a75bb2a5674581bac196ad6a941686
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Apr 8 17:50:38 2009 +0100
Move a bunch of dix build-deps around
diff --git a/debian/control b/debian/control
index 4dce48e..7e0b5f5 100644
--- a/debian/control
+++ b/debian/control
@@ -47,6 +47,10 @@ Build-Depends:
libpixman-1-dev (>= 0.13.2),
libpciaccess-dev,
libgcrypt-dev,
+ libdbus-1-dev [!hurd-i386],
+ libhal-dev [!hurd-i386],
+ libselinux1-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k
mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
+ libaudit-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips
mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
x11proto-xf86dri-dev,
libdrm-dev (>= 2.4.3) [!hurd-i386],
x11proto-gl-dev (>= 1.4.9),
@@ -66,10 +70,6 @@ Build-Depends:
libxtst-dev (>= 1:0.99.1),
libxres-dev (>= 1:0.99.1),
libxfixes-dev (>= 1:3.0.0),
- libdbus-1-dev [!hurd-i386],
- libhal-dev [!hurd-i386],
- libselinux1-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k
mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
- libaudit-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips
mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
libxv-dev,
libxinerama-dev
Build-Conflicts: xlibs-static-dev
commit 4fd33fb714addd938662097b1865a92acda62015
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Apr 8 17:46:48 2009 +0100
Get rid of obsolete build dependencies
* Remove build-dependencies on x11proto-evie-dev, x11proto-trap-dev,
x11proto-xf86misc-dev; the corresponding extensions are removed.
* Remove build-dependencies on x11proto-print-dev, libfreetype6-dev and
xfonts-utils since we don't build Xprt anymore.
diff --git a/debian/changelog b/debian/changelog
index 7f61684..4e9665f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,10 @@ xorg-server (2:1.6.0-1) UNRELEASED; urgency=low
* Turn on ModeDebug by default.
* Use libgcrypt for SHA1 instead of OpenSSL's libcrypto.
* Build the xselinux extension on Linux architectures.
+ * Remove build-dependencies on x11proto-evie-dev, x11proto-trap-dev,
+ x11proto-xf86misc-dev; the corresponding extensions are removed.
+ * Remove build-dependencies on x11proto-print-dev, libfreetype6-dev and
+ xfonts-utils since we don't build Xprt anymore.
-- David Nusinow <dnusi...@debian.org> Sun, 15 Feb 2009 18:49:51 -0500
diff --git a/debian/control b/debian/control
index a9ad450..4dce48e 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,6 @@ Build-Depends:
x11proto-composite-dev (>= 1:0.4),
x11proto-core-dev (>= 7.0.13),
x11proto-damage-dev (>= 1.1),
- x11proto-evie-dev,
x11proto-fixes-dev (>= 4.0),
x11proto-kb-dev (>= 1.0.3),
x11proto-xinerama-dev,
@@ -31,13 +30,11 @@ Build-Depends:
x11proto-render-dev (>= 2:0.9.3),
x11proto-resource-dev,
x11proto-scrnsaver-dev,
- x11proto-trap-dev,
x11proto-video-dev,
x11proto-xcmisc-dev,
x11proto-xext-dev (>= 7.0.3),
x11proto-xf86bigfont-dev,
x11proto-xf86dga-dev,
- x11proto-xf86misc-dev,
x11proto-xf86vidmode-dev,
xtrans-dev (>= 1.2.2),
libxau-dev (>= 1:0.99.1),
@@ -52,9 +49,6 @@ Build-Depends:
libgcrypt-dev,
x11proto-xf86dri-dev,
libdrm-dev (>= 2.4.3) [!hurd-i386],
- x11proto-print-dev,
- libfreetype6-dev,
- xfonts-utils,
x11proto-gl-dev (>= 1.4.9),
mesa-common-dev (>= 7.2+git20081209.a0d5c3cf),
libgl1-mesa-dev (>= 7.2+git20081209.a0d5c3cf),
commit bd79023b37f25802e7e10746dd905b2f10afb8bb
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Apr 8 17:35:24 2009 +0100
debian/control: move mesa-common-dev build-dep around
diff --git a/debian/control b/debian/control
index 7a6a6bd..a9ad450 100644
--- a/debian/control
+++ b/debian/control
@@ -56,6 +56,7 @@ Build-Depends:
libfreetype6-dev,
xfonts-utils,
x11proto-gl-dev (>= 1.4.9),
+ mesa-common-dev (>= 7.2+git20081209.a0d5c3cf),
libgl1-mesa-dev (>= 7.2+git20081209.a0d5c3cf),
libxmuu-dev (>= 1:0.99.1),
libxext-dev (>= 1:0.99.1),
@@ -76,7 +77,6 @@ Build-Depends:
libselinux1-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k
mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
libaudit-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips
mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
libxv-dev,
- mesa-common-dev (>= 7.2+git20081209.a0d5c3cf),
libxinerama-dev
Build-Conflicts: xlibs-static-dev
Standards-Version: 3.7.3
commit ad930d811e4ad0fef40137093781b6ee39bee7e6
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Apr 8 17:34:33 2009 +0100
Build the xselinux extension on Linux architectures.
Requested by Manoj.
diff --git a/debian/changelog b/debian/changelog
index 4464561..7f61684 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ xorg-server (2:1.6.0-1) UNRELEASED; urgency=low
included upstream.
* Turn on ModeDebug by default.
* Use libgcrypt for SHA1 instead of OpenSSL's libcrypto.
+ * Build the xselinux extension on Linux architectures.
-- David Nusinow <dnusi...@debian.org> Sun, 15 Feb 2009 18:49:51 -0500
diff --git a/debian/control b/debian/control
index acf4a1b..7a6a6bd 100644
--- a/debian/control
+++ b/debian/control
@@ -73,6 +73,8 @@ Build-Depends:
libxfixes-dev (>= 1:3.0.0),
libdbus-1-dev [!hurd-i386],
libhal-dev [!hurd-i386],
+ libselinux1-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k
mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
+ libaudit-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips
mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
libxv-dev,
mesa-common-dev (>= 7.2+git20081209.a0d5c3cf),
libxinerama-dev
diff --git a/debian/rules b/debian/rules
index 66058d4..c9af5bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,8 +34,10 @@ endif
ifeq ($(DEB_HOST_ARCH_OS), linux)
build_xfbdev = --enable-xfbdev
+ selinux = --enable-xselinux
else
build_xfbdev = --disable-xfbdev
+ selinux = --disable-xselinux
endif
INSTALL=/usr/bin/install
@@ -50,6 +52,7 @@ confflags += --disable-static \
--disable-builtin-fonts \
--enable-xtrap \
--enable-record \
+ $(selinux) \
--enable-glx-tls \
--enable-dmx \
--enable-vfb \
commit 8e435b1345498f2cdf645756200e00e6b2fa74b2
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Apr 8 17:28:56 2009 +0100
move quilt build-dep to more logical place
diff --git a/debian/control b/debian/control
index 31b4fa7..acf4a1b 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Uploaders: David Nusinow <dnusi...@debian.org>, Steve
Langasek <vor...@debian.or
# everything on is for the DMX and Xnest servers.
Build-Depends:
debhelper (>= 4.0.0),
+ quilt,
lsb-release,
pkg-config,
bison,
@@ -62,7 +63,6 @@ Build-Depends:
libxrender-dev (>= 1:0.9.0),
libxi-dev (>= 1:0.99.1),
x11proto-dmx-dev,
- quilt,
libdmx-dev (>= 1:1.0.1),
libxpm-dev (>= 1:3.5.3),
libxaw7-dev (>= 1:0.99.1),
commit c7062a420123fb23591d0e0a05b2663fcd36f9f3
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Apr 8 17:28:12 2009 +0100
debian/control: reformat the Build-Depends field
Put one package per line.
diff --git a/debian/control b/debian/control
index 15eb0c5..31b4fa7 100644
--- a/debian/control
+++ b/debian/control
@@ -8,32 +8,73 @@ Uploaders: David Nusinow <dnusi...@debian.org>, Steve
Langasek <vor...@debian.or
# x11proto-xf86dri-dev and libdrm-dev are for DRI support for the Xorg server.
# x11proto-print-dev and libfreetype6-dev are for Xprint
# everything on is for the DMX and Xnest servers.
-Build-Depends: debhelper (>= 4.0.0), lsb-release, pkg-config, bison, flex,
- automake, libtool, xutils-dev,
- x11proto-bigreqs-dev, x11proto-composite-dev (>= 1:0.4),
+Build-Depends:
+ debhelper (>= 4.0.0),
+ lsb-release,
+ pkg-config,
+ bison,
+ flex,
+ automake,
+ libtool,
+ xutils-dev,
+ x11proto-bigreqs-dev,
+ x11proto-composite-dev (>= 1:0.4),
x11proto-core-dev (>= 7.0.13),
- x11proto-damage-dev (>= 1.1), x11proto-evie-dev, x11proto-fixes-dev (>= 4.0),
- x11proto-kb-dev (>= 1.0.3), x11proto-xinerama-dev, x11proto-randr-dev (>=
1.2.99.3),
- x11proto-record-dev, x11proto-render-dev (>= 2:0.9.3), x11proto-resource-dev,
- x11proto-scrnsaver-dev, x11proto-trap-dev, x11proto-video-dev,
- x11proto-xcmisc-dev, x11proto-xext-dev (>= 7.0.3),
- x11proto-xf86bigfont-dev, x11proto-xf86dga-dev, x11proto-xf86misc-dev,
- x11proto-xf86vidmode-dev, xtrans-dev (>= 1.2.2), libxau-dev (>= 1:0.99.1),
- x11proto-input-dev (>= 1.5), x11proto-dri2-dev (>= 1.99.3),
- libxdmcp-dev (>= 1:0.99.1), libxfont-dev, libfontenc-dev,
- libxkbfile-dev (>= 1:0.99.1), libpixman-1-dev (>= 0.13.2),
- libpciaccess-dev, libgcrypt-dev,
- x11proto-xf86dri-dev, libdrm-dev (>= 2.4.3) [!hurd-i386],
- x11proto-print-dev, libfreetype6-dev, xfonts-utils,
- x11proto-gl-dev (>= 1.4.9), libgl1-mesa-dev (>= 7.2+git20081209.a0d5c3cf),
- libxmuu-dev (>= 1:0.99.1), libxext-dev (>= 1:0.99.1),
- libx11-dev (>= 1:0.99.2), libxrender-dev (>= 1:0.9.0),
- libxi-dev (>= 1:0.99.1), x11proto-dmx-dev, quilt, libdmx-dev (>= 1:1.0.1),
- libxpm-dev (>= 1:3.5.3), libxaw7-dev (>= 1:0.99.1),
- libxt-dev (>= 1:0.99.1), libxmu-dev (>= 1:0.99.1),
- libxtst-dev (>= 1:0.99.1), libxres-dev (>= 1:0.99.1),
- libxfixes-dev (>= 1:3.0.0), libdbus-1-dev [!hurd-i386],
- libhal-dev [!hurd-i386], libxv-dev, mesa-common-dev (>=
7.2+git20081209.a0d5c3cf),
+ x11proto-damage-dev (>= 1.1),
+ x11proto-evie-dev,
+ x11proto-fixes-dev (>= 4.0),
+ x11proto-kb-dev (>= 1.0.3),
+ x11proto-xinerama-dev,
+ x11proto-randr-dev (>= 1.2.99.3),
+ x11proto-record-dev,
+ x11proto-render-dev (>= 2:0.9.3),
+ x11proto-resource-dev,
+ x11proto-scrnsaver-dev,
+ x11proto-trap-dev,
+ x11proto-video-dev,
+ x11proto-xcmisc-dev,
+ x11proto-xext-dev (>= 7.0.3),
+ x11proto-xf86bigfont-dev,
+ x11proto-xf86dga-dev,
+ x11proto-xf86misc-dev,
+ x11proto-xf86vidmode-dev,
+ xtrans-dev (>= 1.2.2),
+ libxau-dev (>= 1:0.99.1),
+ x11proto-input-dev (>= 1.5),
+ x11proto-dri2-dev (>= 1.99.3),
+ libxdmcp-dev (>= 1:0.99.1),
+ libxfont-dev,
+ libfontenc-dev,
+ libxkbfile-dev (>= 1:0.99.1),
+ libpixman-1-dev (>= 0.13.2),
+ libpciaccess-dev,
+ libgcrypt-dev,
+ x11proto-xf86dri-dev,
+ libdrm-dev (>= 2.4.3) [!hurd-i386],
+ x11proto-print-dev,
+ libfreetype6-dev,
+ xfonts-utils,
+ x11proto-gl-dev (>= 1.4.9),
+ libgl1-mesa-dev (>= 7.2+git20081209.a0d5c3cf),
+ libxmuu-dev (>= 1:0.99.1),
+ libxext-dev (>= 1:0.99.1),
+ libx11-dev (>= 1:0.99.2),
+ libxrender-dev (>= 1:0.9.0),
+ libxi-dev (>= 1:0.99.1),
+ x11proto-dmx-dev,
+ quilt,
+ libdmx-dev (>= 1:1.0.1),
+ libxpm-dev (>= 1:3.5.3),
+ libxaw7-dev (>= 1:0.99.1),
+ libxt-dev (>= 1:0.99.1),
+ libxmu-dev (>= 1:0.99.1),
+ libxtst-dev (>= 1:0.99.1),
+ libxres-dev (>= 1:0.99.1),
+ libxfixes-dev (>= 1:3.0.0),
+ libdbus-1-dev [!hurd-i386],
+ libhal-dev [!hurd-i386],
+ libxv-dev,
+ mesa-common-dev (>= 7.2+git20081209.a0d5c3cf),
libxinerama-dev
Build-Conflicts: xlibs-static-dev
Standards-Version: 3.7.3
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
