xorg-server: Changes to 'ubuntu'
debian/changelog | 57 +++++++++++++++++++++++++--------------
debian/control | 14 ++++++++-
debian/serverminver | 2 -
debian/xserver-xorg-core.install | 1
4 files changed, 51 insertions(+), 23 deletions(-)
New commits:
commit 85a5d049b1e25e29a53313fd6728148bd26cff59
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Thu Jan 22 15:40:46 2009 +0200
Include xorg-server.conf for dbus support.
diff --git a/debian/changelog b/debian/changelog
index 49c9c6e..0fd24ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.5.99.901-1ubuntu1) UNRELEASED; urgency=low
+
+ * Merge with Debian experimental.
+ * debian/xserver-xorg-core.install: Include xorg-server.conf for dbus
+ support.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 22 Jan 2009 15:37:40 +0200
+
xorg-server (2:1.5.99.901-1) experimental; urgency=low
* New upstream release candidate.
diff --git a/debian/xserver-xorg-core.install b/debian/xserver-xorg-core.install
index c88d80f..401a272 100644
--- a/debian/xserver-xorg-core.install
+++ b/debian/xserver-xorg-core.install
@@ -13,3 +13,4 @@ usr/bin/cvt
usr/bin/gtf
usr/share/man/man1/cvt.1
usr/share/man/man1/gtf.1
+config/xorg-server.conf etc/dbus-1/system.d
commit afd95c193a70d202a92aaa73be6917bd37fe9336
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jan 21 20:59:37 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 161afb5..e42954b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.5.99.901-1) UNRELEASED; urgency=low
+xorg-server (2:1.5.99.901-1) experimental; urgency=low
* New upstream release candidate.
+ adds autodetection of sbus devices (closes: #483942).
@@ -47,7 +47,7 @@ xorg-server (2:1.5.99.901-1) UNRELEASED; urgency=low
- x11proto-randr-dev (>= 1.2.99.3)
- add x11proto-dri2-dev
- -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 08 Dec 2008 08:39:38 +0200
+ -- Julien Cristau <jcristau@debian.org> Wed, 21 Jan 2009 20:59:34 +0100
xorg-server (2:1.5.3-1) experimental; urgency=low
commit 7bb3c9dc847b8282420b39eb472f98ab471217c5
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jan 21 20:59:27 2009 +0100
debian/serverminver: Bump to 2:1.5.99.901.
diff --git a/debian/changelog b/debian/changelog
index d1bd026..161afb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,7 +30,7 @@ xorg-server (2:1.5.99.901-1) UNRELEASED; urgency=low
13_debian_add_xkbpath_env_variable.diff
- Disabled for now, needs to be reimplemented or dropped.
* debian/{input,video}abiver: Bump the input (4) and videoabiver (5).
- * debian/serverminver: Bump to 2:1.5.99.3.
+ * debian/serverminver: Bump to 2:1.5.99.901.
[ Julien Cristau ]
* Ditch the GLX Public License and the CID Font Code Public License from
diff --git a/debian/serverminver b/debian/serverminver
index 8b40438..033aaa4 100644
--- a/debian/serverminver
+++ b/debian/serverminver
@@ -1 +1 @@
-2:1.5.99.3
+2:1.5.99.901
commit 37a49ac259696ed322b0692cd9e329057df346fd
Author: Yves-Alexis Perez <corsac@debian.org>
Date: Fri Jan 16 10:14:22 2009 +0100
debian/control: update deps for xserver-xorg-dev
- libpixman-1-dev (>= 0.13.2-1)
- x11proto-core-dev (>= 7.0.14)
- x11proto-input-dev (>= 1.5.0)
- x11proto-xext-dev (>= 7.0.4)
- x11proto-randr-dev (>= 1.2.99.3)
- add x11proto-dri2-dev
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/debian/changelog b/debian/changelog
index a1140e7..d1bd026 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,15 @@ xorg-server (2:1.5.99.901-1) UNRELEASED; urgency=low
under the GLXPL has been relicensed to the SGI Free Software License B 2.0.
This finally closes: #211765.
+ [ Yves-Alexis Perez ]
+ * debian/control: update deps for xserver-xorg-dev:
+ - libpixman-1-dev (>= 0.13.2-1)
+ - x11proto-core-dev (>= 7.0.14)
+ - x11proto-input-dev (>= 1.5.0)
+ - x11proto-xext-dev (>= 7.0.4)
+ - x11proto-randr-dev (>= 1.2.99.3)
+ - add x11proto-dri2-dev
+
-- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 08 Dec 2008 08:39:38 +0200
xorg-server (2:1.5.3-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 8451723..ee7fa1a 100644
--- a/debian/control
+++ b/debian/control
@@ -77,13 +77,14 @@ Description: Xorg X server - core server
Package: xserver-xorg-dev
Architecture: any
Depends: ${misc:Depends},
- libpixman-1-dev,
- x11proto-core-dev,
- x11proto-input-dev (>= 1.4),
- x11proto-xext-dev,
+ libpixman-1-dev (>= 0.13.2-1),
+ x11proto-core-dev (>= 7.0.14),
+ x11proto-input-dev (>= 1.5.0),
+ x11proto-xext-dev (>= 7.0.4),
x11proto-video-dev,
- x11proto-randr-dev (>= 1.2),
+ x11proto-randr-dev (>= 1.2.99.3),
x11proto-render-dev (>= 2:0.9.3),
+ x11proto-dri2-dev,
x11proto-fonts-dev,
libpciaccess-dev
Description: Xorg X server - development files
commit a7af98436ad6d44f146670883af1252675c33af3
Author: Yves-Alexis Perez <corsac@debian.org>
Date: Fri Jan 16 10:05:27 2009 +0100
Wrap xserver-xorg-dev deps one per line
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/debian/control b/debian/control
index 221b347..8451723 100644
--- a/debian/control
+++ b/debian/control
@@ -76,7 +76,16 @@ Description: Xorg X server - core server
Package: xserver-xorg-dev
Architecture: any
-Depends: ${misc:Depends}, libpixman-1-dev, x11proto-core-dev, x11proto-input-dev (>= 1.4), x11proto-xext-dev, x11proto-video-dev, x11proto-randr-dev (>= 1.2), x11proto-render-dev (>= 2:0.9.3), x11proto-fonts-dev, libpciaccess-dev
+Depends: ${misc:Depends},
+ libpixman-1-dev,
+ x11proto-core-dev,
+ x11proto-input-dev (>= 1.4),
+ x11proto-xext-dev,
+ x11proto-video-dev,
+ x11proto-randr-dev (>= 1.2),
+ x11proto-render-dev (>= 2:0.9.3),
+ x11proto-fonts-dev,
+ libpciaccess-dev
Description: Xorg X server - development files
This package provides development files for the X.Org ('Xorg') X server.
This is not quite the same as the DDK (Driver Development Kit) from the
commit 14248c68b4fe6793396df4f2081a0071d90fe157
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Jan 16 04:34:13 2009 +0100
Bump randrproto build-dep to 1.2.99.3
diff --git a/debian/changelog b/debian/changelog
index 80e7e91..a1140e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,7 @@ xorg-server (2:1.5.99.901-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* debian/control:
- Add x11proto-dri2-dev to build-depends.
- - Bump the x11proto-randr-dev build-dep version to 1.2.99.2.
+ - Bump the x11proto-randr-dev build-dep version to 1.2.99.3.
- Bump the libpixman-1-dev build-dep version to 0.13.2.
- Bump the xtrans-dev build-dep version to 1.2.2.
- Bump the x11proto-xext-dev build-dep version to 7.0.3.
diff --git a/debian/control b/debian/control
index 1bd6ade..221b347 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 4.0.0), lsb-release, pkg-config, bison, flex,
x11proto-bigreqs-dev, x11proto-composite-dev (>= 1:0.4),
x11proto-core-dev (>= 7.0.13),
x11proto-damage-dev (>= 1.1), x11proto-evie-dev, x11proto-fixes-dev (>= 4.0),
- x11proto-kb-dev (>= 1.0.3), x11proto-xinerama-dev, x11proto-randr-dev (>= 1.2.99.2),
+ x11proto-kb-dev (>= 1.0.3), x11proto-xinerama-dev, x11proto-randr-dev (>= 1.2.99.3),
x11proto-record-dev, x11proto-render-dev (>= 2:0.9.3), x11proto-resource-dev,
x11proto-scrnsaver-dev, x11proto-trap-dev, x11proto-video-dev,
x11proto-xcmisc-dev, x11proto-xext-dev (>= 7.0.3),
Reply to: