xorg-server: Changes to 'debian-experimental'
debian/changelog | 9 ++-
debian/control | 20 ++++----
debian/inputabiver | 2
debian/patches/001_ubuntu_add_extra_modelines_from_xorg.patch | 24 +---------
4 files changed, 21 insertions(+), 34 deletions(-)
New commits:
commit 77ab84beed520224ba38924ea3e87584c347cf98
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 14 13:33:49 2008 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 1691131..1f9f966 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.4.99.901-1) UNRELEASED; urgency=low
+xorg-server (2:1.4.99.901-1) experimental; urgency=low
[ Julien Cristau ]
* New upstream release candidate
@@ -42,7 +42,7 @@ xorg-server (2:1.4.99.901-1) UNRELEASED; urgency=low
* Build the Xfbdev server for real now, in new package xserver-xfbdev,
closes: #439764.
- -- Brice Goglin <bgoglin@debian.org> Tue, 11 Mar 2008 22:44:55 +0100
+ -- Julien Cristau <jcristau@debian.org> Fri, 14 Mar 2008 13:46:48 +0100
xorg-server (2:1.4.1~git20080131-2) UNRELEASED; urgency=low
commit 09a2cdeea3893be5c0a2d79e70e4bb675cab0039
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 14 13:46:17 2008 +0100
Don't build-dep on "foo (>= bar-1)", to fix lintian warnings.
diff --git a/debian/changelog b/debian/changelog
index 9b1beb3..1691131 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,7 @@ xorg-server (2:1.4.99.901-1) UNRELEASED; urgency=low
* Bump videoabiver to 2.9, inputabiver to 2.1, serverminver to 2:1.4.99.901.
* Drop obsolete --with-rgb-path configure option.
* /etc/X11/xserver/SecurityPolicy is gone, don't install it.
+ * Don't build-dep on "foo (>= bar-1)", to fix lintian warnings.
[ Drew Parsons ]
* Remove 94_xprint_XSERVER_LIBS (not needed in xserver 1.5).
diff --git a/debian/control b/debian/control
index e62dc14..61aa947 100644
--- a/debian/control
+++ b/debian/control
@@ -14,23 +14,23 @@ Build-Depends: debhelper (>= 4.0.0), lsb-release, pkg-config, bison, flex,
x11proto-kb-dev (>= 1.0.3), x11proto-xinerama-dev, x11proto-randr-dev (>= 1.2),
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 (>= 6.9.99.0-1),
+ x11proto-xcmisc-dev, x11proto-xext-dev (>= 6.9.99.0),
x11proto-xf86bigfont-dev, x11proto-xf86dga-dev, x11proto-xf86misc-dev,
- x11proto-xf86vidmode-dev, xtrans-dev, libxau-dev (>= 1:0.99.1-1),
+ x11proto-xf86vidmode-dev, xtrans-dev, libxau-dev (>= 1:0.99.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-1-dev (>= 0.9.5),
+ libxdmcp-dev (>= 1:0.99.1), libxfont-dev, libfontenc-dev,
+ libxkbfile-dev (>= 1:0.99.1), libpixman-1-dev (>= 0.9.5),
libpciaccess-dev, libssl-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),
x11proto-gl-dev (>= 1.4.9), libgl1-mesa-dev (>= 6.5.1),
- libxmuu-dev (>= 1:0.99.1-1), libxext-dev (>= 1:0.99.1-1),
- libx11-dev (>= 1:0.99.2-1), libxrender-dev (>= 1:0.9.0-1),
- libxi-dev (>= 1:0.99.1-1), x11proto-dmx-dev, quilt, libdmx-dev (>= 1:1.0.1-1),
- 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),
+ 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
Build-Conflicts: xlibs-static-dev
commit f14d80d2846f0b672ff3b7e09a2293a141915174
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 14 13:33:10 2008 +0100
001_ubuntu_add_extra_modelines_from_xorg.patch: remove whitespace changes
diff --git a/debian/changelog b/debian/changelog
index a678b2d..9b1beb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xorg-server (2:1.4.99.901-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* New upstream release candidate
* Update patches:
+ + 001_ubuntu_add_extra_modelines_from_xorg.patch: remove useless
+ whitespace changes
+ 02_libvgahw_gcc4_volatile_fix.diff: delete, the gcc bug this was working
around is fixed for a long time
+ 03_auto_load_driver.diff, 04_auto_load_driver_no_conf.diff,
diff --git a/debian/patches/001_ubuntu_add_extra_modelines_from_xorg.patch b/debian/patches/001_ubuntu_add_extra_modelines_from_xorg.patch
index 19f8ff4..8331481 100644
--- a/debian/patches/001_ubuntu_add_extra_modelines_from_xorg.patch
+++ b/debian/patches/001_ubuntu_add_extra_modelines_from_xorg.patch
@@ -1,6 +1,6 @@
--- foo/hw/xfree86/common/extramodes.orig 2005-03-28 14:40:18.784980424 +1000
+++ bar/hw/xfree86/common/extramodes 2005-03-28 15:04:04.731203648 +1000
-@@ -7,27 +7,53 @@
+@@ -7,17 +7,44 @@
# 832x624 @ 75Hz (74.55Hz) (fix if the official/Apple spec is different) hsync: 49.725kHz
ModeLine "832x624" 57.284 832 864 928 1152 624 625 628 667 -Hsync -Vsync
@@ -11,8 +11,7 @@
+ModeLine "1280x800" 83.46 1280 1344 1480 1680 800 801 804 828
+
# 1152x768 @ 54.8Hz (Titanium PowerBook) hsync: 44.2kHz
--ModeLine "1152x768" 64.995 1152 1178 1314 1472 768 771 777 806 +hsync +vsync
-+ModeLine "1152x768" 64.995 1152 1178 1314 1472 768 771 777 806 +hsync +vsync
+ ModeLine "1152x768" 64.995 1152 1178 1314 1472 768 771 777 806 +hsync +vsync
+
+# 1152x864 @ 85Hz (Red Hat custom modeline)
+ModeLine "1152x864" 121.5 1152 1216 1344 1568 864 865 868 911 +hsync -vsync
@@ -33,8 +32,7 @@
+ModeLine "1440x900" 108.84 1440 1472 1880 1912 900 918 927 946 +hsync +vsync
+
# 1600x1024 @ 60Hz (SGI 1600SW) hsync: 64.0kHz
--Modeline "1600x1024" 106.910 1600 1620 1640 1670 1024 1027 1030 1067 -hsync -vsync
-+ModeLine "1600x1024" 106.910 1600 1620 1640 1670 1024 1027 1030 1067 -hsync -vsync
+ Modeline "1600x1024" 106.910 1600 1620 1640 1670 1024 1027 1030 1067 -hsync -vsync
+
+# 1680x1050 @ 60Hz (LCD native res) hsync: 64.22kHz
+ModeLine "1680x1050" 147.14 1680 1784 1968 2256 1050 1051 1054 1087
@@ -46,18 +44,4 @@
+ModeLine "1920x1200" 230.0 1920 1936 2096 2528 1200 1201 1204 1250 -HSync -VSync
# 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz
--Modeline "1920x1440" 341.35 1920 2072 2288 2656 1440 1441 1444 1512 -hsync +vsync
-+ModeLine "1920x1440" 341.35 1920 2072 2288 2656 1440 1441 1444 1512 -hsync +vsync
-
- # 2048x1536 @ 60Hz (VESA GTF) hsync: 95.3kHz
--Modeline "2048x1536" 266.95 2048 2200 2424 2800 1536 1537 1540 1589 -hsync +vsync
-+ModeLine "2048x1536" 266.95 2048 2200 2424 2800 1536 1537 1540 1589 -hsync +vsync
-
- # 2048x1536 @ 75Hz (VESA GTF) hsync: 120.2kHz
--Modeline "2048x1536" 340.48 2048 2216 2440 2832 1536 1537 1540 1603 -hsync +vsync
-+ModeLine "2048x1536" 340.48 2048 2216 2440 2832 1536 1537 1540 1603 -hsync +vsync
-
- # 2048x1536 @ 85Hz (VESA GTF) hsync: 137.0kHz
--Modeline "2048x1536" 388.04 2048 2216 2440 2832 1536 1537 1540 1612 -hsync +vsync
--
-+ModeLine "2048x1536" 388.04 2048 2216 2440 2832 1536 1537 1540 1612 -hsync +vsync
+ Modeline "1920x1440" 341.35 1920 2072 2288 2656 1440 1441 1444 1512 -hsync +vsync
commit fb9fba3040e501cf5950e2e2f95deb86f7e2f6e1
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Mar 12 18:04:56 2008 +0100
Bump inputabiver to 2.1.
The libcwrapper was removed, which breaks some drivers.
Let's get them rebuilt (the alternative is to conflict against drivers
using the libc wrapper).
diff --git a/debian/changelog b/debian/changelog
index ce9f93e..a678b2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,7 +28,7 @@ xorg-server (2:1.4.99.901-1) UNRELEASED; urgency=low
on libpixman-1-dev to >= 0.9.5.
* Add build-dep on libxv-dev for Xephyr.
* Drop XS- prefix from Vcs-* debian/control fields.
- * Bump videoabiver to 2.9, serverminver to 2:1.4.99.901.
+ * Bump videoabiver to 2.9, inputabiver to 2.1, serverminver to 2:1.4.99.901.
* Drop obsolete --with-rgb-path configure option.
* /etc/X11/xserver/SecurityPolicy is gone, don't install it.
diff --git a/debian/inputabiver b/debian/inputabiver
index 0cfbf08..879b416 100644
--- a/debian/inputabiver
+++ b/debian/inputabiver
@@ -1 +1 @@
-2
+2.1
Reply to: