debian/README.Debian | 23 +++++++++++++++++++++++ debian/changelog | 4 ++++ debian/clean | 2 ++ debian/control | 5 +++++ debian/rules | 14 +++++++++++--- debian/wayland-demos.bash-completion | 18 ++++++++++++++++++ debian/wayland-demos.install | 16 ++++++++++++++++ debian/wayland-run | 19 +++++++++++++++++++ debian/wayland.pod | 23 +++++++++++++++++++++++ 9 files changed, 121 insertions(+), 3 deletions(-)
New commits: commit b9e933fbe52f7b90b569d6fad5ecbd040a2a6a9d Author: Cyril Brulebois <[email protected]> Date: Tue Jun 21 19:33:08 2011 +0200 Remove trailing backslash. diff --git a/debian/rules b/debian/rules index deb8889..0a823f7 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,7 @@ override_dh_auto_configure: --enable-x11-compositor \ --disable-openwfd-compositor \ --enable-clients \ - --disable-meego-tablet-shell \ + --disable-meego-tablet-shell # Install in debian/tmp to retain control through dh_install: override_dh_auto_install: commit f02afaaf5de918f20998d0ed8b8d2c80110f9cef Author: Cyril Brulebois <[email protected]> Date: Tue Jun 21 19:33:07 2011 +0200 Mention the bash completion. diff --git a/debian/README.Debian b/debian/README.Debian index bf8427c..3fec371 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -17,5 +17,7 @@ Wayland for Debian path: “wayland-run demo” runs “/usr/lib/wayland/bin/demo”; if there's no argument, or if the specified demo doesn't exist, a random demo client is started instead. + * wayland-run comes with basic bash completion support, making it easy + to specify the appropriate demo client. -- Cyril Brulebois <[email protected]> Mon, 20 Jun 2011 23:49:15 +0200 commit 74e10977f65d843aeb98f3e7218a6715b5436e1a Author: Cyril Brulebois <[email protected]> Date: Tue Jun 21 19:33:06 2011 +0200 Add bash-completion for wayland-run. diff --git a/debian/control b/debian/control index 82dc420..aef9c52 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,7 @@ Build-Depends: debhelper (>= 8), dh-autoreconf, quilt, + bash-completion, pkg-config, libwayland-dev, libegl1-mesa-dev, diff --git a/debian/rules b/debian/rules index 8787030..deb8889 100755 --- a/debian/rules +++ b/debian/rules @@ -35,7 +35,7 @@ override_dh_makeshlibs: #dh_makeshlibs %: - dh $@ --with quilt,autoreconf --builddirectory=build/ + dh $@ --with quilt,autoreconf,bash_completion --builddirectory=build/ # For maintainer use only, generate a tarball: gentarball: diff --git a/debian/wayland-demos.bash-completion b/debian/wayland-demos.bash-completion new file mode 100644 index 0000000..8e02433 --- /dev/null +++ b/debian/wayland-demos.bash-completion @@ -0,0 +1,18 @@ +# bash completion for wayland-demos + +have wayland-run && +_wayland_run() +{ + local cur + COMPREPLY=() + _get_comp_words_by_ref cur + case $COMP_CWORD in + 1) + demos=$(ls /usr/lib/wayland/bin) + COMPREPLY=( $( compgen -W "$demos" -- "$cur" ) ) + ;; + *) _filedir + ;; + esac +} && +complete -F _wayland_run wayland-run commit c05f52ee7978016a5e23e9fe53c9a842db531d52 Author: Cyril Brulebois <[email protected]> Date: Tue Jun 21 19:33:06 2011 +0200 Make the wrapper pass extra arguments to the client. Useful for at least: wayland-run view foo.pdf diff --git a/debian/wayland-run b/debian/wayland-run index 6a9cdd3..f42e34a 100755 --- a/debian/wayland-run +++ b/debian/wayland-run @@ -4,8 +4,9 @@ LIBPATH=/usr/lib/wayland/bin demo=$1 +shift if [ -f $LIBPATH/$demo ]; then - exec $LIBPATH/$demo + exec $LIBPATH/$demo "$@" else if [ -z $demo ]; then echo "No demo specified, running a random one" >&2 commit ab0151200a56c59c474f7ac2b0b4ce9a6aa5bec4 Author: Cyril Brulebois <[email protected]> Date: Tue Jun 21 19:33:06 2011 +0200 Build and ship manpages. diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..71372b0 --- /dev/null +++ b/debian/clean @@ -0,0 +1,2 @@ +debian/wayland-compositor.1 +debian/wayland-run.1 diff --git a/debian/rules b/debian/rules index 3324803..8787030 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,7 @@ #!/usr/bin/make -f SOURCE=wayland-demos +UV=$(shell dpkg-parsechangelog|awk '/^Version:/ {print $$2}'|sed 's/-.*$$//') # Enable/disable features explicitly: override_dh_auto_configure: @@ -21,6 +22,14 @@ override_dh_install: find debian/tmp -name '*.la' -delete dh_install --fail-missing +# Build and ship small manpages, pointing to README.Debian: +override_dh_installman: + pod2man -n "wayland-compositor" -c "Wayland" -r $(UV) \ + debian/wayland.pod > debian/wayland-compositor.1 + pod2man -n "wayland-run" -c "Wayland" -r $(UV) \ + debian/wayland.pod > debian/wayland-run.1 + dh_installman debian/wayland-compositor.1 debian/wayland-run.1 + # No shared libraries here, just plugins: override_dh_makeshlibs: #dh_makeshlibs @@ -29,6 +38,5 @@ override_dh_makeshlibs: dh $@ --with quilt,autoreconf --builddirectory=build/ # For maintainer use only, generate a tarball: -gentarball: UV=$(shell dpkg-parsechangelog|awk '/^Version:/ {print $$2}'|sed 's/-.*$$//') gentarball: git archive --format=tar upstream-experimental --prefix=$(SOURCE)-$(UV)/ | gzip -9 > ../$(SOURCE)_$(UV).orig.tar.gz commit 0d5c6cce1918af49fc3a4fe845c11de9134ac808 Author: Cyril Brulebois <[email protected]> Date: Tue Jun 21 19:33:06 2011 +0200 Add a basic manpage. diff --git a/debian/wayland.pod b/debian/wayland.pod new file mode 100644 index 0000000..adc0c4b --- /dev/null +++ b/debian/wayland.pod @@ -0,0 +1,23 @@ +=head1 NAME + +wayland-compositor, wayland-run - sample wayland compositor and demo clients + +=head1 SYNOPSIS + +Run the compositor with the specified background (PNG format): + +B<wayland-compositor -b background.png &> + + +Run a random demo, or a specific demo: + +B<wayland-run> + +B<wayland-run flower> + +=head1 SEE ALSO + +An overview of the contents of the wayland-demos package is available +in the following file: + +L<//usr/share/doc/wayland-demos/README.Debian> commit 0df2119e5589bbe304238362e9d1027970cdcc49 Author: Cyril Brulebois <[email protected]> Date: Tue Jun 21 19:33:05 2011 +0200 Add build-deps for demo clients. diff --git a/debian/control b/debian/control index 3601333..82dc420 100644 --- a/debian/control +++ b/debian/control @@ -16,6 +16,10 @@ Build-Depends: librsvg2-bin, libegl1-mesa-dev (>= 7.11~0), libegl1-mesa-drivers (>= 7.11~0), +# clients: + libpoppler-glib-dev, + libglib2.0-dev, + libgtk2.0-dev, Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/git/pkg-xorg/wayland/wayland-demos Vcs-Browser: http://git.debian.org/?p=pkg-xorg/wayland/wayland-demos.git commit 9a1216e9ebc817aa295a25f840dbdc52e3716fc2 Author: Cyril Brulebois <[email protected]> Date: Tue Jun 21 00:02:14 2011 +0200 Document how compositor and clients are supposed to work. That goes into the /usr/share/doc/wayland-demos/README.Debian file. diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..bf8427c --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,21 @@ +Wayland for Debian +------------------ + + * This package contains a sample compositor, along with a few demo + clients. + * The compositor (wayland-compositor) can be run from within X, where it + behaves like an X client; or it can be run from the console, on top of + the DRM/KMS layer. + * The wayland socket is stored in the directory specified in the + XDG_RUNTIME_DIR variable, falling back to te current directory if that + variable isn't set. + * When clients are run, the wayland socket is found using the same + mechanism (XDG_RUNTIME_DIR, with current directory as fallback). + * Since clients have very generic names, they are shipped in the + /usr/lib/wayland/bin directory. A wrapper (wayland-run) makes it + possible to run the demo clients without having to enter the full + path: “wayland-run demo” runs “/usr/lib/wayland/bin/demo”; if there's + no argument, or if the specified demo doesn't exist, a random demo + client is started instead. + + -- Cyril Brulebois <[email protected]> Mon, 20 Jun 2011 23:49:15 +0200 diff --git a/debian/changelog b/debian/changelog index 6f1fee6..5ade641 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,5 +11,7 @@ wayland-demos (0.1.0~0-1) UNRELEASED; urgency=low happens. * Manually ship all demo clients under /usr/lib/wayland/bin, and ship a shell wrapper to run them: wayland-run. + * Document how compositor and clients are supposed to work in the + /usr/share/doc/wayland-demos/README.Debian file. -- Cyril Brulebois <[email protected]> Thu, 16 Jun 2011 14:08:14 +0200 commit c7165a0d6bbb1a3442aa2fb6e38fc5b70f1ddfb1 Author: Cyril Brulebois <[email protected]> Date: Mon Jun 20 23:07:19 2011 +0200 Ship demo clients and a shell wrapper: wayland-run. diff --git a/debian/changelog b/debian/changelog index 46b2908..6f1fee6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,5 +9,7 @@ wayland-demos (0.1.0~0-1) UNRELEASED; urgency=low * debian/rules contains a gentarball target to create a tarball from the upstream-experimental branch, to be used until some upstream release happens. + * Manually ship all demo clients under /usr/lib/wayland/bin, and ship + a shell wrapper to run them: wayland-run. -- Cyril Brulebois <[email protected]> Thu, 16 Jun 2011 14:08:14 +0200 diff --git a/debian/wayland-demos.install b/debian/wayland-demos.install index eb0ec0b..70e4ec1 100644 --- a/debian/wayland-demos.install +++ b/debian/wayland-demos.install @@ -10,3 +10,19 @@ usr/lib/wayland/*.so # images: usr/share/wayland/*.png usr/share/wayland/*.svg + +# wrapper to run the demo clients, without polluting /usr/bin: +../../debian/wayland-run usr/bin + +# actual demo clients, installed manually: +../../build/clients/dnd usr/lib/wayland/bin +../../build/clients/eventdemo usr/lib/wayland/bin +../../build/clients/flower usr/lib/wayland/bin +../../build/clients/gears usr/lib/wayland/bin +../../build/clients/image usr/lib/wayland/bin +../../build/clients/resizor usr/lib/wayland/bin +../../build/clients/screenshot usr/lib/wayland/bin +../../build/clients/simple-client usr/lib/wayland/bin +../../build/clients/smoke usr/lib/wayland/bin +../../build/clients/terminal usr/lib/wayland/bin +../../build/clients/view usr/lib/wayland/bin diff --git a/debian/wayland-run b/debian/wayland-run new file mode 100755 index 0000000..6a9cdd3 --- /dev/null +++ b/debian/wayland-run @@ -0,0 +1,18 @@ +#!/bin/sh +# Shell wrapper to run demo clients under $LIBPATH + +LIBPATH=/usr/lib/wayland/bin + +demo=$1 +if [ -f $LIBPATH/$demo ]; then + exec $LIBPATH/$demo +else + if [ -z $demo ]; then + echo "No demo specified, running a random one" >&2 + else + echo "Request demo not found ($demo), running a random one" >&2 + fi + random=$(ls $LIBPATH|shuf|head -1) + echo "Running $random" >&2 + exec $LIBPATH/$random +fi -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
