From ac47d5cef1e4cdd4cadfa8897178d5992d7cbd42 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Mon, 18 Dec 2017 13:41:31 +0000
Subject: [PATCH] GL shims: Use a less libGL.so.1-centric name

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 debian/.gitignore                             | 11 +++++-----
 debian/control                                | 22 ++++++++++++++++---
 ...ms.install => libcapsule-gl-shims.install} |  0
 3 files changed, 25 insertions(+), 8 deletions(-)
 rename debian/{libcapsule-libgl1-shims.install => libcapsule-gl-shims.install} (100%)

diff --git a/debian/.gitignore b/debian/.gitignore
index d46420a24..420b47c39 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -5,9 +5,10 @@
 /files
 /libGL-proxy/
 /libGL-proxy-build/
-/libcapsule-dev
-/libcapsule-tools
+/libcapsule-dev/
+/libcapsule-gl-shims/
+/libcapsule-tools/
 /libcapsule-libgl1-shims/
-/libcapsule-tests
-/libcapsule0
-/tmp
+/libcapsule-tests/
+/libcapsule0/
+/tmp/
diff --git a/debian/control b/debian/control
index 2bb26476a..2f00efa5c 100644
--- a/debian/control
+++ b/debian/control
@@ -56,24 +56,40 @@ Description:
  .
  This package contains the files needed to generate libcapsule proxy libraries.
 
+Package: libcapsule-gl-shims
+Architecture: amd64 i386
+Multi-Arch: same
+Section: libs
+Breaks: libcapsule-libgl1-shims (<< ${binary:Version}),
+Replaces: libcapsule-libgl1-shims (<< ${binary:Version}),
+Description: OpenGL-related shim libraries
+ libcapsule is a helper library used to implement segregated run-time
+ dynamic linking proxy libraries - used (for example) to load a library
+ that has dependencies incompatible with the regular libraries that are
+ part of the host OS, such as an incompatible libstdc++ version.
+ .
+ This package contains libcapsule proxy libraries for libGL, libGLX,
+ libOpenGL and related libraries.
+
 Package: libcapsule-libgl1-shims
 Architecture: amd64 i386
 Multi-Arch: same
 Section: libs
-Description:
+Depends: libcapsule-gl-shims
+Description: OpenGL-related shim libraries - transitional package
  libcapsule is a helper library used to implement segregated run-time
  dynamic linking proxy libraries - used (for example) to load a library
  that has dependencies incompatible with the regular libraries that are
  part of the host OS, such as an incompatible libstdc++ version.
  .
- This package contains automated tests.
+ This transitional package depends on libcapsule-gl-shims.
 
 Package: libcapsule-tests
 Architecture: amd64 i386
 Section: misc
 Depends:
  bubblewrap,
- libcapsule-libgl1-shims (= ${binary:Version}),
+ libcapsule-gl-shims (= ${binary:Version}),
  libipc-run-perl,
  libsort-versions-perl,
  mesa-utils,
diff --git a/debian/libcapsule-libgl1-shims.install b/debian/libcapsule-gl-shims.install
similarity index 100%
rename from debian/libcapsule-libgl1-shims.install
rename to debian/libcapsule-gl-shims.install
-- 
GitLab