debian/changelog | 58 ++++++++++++++++++++++++++++++++++++++---
debian/control | 4 ++
debian/inputabiver | 2 -
debian/local/64-xorg-xkb.rules | 5 ---
debian/patches/series | 1
debian/rules | 2 -
debian/serverminver | 2 -
debian/videoabiver | 2 -
8 files changed, 62 insertions(+), 14 deletions(-)
New commits:
commit 741e4f5b6a0c781650bfa274cda0c6958060607f
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Mon Jan 31 21:47:58 2011 +1100
Release to Natty
diff --git a/debian/changelog b/debian/changelog
index d17ba69..ef71e37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.9.99.901+git20110131.be3be758-0ubuntu1) UNRELEASED;
urgency=low
+xorg-server (2:1.9.99.901+git20110131.be3be758-0ubuntu1) natty; urgency=low
* Merge from (unreleased) debian-experimental. Remaining Ubuntu changes:
- rules:
commit 44a4531accd80942e0c275b55c36988f881d634b
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Mon Jan 31 19:48:28 2011 +1100
Add Breaks: to prevent broken upgrades with fglrx & nvidia.
These should be fixed to depend on the appropriate ABI, and these Breaks
dropped in Natty+1
diff --git a/debian/changelog b/debian/changelog
index e0006a3..d17ba69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,8 +60,12 @@ xorg-server (2:1.9.99.901+git20110131.be3be758-0ubuntu1)
UNRELEASED; urgency=low
- Add "-nr" as a synonym for "-background none" to ease the transition from
the old 189_xserver_1.5.0_bg_none_root.patch patch. Can be dropped once
all the ?DM have been updated to use the new option.
+ * debian/control:
+ - Add Breaks: to xserver-xorg-video-8 and current fglrx. These proprietary
+ drivers don't yet have appropriate dependency information, so manually
+ handle them here to prevent broken upgrades.
- -- Christopher James Halse Rogers <r...@ubuntu.com> Mon, 10 Jan 2011
15:53:23 -0600
+ -- Christopher James Halse Rogers <r...@ubuntu.com> Mon, 31 Jan 2011
19:45:19 +1100
xorg-server (2:1.9.99.901-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 0df90b9..2c69d38 100644
--- a/debian/control
+++ b/debian/control
@@ -130,6 +130,10 @@ Breaks:
xserver-xorg-video-psb (<= 0.2.1-1ubuntu3),
xserver-xorg-video-tga (<= 1:1.1.0-9ubuntu1),
xserver-xorg-video-unichrome (<= 1:0.2.6.99-0ubuntu1),
+# Proprietary drivers don't have proper depends in Maverick
+# Drop after Natty release.
+ xserver-xorg-video-8,
+ fglrx (<= 2:8.801-0ubuntu2),
Provides:
xserver,
${videoabi},
commit fbced2e8741402eeaff82eb7a3a3ebc7074bc1fc
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Mon Jan 31 16:11:47 2011 +1100
Bump serverminver, videoabiver, inputabiver for new upstream versions.
diff --git a/debian/inputabiver b/debian/inputabiver
index b4de394..40e6bd9 100644
--- a/debian/inputabiver
+++ b/debian/inputabiver
@@ -1 +1 @@
-11
+12.1
diff --git a/debian/serverminver b/debian/serverminver
index 81e7b33..a99b238 100644
--- a/debian/serverminver
+++ b/debian/serverminver
@@ -1 +1 @@
-2:1.8.99.905-1ubuntu3
+2:1.9.99.901+git20110131.be3be758
diff --git a/debian/videoabiver b/debian/videoabiver
index 45a4fb7..ec63514 100644
--- a/debian/videoabiver
+++ b/debian/videoabiver
@@ -1 +1 @@
-8
+9
commit c912b80544342faab066a8de95a989d07296bed9
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Mon Jan 31 16:07:21 2011 +1100
Drop debian/rules dh_installchangelogs diff.
pkg-binary-mangler now strips these changelogs itself
diff --git a/debian/rules b/debian/rules
index f909e4e..7b9eb33 100755
--- a/debian/rules
+++ b/debian/rules
@@ -318,7 +318,7 @@ binary-indep: build install
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-initial
dh_install -i --sourcedir=debian/tmp
dh_installdocs -i
- dh_installchangelogs -i
+ dh_installchangelogs -i ChangeLog
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-deb
commit c041508a3ca81cf47b6bd45c6057830b63e89cff
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Mon Jan 31 16:06:34 2011 +1100
Drop 187_edid_quirk_hp_nc8430.patch; upstream
diff --git a/debian/changelog b/debian/changelog
index 9129934..e0006a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,7 @@ xorg-server (2:1.9.99.901+git20110131.be3be758-0ubuntu1)
UNRELEASED; urgency=low
+ 206_intel_8xx_default_to_fbdev.patch:
Makes 8xx class intel GPUs default to fbdev for stability. (LP:
#633593)
* Refresh 121_only_switch_vt_when_active.diff for new upstream.
+ * Drop 187_edid_quirk_hp_nc8430.patch; upstream.
* Drop 189_xserver_1.5.0_bg_none_root.patch; functionality now upstream.
* Refresh 190_cache-xkbcomp_output_for_fast_start_up.patch for new upstream.
* Drop 197_xvfb-randr.patch:
diff --git a/debian/patches/series b/debian/patches/series
index 5ed8b4b..670f6ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,7 +18,6 @@
168_glibc_trace_to_stderr.patch
169_mipointer_nullptr_checks.patch
172_cwgetbackingpicture_nullptr_check.patch
-187_edid_quirk_hp_nc8430.patch
188_default_primary_to_first_busid.patch
190_cache-xkbcomp_output_for_fast_start_up.patch
191-Xorg-add-an-extra-module-path.patch
commit 139b75c1d1d88e6e3b7092da8c30d3f123686747
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Mon Jan 31 16:02:26 2011 +1100
Update changelog for Debian merge
diff --git a/debian/changelog b/debian/changelog
index 8c8506f..9129934 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,19 +1,64 @@
xorg-server (2:1.9.99.901+git20110131.be3be758-0ubuntu1) UNRELEASED;
urgency=low
* Merge from (unreleased) debian-experimental. Remaining Ubuntu changes:
- - …
+ - rules:
+ + Disable SELinux, libaudit-dev is not in main yet. (LP: #406226)
+ + Enable xcsecurity. (LP: #247537)
+ + Add --with-extra-module-dir to support GL alternatives.
+ - control:
+ + Xvfb depends on xauth, x11-xkb-utils. (LP: #500102)
+ + Add breaks for incompatible drivers. (LP: #614993)
+ + Drop libaudit-dev from build-deps.
+ - local/xvfb-run*: Add correct docs about error codes. (LP #328205)
+ - debian/patches:
+ + 100_rethrow_signals.patch:
+ When aborting, re-raise signals for apport
+ + 109_fix-swcursor-crash.patch:
+ Avoid dereferencing null pointer while reloading cursors during
+ resume. (LP: #371405)
+ + 111_armel-drv-fallbacks.patch:
+ Add support for armel driver fallbacks.
+ + 121_only_switch_vt_when_active.diff:
+ Add a check to prevent the X server from changing the VT when killing
+ GDM from the console.
+ + 122_xext_fix_card32_overflow_in_xauth.patch:
+ Fix server crash when “xauth generate” is called with large timeout.
+ + 157_check_null_modes.patch, 162_null_crtc_in_rotation.patch,
+ 166_nullptr_xinerama_keyrepeat.patch, 167_nullptr_xisbread.patch
+ 169_mipointer_nullptr_checks.patch,
+ 172_cwgetbackingpicture_nullptr_check.patch:
+ Fix various segfaults in xserver by checking pointers for NULL
+ values before dereferencing them.
+ + 165_man_xorg_conf_no_device_ident.patch
+ Correct man page
+ + 168_glibc_trace_to_stderr.patch:
+ Report abort traces to stderr instead of terminal
+ + 184_virtual_devices_autodetect.patch:
+ Use vesa for qemu device, which is not supported by cirrus
+ + 188_default_primary_to_first_busid.patch:
+ Pick the first device and carry on (LP: #459512)
+ + 190_cache-xkbcomp_output_for_fast_start_up.patch:
+ + 191-Xorg-add-an-extra-module-path.patch:
+ Add support for the alternatives module path.
+ + 198_nohwaccess.patch:
+ Adds a -nohwaccess argument to make X not access the hardware
+ ports directly.
+ + 200_randr-null.patch:
+ Clarify a pointer initialization.
+ + 206_intel_8xx_default_to_fbdev.patch:
+ Makes 8xx class intel GPUs default to fbdev for stability. (LP:
#633593)
* Refresh 121_only_switch_vt_when_active.diff for new upstream.
* Drop 189_xserver_1.5.0_bg_none_root.patch; functionality now upstream.
* Refresh 190_cache-xkbcomp_output_for_fast_start_up.patch for new upstream.
* Drop 197_xvfb-randr.patch:
- miRandR, which this used, has been removed from the server.
+ * Drop 204_fix-neg-sync-transition.patch; upstream.
* Drop 207_dga_master_device.patch; upstream.
* Drop 208_switch_on_release.diff; upstream.
* debian/patches/209_add_legacy_bgnone_option.patch:
- Add "-nr" as a synonym for "-background none" to ease the transition from
the old 189_xserver_1.5.0_bg_none_root.patch patch. Can be dropped once
all the ?DM have been updated to use the new option.
- * Drop 204_fix-neg-sync-transition.patch; upstream.
-- Christopher James Halse Rogers <r...@ubuntu.com> Mon, 10 Jan 2011
15:53:23 -0600
commit aece2831ed8e1d9580e69ae809db3fd36a6f9d14
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Mon Jan 31 15:53:38 2011 +1100
Drop diff to debian/local/64-xorg-xkb.rules.
We now have keyboard-configuration instead of console-setup
diff --git a/debian/local/64-xorg-xkb.rules b/debian/local/64-xorg-xkb.rules
index df727a0..5a3c5b8 100644
--- a/debian/local/64-xorg-xkb.rules
+++ b/debian/local/64-xorg-xkb.rules
@@ -5,9 +5,4 @@ KERNEL!="event*", GOTO="xorg_xkb_end"
# import keyboard layout from /etc/default/keyboard
ENV{ID_INPUT_KEY}=="?*", IMPORT{file}="/etc/default/keyboard"
-# ignore "SKIP" keyboard model, which is a magic value from console-setup's
debconf
-ENV{XKBMODEL}=="SKIP", ENV{XKBMODEL}=""
-# Similarly, ignore this broken default variant, which breaks keyboard entirely
-ENV{XKBVARIANT}=="U.S. English", ENV{XKBVARIANT}=""
-
LABEL="xorg_xkb_end"
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pjris-0007be...@alioth.debian.org
