xorg-server: Changes to 'ubuntu'
debian/changelog | 35 +++++++++++++++++++++++++++++++++++
debian/control | 5 +++--
debian/rules | 4 ++++
3 files changed, 42 insertions(+), 2 deletions(-)
New commits:
commit 4bb0a0b0c9db6f972cf842e7449d6b8fdada06ff
Author: Chris Nasho <chris.nasho@sympatico.ca>
Date: Fri Aug 1 15:47:24 2008 +0200
debian/rules: Added --enable-record.
By default, xorg-server does not build the RECORD extension. Added the
record module (for Xnee and other purposes).
diff --git a/debian/changelog b/debian/changelog
index b0c2c3e..6ddcd41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.4.99.905-0ubuntu5) intrepid; urgency=low
+
+ * debian/rules:
+ Added --enable-record. By default, xorg-server does not build the
+ RECORD extension. Added the record module (for Xnee and other purposes).
+
+ -- Chris Nasho <chris.nasho@sympatico.ca> Thu, 31 Jul 2008 17:26:00 -0400
+
xorg-server (2:1.4.99.905-0ubuntu4) intrepid; urgency=low
* debian/rules:
diff --git a/debian/rules b/debian/rules
index 4fd644c..b30510e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,6 +49,7 @@ confflags += --disable-static \
--enable-xtrap \
--enable-glx-tls \
--enable-dmx \
+ --enable-record \
--enable-vfb \
--enable-kdrive \
--enable-xephyr \
commit 921745b928fc219a2d083bd2c371120a2b157a8a
Author: Bryce Harrington <bryce@ubuntu.com>
Date: Fri Aug 1 15:45:33 2008 +0200
debian/rules: Add --enable-xcsecurity --enable-appgroup.
The SECURITY module was disabled by default in commit
86b2e59bfb79bd042a13c35fbb4ccecec576f629, as part of the SELinux merge.
However, we need the security module for xauth on Kubuntu, else ubiquity
fails. (Ref. LP 247537)
diff --git a/debian/changelog b/debian/changelog
index 7cea283..b0c2c3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xorg-server (2:1.4.99.905-0ubuntu4) intrepid; urgency=low
+
+ * debian/rules:
+ Add --enable-xcsecurity --enable-appgroup. The SECURITY module was
+ disabled by default in commit 86b2e59bfb79bd042a13c35fbb4ccecec576f629,
+ as part of the SELinux merge. However, we need the security module
+ for xauth on Kubuntu, else ubiquity fails. (Ref. LP 247537)
+
+ -- Bryce Harrington <bryce@ubuntu.com> Wed, 16 Jul 2008 06:01:45 -0700
+
xorg-server (2:1.4.99.905-0ubuntu3) intrepid; urgency=low
* patches/124_fix_randr_no_crtc.patch:
diff --git a/debian/rules b/debian/rules
index 488b8c6..4fd644c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,6 +52,8 @@ confflags += --disable-static \
--enable-vfb \
--enable-kdrive \
--enable-xephyr \
+ --enable-xcsecurity \
+ --enable-appgroup \
--disable-xsdl \
--disable-xfake \
$(build_xfbdev) \
commit 413e24b99be9e727b9b975af22fd123206c61c1c
Author: Timo Aaltonen <tepsipakki@ubuntu.com>
Date: Fri Aug 1 15:56:17 2008 +0200
Merge with debian git
new changes:
- Build with --enable-glx-tls, we build mesa with TLS support (otherwise
swrast_dri.so might fail to load due to unresolved symbols).
- Make the servers recommend libgl1-mesa-dri (>= 7.1~rc1). Without this
package, the GLX extension fails to initialise (and takes the server
down) due to missing swrast_dri.so.
diff --git a/debian/changelog b/debian/changelog
index ceac8d8..a332236 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+xorg-server (2:1.4.99.905-0ubuntu2) intrepid; urgency=low
+
+ * Merge with debian git, new changes:
+ - Build with --enable-glx-tls, we build mesa with TLS support
+ (otherwise swrast_dri.so might fail to load due to unresolved
+ symbols).
+ - Make the servers recommend libgl1-mesa-dri (>= 7.1~rc1). Without
+ this package, the GLX extension fails to initialise (and takes the
+ server down) due to missing swrast_dri.so.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Mon, 07 Jul 2008 11:44:39 +0300
+
xorg-server (2:1.4.99.905-0ubuntu1) intrepid; urgency=low
* Merge with Debian experimental, remaining changes:
commit 76702dde1b2f4afc96f56b30fb5dfb30e55ac955
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 6 17:09:25 2008 +0200
Make the servers recommend libgl1-mesa-dri (>= 7.1~rc1).
Without this package, the GLX extension fails to initialise
(and takes the server down) due to missing swrast_dri.so.
diff --git a/debian/changelog b/debian/changelog
index ae17661..4688423 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ xorg-server (2:1.4.99.905-1) UNRELEASED; urgency=low
software driver itself), and don't pass --with-mesa-source to configure.
* Build with --enable-glx-tls, we build mesa with TLS support (otherwise
swrast_dri.so might fail to load due to unresolved symbols).
+ * Make the servers recommend libgl1-mesa-dri (>= 7.1~rc1). Without this
+ package, the GLX extension fails to initialise (and takes the server down)
+ due to missing swrast_dri.so.
[ Timo Aaltonen ]
* Re-enable dri & glx.
diff --git a/debian/control b/debian/control
index 9b5b17e..bec5d3a 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/xserver/xorg-server.git
Package: xserver-xorg-core
Architecture: any
Depends: x11-common (>= 1:7.0.0), ${shlibs:Depends}, ${misc:Depends}, xserver-xorg
-Recommends: xkb-data, xfonts-base
+Recommends: xkb-data, xfonts-base, libgl1-mesa-dri (>= 7.1~rc1)
Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable
Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0),
xserver-xorg-video, xserver-common, xserver-xorg-video-1.0, xserver-xorg-input,
@@ -128,6 +128,7 @@ Description: Distributed Multihead X tools
Package: xnest
Architecture: any
Depends: x11-common, ${shlibs:Depends}, ${misc:Depends}
+Recommends: libgl1-mesa-dri (>= 7.1~rc1)
Description: Nested X server
Xnest is a nested X server that simply relays all its requests to another
X server, where it runs as a client. This means that it appears as another
@@ -173,7 +174,7 @@ Description: Virtual Framebuffer 'fake' X server
Package: xserver-xephyr
Architecture: any
Depends: x11-common, ${shlibs:Depends}, ${misc:Depends}
-Recommends: xbase-clients, xfonts-base
+Recommends: xbase-clients, xfonts-base, libgl1-mesa-dri (>= 7.1~rc1)
Description: nested X server
Xephyr is an X server that can be run inside another X server,
much like Xnest. It is based on the kdrive X server, and as a
commit 6ead5f675d5ea587c68c00ba55049320ff3e806c
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 6 17:07:34 2008 +0200
Build with --enable-glx-tls
This needs to be in sync with mesa, which we build with TLS support
(otherwise swrast_dri.so might fail to load due to unresolved symbols).
diff --git a/debian/changelog b/debian/changelog
index 0701579..ae17661 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ xorg-server (2:1.4.99.905-1) UNRELEASED; urgency=low
* bump serverminver to 2:1.4.99.905.
* Stop build-depending on mesa-swx11-source (mesa 7.1 will build the
software driver itself), and don't pass --with-mesa-source to configure.
+ * Build with --enable-glx-tls, we build mesa with TLS support (otherwise
+ swrast_dri.so might fail to load due to unresolved symbols).
[ Timo Aaltonen ]
* Re-enable dri & glx.
diff --git a/debian/rules b/debian/rules
index 2d5ef53..488b8c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,6 +47,7 @@ confflags += --disable-static \
--with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType" \
--with-serverconfig-path=/etc/X11/xserver \
--enable-xtrap \
+ --enable-glx-tls \
--enable-dmx \
--enable-vfb \
--enable-kdrive \
Reply to: