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
-
b5a70688
by Timo Aaltonen at 2022-04-12T15:29:12+03:00
-
e6fa38c1
by Timo Aaltonen at 2022-04-12T16:05:29+03:00
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:
1 | +mesa-demos (8.4.0-2) UNRELEASED; urgency=medium
|
|
2 | + |
|
3 | + * control: Migrate to debhelper-compat, bump to 13.
|
|
4 | + * control: Bump policy to 4.6.0.
|
|
5 | + * Merge -extra in mesa-utils, and add a separate package for native
|
|
6 | + binaries. (Closes: #792223)
|
|
7 | + |
|
8 | + -- Timo Aaltonen <tjaalton@debian.org> Fri, 01 Apr 2022 15:53:10 +0300
|
|
9 | + |
|
1 | 10 | mesa-demos (8.4.0-1) unstable; urgency=medium
|
2 | 11 | |
3 | 12 | * New upstream release.
|
1 | -11 |
... | ... | @@ -3,8 +3,8 @@ Section: utils |
3 | 3 | Priority: optional
|
4 | 4 | Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
|
5 | 5 | Uploaders: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>, Andreas Boll <andreas.boll.dev@gmail.com>
|
6 | -Standards-Version: 4.1.3
|
|
7 | -Build-Depends: debhelper (>= 11~),
|
|
6 | +Standards-Version: 4.6.0
|
|
7 | +Build-Depends: debhelper-compat (= 13),
|
|
8 | 8 | quilt (>= 0.63-8.2~),
|
9 | 9 | pkg-config,
|
10 | 10 | libx11-dev,
|
... | ... | @@ -23,18 +23,22 @@ Package: mesa-utils |
23 | 23 | Section: x11
|
24 | 24 | Architecture: any
|
25 | 25 | Depends:
|
26 | - ${shlibs:Depends},
|
|
27 | 26 | ${misc:Depends},
|
28 | -Description: Miscellaneous Mesa GL utilities
|
|
29 | - This package provides several basic GL utilities built by Mesa, including
|
|
30 | - glxinfo and glxgears.
|
|
27 | + mesa-utils-bin,
|
|
28 | +Conflicts: mesa-utils-extra
|
|
29 | +Provides: mesa-utils-extra
|
|
30 | +Replaces: mesa-utils-extra
|
|
31 | +Description: Miscellaneous Mesa utilities -- symlinks
|
|
32 | + This package provides symlinks to several native utilities provided by Mesa,
|
|
33 | + including glxinfo and glxgears.
|
|
31 | 34 | |
32 | -Package: mesa-utils-extra
|
|
35 | +Package: mesa-utils-bin
|
|
33 | 36 | Section: x11
|
34 | 37 | Architecture: any
|
35 | 38 | Depends:
|
36 | 39 | ${shlibs:Depends},
|
37 | 40 | ${misc:Depends},
|
38 | -Description: Miscellaneous Mesa utilies (opengles, egl)
|
|
39 | - This package provides several basic utilities built from Mesa, including
|
|
40 | - es2gears, es2_info and es2tri |
|
41 | +Multi-Arch: same
|
|
42 | +Description: Miscellaneous Mesa utilities -- native applications
|
|
43 | + This package provides native builds of utilities provided by Mesa, including
|
|
44 | + glxinfo and glxgears. |
1 | +usr/bin/eglinfo.${DEB_HOST_MULTIARCH}
|
|
2 | +usr/bin/es2_info.${DEB_HOST_MULTIARCH}
|
|
3 | +usr/bin/es2gears_x11.${DEB_HOST_MULTIARCH}
|
|
4 | +usr/bin/es2tri.${DEB_HOST_MULTIARCH}
|
|
5 | +usr/bin/glxdemo.${DEB_HOST_MULTIARCH}
|
|
6 | +usr/bin/glxgears.${DEB_HOST_MULTIARCH}
|
|
7 | +usr/bin/glxheads.${DEB_HOST_MULTIARCH}
|
|
8 | +usr/bin/glxinfo.${DEB_HOST_MULTIARCH} |
1 | -# This file gets tweaked in an OS-specific fashion (see mesa-utils-extra.install.linux)
|
|
2 | -usr/bin/eglinfo
|
|
3 | -usr/bin/es2_info
|
|
4 | -usr/bin/es2gears_x11
|
|
5 | -usr/bin/es2tri |
1 | -# OS-independent part (from mesa-utils-extra.install):
|
|
2 | -usr/bin/eglinfo
|
|
3 | -usr/bin/es2_info
|
|
4 | -usr/bin/es2gears_x11
|
|
5 | -usr/bin/es2tri
|
|
6 | - |
|
7 | -# Wayland support, only on Linux:
|
|
8 | -usr/bin/es2gears_wayland |
1 | -# This file gets tweaked in an OS-specific fashion (see mesa-utils-extra.links.linux)
|
|
2 | -/usr/bin/es2gears_x11 /usr/bin/es2gears
|
|
3 | -/usr/share/man/man1/es2gears.1 /usr/share/man/man1/es2gears_x11.1 |
1 | -# OS-independent part (from mesa-utils-extra.links):
|
|
2 | -/usr/bin/es2gears_x11 /usr/bin/es2gears
|
|
3 | -/usr/share/man/man1/es2gears.1 /usr/share/man/man1/es2gears_x11.1
|
|
4 | - |
|
5 | -# Wayland support, only on Linux:
|
|
6 | -/usr/share/man/man1/es2gears.1 /usr/share/man/man1/es2gears_wayland.1 |
1 | -debian/es2_info.1
|
|
2 | -debian/es2gears.1
|
|
3 | -debian/es2tri.1 |
1 | +usr/bin/eglinfo
|
|
2 | +usr/bin/es2_info
|
|
3 | +usr/bin/es2gears_x11
|
|
4 | +usr/bin/es2tri
|
|
1 | 5 | usr/bin/glxdemo
|
2 | 6 | usr/bin/glxgears
|
3 | 7 | usr/bin/glxheads
|
4 | 8 | usr/bin/glxinfo
|
9 | +usr/share/mesa-demos |
1 | +debian/es2_info.1
|
|
2 | +debian/es2gears.1
|
|
3 | +debian/es2tri.1
|
|
1 | 4 | debian/glxdemo.1
|
2 | 5 | debian/glxgears.1
|
3 | 6 | debian/glxheads.1
|
1 | 1 | #!/usr/bin/make -f
|
2 | + |
|
3 | +include /usr/share/dpkg/architecture.mk
|
|
4 | + |
|
5 | +NOT_INSTALLED = glsync \
|
|
6 | + glthreads \
|
|
7 | + glxcontexts \
|
|
8 | + glxgears_fbconfig \
|
|
9 | + glxgears_pixmap \
|
|
10 | + glxpbdemo \
|
|
11 | + glxpixmap \
|
|
12 | + glxsnoop \
|
|
13 | + glxswapcontrol \
|
|
14 | + manywin \
|
|
15 | + multictx \
|
|
16 | + offset \
|
|
17 | + overlay \
|
|
18 | + pbdemo \
|
|
19 | + pbinfo \
|
|
20 | + shape \
|
|
21 | + sharedtex \
|
|
22 | + sharedtex_mt \
|
|
23 | + texture_from_pixmap \
|
|
24 | + wincopy \
|
|
25 | + xfont \
|
|
26 | + xrotfontdemo
|
|
27 | + |
|
2 | 28 | %:
|
3 | - dh $@ --with=quilt |
|
29 | + dh $@ --with=quilt \
|
|
30 | + --builddirectory=build/
|
|
31 | + |
|
32 | +override_dh_auto_install:
|
|
33 | + dh_auto_install --destdir=debian/tmp
|
|
34 | + for app in $(NOT_INSTALLED); do \
|
|
35 | + rm -f debian/tmp/usr/bin/$$app; \
|
|
36 | + done
|
|
37 | + |
|
38 | +override_dh_install:
|
|
39 | + for app in `ls debian/tmp/usr/bin`; do \
|
|
40 | + mv -f debian/tmp/usr/bin/$$app debian/tmp/usr/bin/$$app.${DEB_HOST_MULTIARCH}; \
|
|
41 | + ln -s /usr/bin/$$app.${DEB_HOST_MULTIARCH} debian/tmp/usr/bin/$$app; \
|
|
42 | + done
|
|
43 | + |
|
44 | + dh_install
|
|
45 | + |
|
46 | + ifeq ($(DEB_HOST_ARCH_OS), linux)
|
|
47 | + mv debian/tmp/usr/bin/es2gears_wayland \
|
|
48 | + debian/mesa-utils/usr/bin
|
|
49 | + mv debian/tmp/usr/bin/es2gears_wayland.* \
|
|
50 | + debian/mesa-utils-bin/usr/bin
|
|
51 | + endif |