debian/changelog | 21 ++++++++++++++++++---
debian/control | 2 --
debian/patches/series | 2 +-
debian/rules | 2 +-
4 files changed, 20 insertions(+), 7 deletions(-)
New commits:
commit 8f025868589eee924f29905736dfa836be081b64
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Sun May 24 00:32:57 2009 +0300
Release 2:1.6.1.901-2ubuntu1
diff --git a/debian/changelog b/debian/changelog
index a96e0bd..e31a5dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.6.1.901-2ubuntu1) UNRELEASED; urgency=low
+xorg-server (2:1.6.1.901-2ubuntu1) karmic; urgency=low
* Merge from Debian unstable.
* Dropped patches:
@@ -17,7 +17,7 @@ xorg-server (2:1.6.1.901-2ubuntu1) UNRELEASED; urgency=low
* Disable SELinux support for now, because libaudit-dev needs to be
moved to main first.
- -- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 19 May 2009 14:07:44 +0300
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Sun, 24 May 2009 00:32:37 +0300
xorg-server (2:1.6.1.901-2) unstable; urgency=low
commit 0aaeb5b26c080d469806c522fa624b04f3b24517
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Sun May 24 00:27:54 2009 +0300
Explain in the changelog why the patches had been dropped.
diff --git a/debian/changelog b/debian/changelog
index d48b4eb..a96e0bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,17 @@
xorg-server (2:1.6.1.901-2ubuntu1) UNRELEASED; urgency=low
* Merge from Debian unstable.
+ * Dropped patches:
+ - obsolete:
+ 100_xserver_exa_force_greedy.patch
+ 107_fedora_dont_backfill_bg_none.patch
+ - upstream:
+ 163_thinko_in_xf86targetpreferred.patch
+ 171_xkb_geometry_copying.patch
+ 173_edid_quirk_philips_lcd.patch
+ 175_set_pointer_screen_in_xtestfakeinput.patch
+ 176_quell_warning_exacopydirty.patch
+ - included by Debian: 999_default_modedebug_on.patch
* Disable 143_default_to_vesa.patch for now, breaks autoconfiguration
when the pci-ids directory exists but has no match. (LP: #379504)
* Disable SELinux support for now, because libaudit-dev needs to be
commit 71fa1f5c2b6d5034984984eda729cf91ab091f98
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Sat May 23 23:08:43 2009 +0300
Disable SELinux support for now, because libaudit-dev needs to be moved to
main first.
diff --git a/debian/changelog b/debian/changelog
index 34c8953..d48b4eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xorg-server (2:1.6.1.901-2ubuntu1) UNRELEASED; urgency=low
* Merge from Debian unstable.
* Disable 143_default_to_vesa.patch for now, breaks autoconfiguration
when the pci-ids directory exists but has no match. (LP: #379504)
+ * Disable SELinux support for now, because libaudit-dev needs to be
+ moved to main first.
-- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 19 May 2009 14:07:44 +0300
diff --git a/debian/control b/debian/control
index ff7527c..379c2f0 100644
--- a/debian/control
+++ b/debian/control
@@ -50,8 +50,6 @@ Build-Depends:
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),
diff --git a/debian/rules b/debian/rules
index 622f951..9198681 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,7 @@ endif
ifeq ($(DEB_HOST_ARCH_OS), linux)
build_xfbdev = --enable-xfbdev
- selinux = --enable-xselinux
+ selinux = --disable-xselinux
else
build_xfbdev = --disable-xfbdev
selinux = --disable-xselinux
commit 54915aca433dc7f7abfd9c638c0b21fd347e47ba
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Sat May 23 22:59:57 2009 +0300
Disable 143_default_to_vesa.patch for now, breaks autoconfiguration when
the pci-ids directory exists but has no match. (LP: #379504)
diff --git a/debian/changelog b/debian/changelog
index c5fec29..34c8953 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xorg-server (2:1.6.1.901-2ubuntu1) UNRELEASED; urgency=low
* Merge from Debian unstable.
+ * Disable 143_default_to_vesa.patch for now, breaks autoconfiguration
+ when the pci-ids directory exists but has no match. (LP: #379504)
-- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 19 May 2009 14:07:44 +0300
diff --git a/debian/patches/series b/debian/patches/series
index 09bf0f3..2ec9c82 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,7 +12,7 @@ Add-libgcrypt-as-an-option-for-sha1.diff
121_only_switch_vt_when_active.diff
135_rethrow_signals.patch
140_quell_acpi_errmsgs.patch
-143_default_to_vesa.patch
+#143_default_to_vesa.patch
153_make_dmx_compile.patch
156_exevents_copykeyclass_nullptrcheck.patch
157_check_null_modes.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
