weston: Changes to 'debian-unstable'
debian/README.Debian | 18 ++++-------------
debian/changelog | 20 +++++++++++++++++--
debian/control | 6 +++--
debian/rules | 5 +++-
debian/weston.examples | 1
debian/weston.install | 14 +++++++------
debian/weston.lintian-overrides | 1
debian/weston.postinst | 42 ++++++++++++++++++++++++++++++++++++++++
8 files changed, 83 insertions(+), 24 deletions(-)
New commits:
commit f9db49a2d4ad27d4b37607e5b71b550ac5b8abb9
Author: Sven Joachim <svenjoac@gmx.de>
Date: Mon Aug 12 18:45:42 2013 +0200
README.Debian: Mention the weston-launch wrapper
And fix a few typos.
diff --git a/debian/README.Debian b/debian/README.Debian
index ac57098..935892d 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -2,7 +2,8 @@ README for weston:
------------------
If you want to run weston under KMS (from a console, rather than from within X)
-as a non-root, you either need to have logind running and have a local session
-registred or your user need to be member of the weston-launch group.
+as non-root, you should start it via the weston-launch wrapper. For that to
+work, you either need to have logind running and have a local session
+registered, or your user needs to be member of the weston-launch group.
-- Laurent Bigonville <bigon@debian.org>, Sun, 11 Aug 2013 17:29:28 +0200
commit b68d99403e59d6b3d82181955496ee0ae4915063
Author: Laurent Bigonville <bigon@debian.org>
Date: Sun Aug 11 18:07:36 2013 +0200
Add LP statements to closes ubuntu bugs
diff --git a/debian/changelog b/debian/changelog
index 106cf81..bd91bab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,12 +6,13 @@ weston (1.2.0-1) UNRELEASED; urgency=low
[ Laurent Bigonville ]
* debian/rules:
- - Install weston-launch with setuid bit set
+ - Install weston-launch with setuid bit set (LP: #1102597)
- Set libexec path to /usr/lib/weston
* debian/weston.lintian-overrides: Add override for the mode of weston-launch
executable
* debian/weston.examples: Install weston.ini as an example file
* debian/weston.postinst: Create weston-launch group on installation
+ (LP: #1203017)
* debian/control, debian/weston.install: Enable colord support
* debian/README.Debian: Fix directions on how to run weston under KMS
(Closes: #714379)
commit f3294473e7c4702b47cf18319daa1e09f99e54e5
Author: Laurent Bigonville <bigon@debian.org>
Date: Sun Aug 11 17:59:39 2013 +0200
debian/control: Use canonical URL's for Vcs field
diff --git a/debian/changelog b/debian/changelog
index c07d67d..106cf81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,9 @@ weston (1.2.0-1) UNRELEASED; urgency=low
* debian/README.Debian: Fix directions on how to run weston under KMS
(Closes: #714379)
* debian/control: Add a dependency against adduser
+ * debian/control: Use canonical URL's for Vcs field
- -- Laurent Bigonville <bigon@debian.org> Sun, 11 Aug 2013 17:57:30 +0200
+ -- Laurent Bigonville <bigon@debian.org> Sun, 11 Aug 2013 17:59:21 +0200
weston (1.1.1-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 67853d3..9bd3a84 100644
--- a/debian/control
+++ b/debian/control
@@ -36,8 +36,8 @@ Build-Depends:
libsystemd-login-dev,
Standards-Version: 3.9.4
Homepage: http://wayland.freedesktop.org/
-Vcs-Git: git://git.debian.org/git/pkg-xorg/wayland/weston
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/wayland/weston.git
+Vcs-Git: git://anonscm.debian.org/pkg-xorg/wayland/weston
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-xorg/wayland/weston.git
Package: weston
Architecture: linux-any
commit 77637f22b959efe62e3eeb9b4981456046a14f14
Author: Laurent Bigonville <bigon@debian.org>
Date: Sun Aug 11 17:58:10 2013 +0200
debian/control: Add a dependency against adduser
diff --git a/debian/changelog b/debian/changelog
index 4185d5e..c07d67d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,9 @@ weston (1.2.0-1) UNRELEASED; urgency=low
* debian/control, debian/weston.install: Enable colord support
* debian/README.Debian: Fix directions on how to run weston under KMS
(Closes: #714379)
+ * debian/control: Add a dependency against adduser
- -- Sven Joachim <svenjoac@gmx.de> Sun, 14 Jul 2013 18:57:07 +0200
+ -- Laurent Bigonville <bigon@debian.org> Sun, 11 Aug 2013 17:57:30 +0200
weston (1.1.1-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index f063e41..67853d3 100644
--- a/debian/control
+++ b/debian/control
@@ -42,6 +42,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/wayland/weston.git
Package: weston
Architecture: linux-any
Depends:
+ adduser,
libegl1-mesa (>= 8.0-2),
libegl1-mesa-drivers (>= 8.0-2),
libgles2-mesa (>= 8.0-2),
commit 321d058e83a69245b588a523e9a168016684926e
Author: Laurent Bigonville <bigon@debian.org>
Date: Sun Aug 11 17:31:49 2013 +0200
debian/README.Debian: Fix directions on how to run weston under KMS (Closes: #714379)
diff --git a/debian/README.Debian b/debian/README.Debian
index 7593361..ac57098 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,17 +1,8 @@
README for weston:
------------------
-The weston compositor being still experimental, the Debian maintainers
-decided to turn off its setuid bit. This means that trying to run it
-under KMS (from a console, rather than from within X) as a non-root
-user will lead to no input at all, due to permission issues.
+If you want to run weston under KMS (from a console, rather than from within X)
+as a non-root, you either need to have logind running and have a local session
+registred or your user need to be member of the weston-launch group.
-If one really wants to play with it under KMS, and if one understands
-the risks, one can set the setuid bit on a given system by using the
-dpkg-statoverride command, which will locally override the permissions
-set by the package maintainers. Unfortunately, as of this writing,
-that means clients won't be able to get access to the display, so the
-way to test weston in KMS would be running it as root, at your own
-risks.
-
- -- Cyril Brulebois <kibi@debian.org>, Tue, 21 Feb 2012 19:35:54 +0100
+ -- Laurent Bigonville <bigon@debian.org>, Sun, 11 Aug 2013 17:29:28 +0200
diff --git a/debian/changelog b/debian/changelog
index f42eff6..4185d5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ weston (1.2.0-1) UNRELEASED; urgency=low
* debian/weston.examples: Install weston.ini as an example file
* debian/weston.postinst: Create weston-launch group on installation
* debian/control, debian/weston.install: Enable colord support
+ * debian/README.Debian: Fix directions on how to run weston under KMS
+ (Closes: #714379)
-- Sven Joachim <svenjoac@gmx.de> Sun, 14 Jul 2013 18:57:07 +0200
commit cf5232ad4eba515613f35cc5c084df07798cb1a0
Author: Laurent Bigonville <bigon@debian.org>
Date: Sun Aug 11 17:05:17 2013 +0200
debian/control, debian/weston.install: Enable colord support
diff --git a/debian/changelog b/debian/changelog
index 94f32b2..f42eff6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ weston (1.2.0-1) UNRELEASED; urgency=low
executable
* debian/weston.examples: Install weston.ini as an example file
* debian/weston.postinst: Create weston-launch group on installation
+ * debian/control, debian/weston.install: Enable colord support
-- Sven Joachim <svenjoac@gmx.de> Sun, 14 Jul 2013 18:57:07 +0200
diff --git a/debian/control b/debian/control
index 8757d56..f063e41 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Build-Depends:
libpixman-1-dev,
libpng-dev,
libjpeg-dev,
+ libcolord-dev (>= 0.1.27),
mesa-common-dev,
libglu1-mesa-dev,
libegl1-mesa-dev (>= 9.0~),
diff --git a/debian/weston.install b/debian/weston.install
index 0a23823..d3235e9 100644
--- a/debian/weston.install
+++ b/debian/weston.install
@@ -11,6 +11,8 @@ usr/lib/weston/weston-screensaver
usr/lib/weston/weston-screenshooter
usr/lib/weston/weston-simple-im
usr/lib/*/pkgconfig/weston.pc
+usr/lib/*/weston/cms-colord.so
+usr/lib/*/weston/cms-static.so
usr/lib/*/weston/desktop-shell.so
usr/lib/*/weston/drm-backend.so
usr/lib/*/weston/fbdev-backend.so
commit aa8a9b641ee854f140e1d026154f2ac15eba98f3
Author: Laurent Bigonville <bigon@debian.org>
Date: Sun Aug 11 17:00:21 2013 +0200
Add missing closes statement
diff --git a/debian/changelog b/debian/changelog
index 09b8a8a..94f32b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
weston (1.2.0-1) UNRELEASED; urgency=low
[ Sven Joachim ]
- * New upstream release.
+ * New upstream release (Closes: #719144).
* Bump libwayland-dev build-depends to (>= 1.2.0).
[ Laurent Bigonville ]
commit 33cedca2d7684d451890e8e0af712c37fc0b91d0
Author: Laurent Bigonville <bigon@debian.org>
Date: Fri Aug 9 17:38:28 2013 +0200
debian/weston.postinst: Create weston-launch group on installation
diff --git a/debian/changelog b/debian/changelog
index f782130..09b8a8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ weston (1.2.0-1) UNRELEASED; urgency=low
* debian/weston.lintian-overrides: Add override for the mode of weston-launch
executable
* debian/weston.examples: Install weston.ini as an example file
+ * debian/weston.postinst: Create weston-launch group on installation
-- Sven Joachim <svenjoac@gmx.de> Sun, 14 Jul 2013 18:57:07 +0200
diff --git a/debian/weston.postinst b/debian/weston.postinst
new file mode 100755
index 0000000..746c9c0
--- /dev/null
+++ b/debian/weston.postinst
@@ -0,0 +1,42 @@
+#!/bin/sh
+# postinst script for weston
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <postinst> `abort-remove'
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+ configure)
+ if ! getent group weston-launch >/dev/null; then
+ addgroup --quiet --system weston-launch
+ fi
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
commit 9d4699b4ee518dcc09d47913520ab512b78004cd
Author: Laurent Bigonville <bigon@debian.org>
Date: Fri Aug 9 18:10:49 2013 +0200
debian/weston.examples: Install weston.ini as an example file
diff --git a/debian/changelog b/debian/changelog
index 8a9d9e1..f782130 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ weston (1.2.0-1) UNRELEASED; urgency=low
- Set libexec path to /usr/lib/weston
* debian/weston.lintian-overrides: Add override for the mode of weston-launch
executable
+ * debian/weston.examples: Install weston.ini as an example file
-- Sven Joachim <svenjoac@gmx.de> Sun, 14 Jul 2013 18:57:07 +0200
diff --git a/debian/weston.examples b/debian/weston.examples
new file mode 100644
index 0000000..e690c59
--- /dev/null
+++ b/debian/weston.examples
@@ -0,0 +1 @@
+weston.ini
commit e53e2e8c24ccbcbde416fea599461bcb09f58004
Author: Laurent Bigonville <bigon@debian.org>
Date: Fri Aug 9 18:05:57 2013 +0200
debian/weston.lintian-overrides: Add override for the mode of weston-launch executable
diff --git a/debian/changelog b/debian/changelog
index 9733d61..8a9d9e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ weston (1.2.0-1) UNRELEASED; urgency=low
* debian/rules:
- Install weston-launch with setuid bit set
- Set libexec path to /usr/lib/weston
+ * debian/weston.lintian-overrides: Add override for the mode of weston-launch
+ executable
-- Sven Joachim <svenjoac@gmx.de> Sun, 14 Jul 2013 18:57:07 +0200
diff --git a/debian/weston.lintian-overrides b/debian/weston.lintian-overrides
new file mode 100644
index 0000000..ae1ff47
--- /dev/null
+++ b/debian/weston.lintian-overrides
@@ -0,0 +1 @@
+weston: setuid-binary usr/bin/weston-launch 4755 root/root
commit 86e2576f8d65d956702bfa1504e18b6f3239961a
Author: Laurent Bigonville <bigon@debian.org>
Date: Fri Aug 9 17:33:51 2013 +0200
Set libexec path to /usr/lib/weston
diff --git a/debian/changelog b/debian/changelog
index 0e159d7..9733d61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ weston (1.2.0-1) UNRELEASED; urgency=low
[ Laurent Bigonville ]
* debian/rules:
- Install weston-launch with setuid bit set
+ - Set libexec path to /usr/lib/weston
-- Sven Joachim <svenjoac@gmx.de> Sun, 14 Jul 2013 18:57:07 +0200
diff --git a/debian/rules b/debian/rules
index 62ea63e..ddcc339 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
override_dh_auto_configure:
- dh_auto_configure -- --disable-libunwind
+ dh_auto_configure -- --disable-libunwind --libexec=/usr/lib/weston
override_dh_auto_test:
# the test suite does not 100% pass in headless mode
diff --git a/debian/weston.install b/debian/weston.install
index 20e88c6..0a23823 100644
--- a/debian/weston.install
+++ b/debian/weston.install
@@ -4,12 +4,12 @@ usr/bin/weston-info
usr/bin/weston-launch
usr/bin/weston-terminal
usr/include/weston
-usr/lib/*/weston-tablet-shell
-usr/lib/*/weston-desktop-shell
-usr/lib/*/weston-keyboard
-usr/lib/*/weston-screensaver
-usr/lib/*/weston-screenshooter
-usr/lib/*/weston-simple-im
+usr/lib/weston/weston-tablet-shell
+usr/lib/weston/weston-desktop-shell
+usr/lib/weston/weston-keyboard
+usr/lib/weston/weston-screensaver
+usr/lib/weston/weston-screenshooter
+usr/lib/weston/weston-simple-im
usr/lib/*/pkgconfig/weston.pc
usr/lib/*/weston/desktop-shell.so
usr/lib/*/weston/drm-backend.so
commit 0073d15a4ceaa14a7c0593a60a52a80b5d5b39e1
Author: Laurent Bigonville <bigon@debian.org>
Date: Fri Aug 9 17:16:04 2013 +0200
debian/rules: Install weston-launch with setuid bit set
diff --git a/debian/changelog b/debian/changelog
index bea4670..0e159d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
weston (1.2.0-1) UNRELEASED; urgency=low
+ [ Sven Joachim ]
* New upstream release.
* Bump libwayland-dev build-depends to (>= 1.2.0).
+ [ Laurent Bigonville ]
+ * debian/rules:
+ - Install weston-launch with setuid bit set
+
-- Sven Joachim <svenjoac@gmx.de> Sun, 14 Jul 2013 18:57:07 +0200
weston (1.1.1-1) experimental; urgency=low
diff --git a/debian/rules b/debian/rules
index a2043e2..62ea63e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
override_dh_auto_configure:
- dh_auto_configure -- --disable-setuid-install --disable-libunwind
+ dh_auto_configure -- --disable-libunwind
override_dh_auto_test:
# the test suite does not 100% pass in headless mode
@@ -16,6 +16,9 @@ override_dh_install:
override_dh_makeshlibs:
# No-op: libraries are private, not shared.
+override_dh_fixperms:
+ dh_fixperms -Xusr/bin/weston-launch
+
%:
dh $@ --with quilt,autoreconf
Reply to: