xorg-server: Changes to 'debian-experimental'
debian/changelog | 7 ++++---
debian/control | 2 +-
debian/rules | 4 +++-
debian/serverabiver | 2 +-
4 files changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 885e8a1af534956793edb68d5138b53eddac767d
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Feb 12 21:14:39 2007 +0100
Don't conflict with xserver-xorg-video-1.0.
The video driver ABI has not changed incompatibly, so the server is still
compatible with drivers built against xserver 1.1.
diff --git a/debian/changelog b/debian/changelog
index b56ed08..3b827f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,11 +4,7 @@ xorg-server (2:1.2.0-3) UNRELEASED; urge
* Pass --with-os-name and --with-os-vendor to configure.
* Bump serverabiver to 2:1.2.0-1.
- [ David Nusinow ]
- * Conflict with drivers providing xserver-xorg-video-1.0. We're now at ABI
- version 1.1.
-
- -- David Nusinow <dnusinow@debian.org> Sun, 11 Feb 2007 11:58:45 -0500
+ -- Julien Cristau <jcristau@debian.org> Mon, 12 Feb 2007 21:12:32 +0100
xorg-server (2:1.2.0-2) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 075f6ed..22d2107 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Architecture: any
Depends: x11-common (>= 1:7.0.0), ${shlibs:Depends}, ${misc:Depends}, xserver-xorg
Recommends: xkb-data, xfonts-base
Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable
-Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), xserver-xorg-video, xserver-xorg-video-1.0
+Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), xserver-xorg-video
Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0)
Provides: xserver
Description: X.Org X server -- core server
commit de20445718cdd647d15613915a7b607b1e08d550
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Feb 12 21:07:52 2007 +0100
* Bump serverabiver to 2:1.2.0-1.
diff --git a/debian/changelog b/debian/changelog
index 16018ac..7e5a3bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
xorg-server (2:1.2.0-3) UNRELEASED; urgency=low
* Pass --with-os-name and --with-os-vendor to configure.
+ * Bump serverabiver to 2:1.2.0-1.
- -- Julien Cristau <jcristau@debian.org> Sun, 11 Feb 2007 02:56:10 +0100
+ -- Julien Cristau <jcristau@debian.org> Mon, 12 Feb 2007 21:07:01 +0100
xorg-server (2:1.2.0-2) experimental; urgency=low
diff --git a/debian/serverabiver b/debian/serverabiver
index b36f2ad..684e630 100644
--- a/debian/serverabiver
+++ b/debian/serverabiver
@@ -1 +1 @@
-1:0.99.2-1
+2:1.2.0
commit 9fcbe0e1199fcaae383bd2a4df5fc44c93c71a4e
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 11 02:57:38 2007 +0100
Pass --with-os-name and --with-os-vendor to configure.
diff --git a/debian/changelog b/debian/changelog
index 222bb9f..16018ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.2.0-3) UNRELEASED; urgency=low
+
+ * Pass --with-os-name and --with-os-vendor to configure.
+
+ -- Julien Cristau <jcristau@debian.org> Sun, 11 Feb 2007 02:56:10 +0100
+
xorg-server (2:1.2.0-2) experimental; urgency=low
* Delete useless debian/substvars.
diff --git a/debian/rules b/debian/rules
index ca38834..c15ca5a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,9 @@ confflags += --disable-static \
--disable-xorgcfg \
--with-xkb-path=/usr/share/X11/xkb \
--with-xkb-output=/var/lib/xkb \
- --disable-misc-utils
+ --disable-misc-utils \
+ --with-os-name="$(shell uname)" \
+ --with-os-vendor=Debian
build: patch build-stamp
build-stamp:
Reply to: