Timo Aaltonen pushed to branch debian-unstable at X Strike Force / app / mesa-demos
Commits: e2604b2d by Timo Aaltonen at 2022-04-12T15:28:41+03:00 control: Migrate to debhelper-compat, bump to 13. - - - - - b5a70688 by Timo Aaltonen at 2022-04-12T15:29:12+03:00 control: Bump policy to 4.6.0. - - - - - e6fa38c1 by Timo Aaltonen at 2022-04-12T16:05:29+03:00 Merge -extra in mesa-utils, and add a separate package for native binaries. (Closes: #792223) - - - - - 12 changed files: - debian/changelog - − debian/compat - debian/control - + debian/mesa-utils-bin.install - − debian/mesa-utils-extra.install - − debian/mesa-utils-extra.install.linux - − debian/mesa-utils-extra.links - − debian/mesa-utils-extra.links.linux - − debian/mesa-utils-extra.manpages - debian/mesa-utils.install - debian/mesa-utils.manpages - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +mesa-demos (8.4.0-2) UNRELEASED; urgency=medium + + * control: Migrate to debhelper-compat, bump to 13. + * control: Bump policy to 4.6.0. + * Merge -extra in mesa-utils, and add a separate package for native + binaries. (Closes: #792223) + + -- Timo Aaltonen <[email protected]> Fri, 01 Apr 2022 15:53:10 +0300 + mesa-demos (8.4.0-1) unstable; urgency=medium * New upstream release. ===================================== debian/compat deleted ===================================== @@ -1 +0,0 @@ -11 ===================================== debian/control ===================================== @@ -3,8 +3,8 @@ Section: utils Priority: optional Maintainer: Debian X Strike Force <[email protected]> Uploaders: Maarten Lankhorst <[email protected]>, Andreas Boll <[email protected]> -Standards-Version: 4.1.3 -Build-Depends: debhelper (>= 11~), +Standards-Version: 4.6.0 +Build-Depends: debhelper-compat (= 13), quilt (>= 0.63-8.2~), pkg-config, libx11-dev, @@ -23,18 +23,22 @@ Package: mesa-utils Section: x11 Architecture: any Depends: - ${shlibs:Depends}, ${misc:Depends}, -Description: Miscellaneous Mesa GL utilities - This package provides several basic GL utilities built by Mesa, including - glxinfo and glxgears. + mesa-utils-bin, +Conflicts: mesa-utils-extra +Provides: mesa-utils-extra +Replaces: mesa-utils-extra +Description: Miscellaneous Mesa utilities -- symlinks + This package provides symlinks to several native utilities provided by Mesa, + including glxinfo and glxgears. -Package: mesa-utils-extra +Package: mesa-utils-bin Section: x11 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, -Description: Miscellaneous Mesa utilies (opengles, egl) - This package provides several basic utilities built from Mesa, including - es2gears, es2_info and es2tri +Multi-Arch: same +Description: Miscellaneous Mesa utilities -- native applications + This package provides native builds of utilities provided by Mesa, including + glxinfo and glxgears. ===================================== debian/mesa-utils-bin.install ===================================== @@ -0,0 +1,8 @@ +usr/bin/eglinfo.${DEB_HOST_MULTIARCH} +usr/bin/es2_info.${DEB_HOST_MULTIARCH} +usr/bin/es2gears_x11.${DEB_HOST_MULTIARCH} +usr/bin/es2tri.${DEB_HOST_MULTIARCH} +usr/bin/glxdemo.${DEB_HOST_MULTIARCH} +usr/bin/glxgears.${DEB_HOST_MULTIARCH} +usr/bin/glxheads.${DEB_HOST_MULTIARCH} +usr/bin/glxinfo.${DEB_HOST_MULTIARCH} ===================================== debian/mesa-utils-extra.install deleted ===================================== @@ -1,5 +0,0 @@ -# This file gets tweaked in an OS-specific fashion (see mesa-utils-extra.install.linux) -usr/bin/eglinfo -usr/bin/es2_info -usr/bin/es2gears_x11 -usr/bin/es2tri ===================================== debian/mesa-utils-extra.install.linux deleted ===================================== @@ -1,8 +0,0 @@ -# OS-independent part (from mesa-utils-extra.install): -usr/bin/eglinfo -usr/bin/es2_info -usr/bin/es2gears_x11 -usr/bin/es2tri - -# Wayland support, only on Linux: -usr/bin/es2gears_wayland ===================================== debian/mesa-utils-extra.links deleted ===================================== @@ -1,3 +0,0 @@ -# This file gets tweaked in an OS-specific fashion (see mesa-utils-extra.links.linux) -/usr/bin/es2gears_x11 /usr/bin/es2gears -/usr/share/man/man1/es2gears.1 /usr/share/man/man1/es2gears_x11.1 ===================================== debian/mesa-utils-extra.links.linux deleted ===================================== @@ -1,6 +0,0 @@ -# OS-independent part (from mesa-utils-extra.links): -/usr/bin/es2gears_x11 /usr/bin/es2gears -/usr/share/man/man1/es2gears.1 /usr/share/man/man1/es2gears_x11.1 - -# Wayland support, only on Linux: -/usr/share/man/man1/es2gears.1 /usr/share/man/man1/es2gears_wayland.1 ===================================== debian/mesa-utils-extra.manpages deleted ===================================== @@ -1,3 +0,0 @@ -debian/es2_info.1 -debian/es2gears.1 -debian/es2tri.1 ===================================== debian/mesa-utils.install ===================================== @@ -1,4 +1,9 @@ +usr/bin/eglinfo +usr/bin/es2_info +usr/bin/es2gears_x11 +usr/bin/es2tri usr/bin/glxdemo usr/bin/glxgears usr/bin/glxheads usr/bin/glxinfo +usr/share/mesa-demos ===================================== debian/mesa-utils.manpages ===================================== @@ -1,3 +1,6 @@ +debian/es2_info.1 +debian/es2gears.1 +debian/es2tri.1 debian/glxdemo.1 debian/glxgears.1 debian/glxheads.1 ===================================== debian/rules ===================================== @@ -1,3 +1,51 @@ #!/usr/bin/make -f + +include /usr/share/dpkg/architecture.mk + +NOT_INSTALLED = glsync \ + glthreads \ + glxcontexts \ + glxgears_fbconfig \ + glxgears_pixmap \ + glxpbdemo \ + glxpixmap \ + glxsnoop \ + glxswapcontrol \ + manywin \ + multictx \ + offset \ + overlay \ + pbdemo \ + pbinfo \ + shape \ + sharedtex \ + sharedtex_mt \ + texture_from_pixmap \ + wincopy \ + xfont \ + xrotfontdemo + %: - dh $@ --with=quilt + dh $@ --with=quilt \ + --builddirectory=build/ + +override_dh_auto_install: + dh_auto_install --destdir=debian/tmp + for app in $(NOT_INSTALLED); do \ + rm -f debian/tmp/usr/bin/$$app; \ + done + +override_dh_install: + for app in `ls debian/tmp/usr/bin`; do \ + mv -f debian/tmp/usr/bin/$$app debian/tmp/usr/bin/$$app.${DEB_HOST_MULTIARCH}; \ + ln -s /usr/bin/$$app.${DEB_HOST_MULTIARCH} debian/tmp/usr/bin/$$app; \ + done + + dh_install + + ifeq ($(DEB_HOST_ARCH_OS), linux) + mv debian/tmp/usr/bin/es2gears_wayland \ + debian/mesa-utils/usr/bin + mv debian/tmp/usr/bin/es2gears_wayland.* \ + debian/mesa-utils-bin/usr/bin + endif View it on GitLab: https://salsa.debian.org/xorg-team/app/mesa-demos/-/compare/11679ee170744b4ea2fc5e68ccc1fea324894b8d...e6fa38c1d33da80fb72e8ef7679c853d1ec29381 -- View it on GitLab: https://salsa.debian.org/xorg-team/app/mesa-demos/-/compare/11679ee170744b4ea2fc5e68ccc1fea324894b8d...e6fa38c1d33da80fb72e8ef7679c853d1ec29381 You're receiving this email because of your account on salsa.debian.org.
