xorg-server: Changes to 'debian-experimental'
debian/changelog | 6 ++++++
debian/control | 13 +++++++++++++
debian/rules | 5 ++++-
debian/xwayland.install | 1 +
4 files changed, 24 insertions(+), 1 deletion(-)
New commits:
commit 50b416bdf6c8c0b0dfb20fccfce1593156a067bb
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 5 22:10:56 2014 +0200
Upload to experimental
diff --git a/debian/changelog b/debian/changelog
index d113ad6..d77febc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xorg-server (2:1.15.99.903-2) UNRELEASED; urgency=medium
+xorg-server (2:1.15.99.903-2) experimental; urgency=medium
* Enable xwayland for the main build on linux (closes: #747950).
- -- Julien Cristau <jcristau@debian.org> Thu, 05 Jun 2014 21:26:21 +0200
+ -- Julien Cristau <jcristau@debian.org> Thu, 05 Jun 2014 21:58:45 +0200
xorg-server (2:1.15.99.903-1) experimental; urgency=medium
commit d20afdd4966699247849bb0fd0c1bbbba24f6784
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 5 21:32:33 2014 +0200
Enable xwayland for the main build on linux (closes: #747950).
diff --git a/debian/changelog b/debian/changelog
index 755c8e0..d113ad6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.15.99.903-2) UNRELEASED; urgency=medium
+
+ * Enable xwayland for the main build on linux (closes: #747950).
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 05 Jun 2014 21:26:21 +0200
+
xorg-server (2:1.15.99.903-1) experimental; urgency=medium
* New upstream release candidate
diff --git a/debian/control b/debian/control
index 5d15562..77cdf84 100644
--- a/debian/control
+++ b/debian/control
@@ -90,6 +90,8 @@ Build-Depends:
x11-xkb-utils,
# getpeereid()
libbsd-dev [kfreebsd-any],
+# xwayland
+ libwayland-dev [linux-any],
Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xorg-server
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/xserver/xorg-server.git
@@ -362,3 +364,14 @@ Description: Xorg X server - source files
.
Unless you are building a software product using X server sources,
you probably want xserver-xorg and/or xserver-xorg-core instead.
+
+Package: xwayland
+Architecture: linux-any
+Depends:
+ xserver-common (>= ${source:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends},
+Description: Xwayland X server
+ This package provides an X server running on top of wayland, using wayland
+ input devices for input and forwarding either the root window or individual
+ top-level windows as wayland surfaces.
diff --git a/debian/rules b/debian/rules
index 673dbc9..5309815 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,8 +45,10 @@ endif
ifeq ($(DEB_HOST_ARCH_OS), linux)
selinux = --enable-xselinux
+ wayland = --enable-xwayland
else
selinux = --disable-xselinux
+ wayland = --disable-xwayland
endif
ifeq ($(DEB_HOST_ARCH_OS), hurd)
@@ -109,7 +111,6 @@ confflags += \
--enable-xorg \
--disable-linux-acpi \
--disable-linux-apm \
- --disable-xwayland \
--disable-xquartz \
--disable-xwin \
--disable-xfake \
@@ -137,6 +138,7 @@ confflags_main = \
--enable-xace \
$(selinux) \
--enable-xfree86-utils \
+ $(wayland) \
--enable-dmx \
--enable-xvfb \
--enable-xnest \
@@ -168,6 +170,7 @@ confflags_udeb = \
--disable-xace \
--disable-xselinux \
--disable-xfree86-utils \
+ --disable-xwayland \
--disable-dmx \
--disable-xvfb \
--disable-xnest \
diff --git a/debian/xwayland.install b/debian/xwayland.install
new file mode 100644
index 0000000..4e62413
--- /dev/null
+++ b/debian/xwayland.install
@@ -0,0 +1 @@
+main/usr/bin/Xwayland usr/bin
Reply to: