debian/changelog | 6 ++++--
debian/control | 3 ++-
debian/serverminver | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 4f578030f1577b8f2fdec7975c805623bf07e0bb
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Fri Dec 12 22:19:28 2008 +0200
Bump the serverminver, add conflicts to old xserver-xorg-{input,video}
versions
diff --git a/debian/changelog b/debian/changelog
index 94360db..553b6b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.5.99.2-1) UNRELEASED; urgency=low
+xorg-server (2:1.5.99.3-1) UNRELEASED; urgency=low
* New upstream beta version.
* debian/control:
@@ -11,6 +11,7 @@ xorg-server (2:1.5.99.2-1) UNRELEASED; urgency=low
- Bump the libgl1-mesa-dev and mesa-common-dev build-dep to
7.2+git20081209.a0d5c3cf.
- Add a build-dep on libxinerama-dev.
+ - Conflict xserver-xorg-video-4, xserver-xorg-input-2.1.
* debian/rules:
- Enable dri2 again.
* debian/patches:
@@ -19,7 +20,8 @@ xorg-server (2:1.5.99.2-1) UNRELEASED; urgency=low
- Dropped, implemented upstream.
13_debian_add_xkbpath_env_variable.diff
- Disabled for now, needs to be reimplemented or dropped.
- * debian/*abiver: Bump the input (4) and videoabiver (5).
+ * debian/{input,video}abiver: Bump the input (4) and videoabiver (5).
+ * debian/serverminver: Bump to 2:1.5.99.3.
-- Timo Aaltonen <tjaal...@ubuntu.com> Mon, 08 Dec 2008 08:39:38 +0200
diff --git a/debian/control b/debian/control
index ffe944b..2ba7862 100644
--- a/debian/control
+++ b/debian/control
@@ -47,7 +47,8 @@ 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 (<< 7), xserver-xorg-video-1.0,
xserver-xorg-input,
xserver-xorg-video-1.9, xserver-xorg-input-wacom (<< 0.7.8),
- xserver-xorg-video-2, xserver-xorg-input-2
+ xserver-xorg-video-2, xserver-xorg-input-2,
+ xserver-xorg-video-4, xserver-xorg-input-2.1
Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0),
xserver-common (<< 7)
Provides: xserver
diff --git a/debian/serverminver b/debian/serverminver
index 90a72d1..8b40438 100644
--- a/debian/serverminver
+++ b/debian/serverminver
@@ -1 +1 @@
-2:1.4.99.905
+2:1.5.99.3
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
