xorg-server: Changes to 'debian-unstable'
debian/changelog | 6 ++++--
debian/control | 2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 59c058a3f54e87d226fc321a6c126281dabbfde2
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Sep 30 12:47:18 2012 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 7dfbc40..77da19b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.12.4-1) UNRELEASED; urgency=low
+xorg-server (2:1.12.4-1) unstable; urgency=low
* New upstream stable release.
* int10: fix pci_device_read_rom usage (closes: #686153). Thanks, Stephan
@@ -10,7 +10,7 @@ xorg-server (2:1.12.4-1) UNRELEASED; urgency=low
* Add conflicts against obsolete evtouch input driver (hopefully closes:
#687268)
- -- Julien Cristau <jcristau@debian.org> Sun, 30 Sep 2012 12:00:07 +0200
+ -- Julien Cristau <jcristau@debian.org> Sun, 30 Sep 2012 12:47:00 +0200
xorg-server (2:1.12.3.902-1) unstable; urgency=low
commit 1415f8949f046a56a4ab8f4679698e4cf40af524
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Sep 30 12:22:26 2012 +0200
Add conflicts against obsolete evtouch input driver
Hopefully closes: #687268
diff --git a/debian/changelog b/debian/changelog
index fc0dc1e..7dfbc40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ xorg-server (2:1.12.4-1) UNRELEASED; urgency=low
regression, let's try that again later. Thanks, Stephan Schreiber!
* Revert "fb: reorder Bresenham error correction to avoid overshoot". Fixes
regression introduced in 1.12.3.902 (fdo#54168, closes: #688908)
+ * Add conflicts against obsolete evtouch input driver (hopefully closes:
+ #687268)
-- Julien Cristau <jcristau@debian.org> Sun, 30 Sep 2012 12:00:07 +0200
diff --git a/debian/control b/debian/control
index 8db33e2..d8f3735 100644
--- a/debian/control
+++ b/debian/control
@@ -119,6 +119,8 @@ Breaks:
xserver-xorg-video-vga (<= 1:4.1.0-8),
libgl1-mesa-dri (<< 7.10.2-4),
libgl1-mesa-dri-experimental (<< 7.10.2-4),
+Conflicts:
+ xserver-xorg-input-evtouch,
Provides:
${videoabi},
${inputabi},
Reply to: