Still no bug filed, so here you go. I guess the first three are fine, but can't understand the need for the fourth one..
-------- Forwarded Message -------- Subject: some bits for libglvnd Date: Sun, 13 Aug 2017 16:22:14 +0200 From: Andreas Beckmann <[email protected]> To: Timo Aaltonen <[email protected]> Hi, here are a few patches I'd suggest for libglvnd. These should make it easier to switch switch the nvidia driver from the nvidia provided binaries to src:libglvnd at some point. I'll need to do more chnages in the driver, a first set is sitting in NEW. I see you plan to use an alternative dependency on virtual packages "lib<FOO>-vendor"? So I should provide these from the nvidia side ... BTW, the pristine-tar data for the current version is missing. Andreas
From 961c47eac372fb87257e998a0f39637b5be0817e Mon Sep 17 00:00:00 2001 From: Andreas Beckmann <[email protected]> Date: Sun, 13 Aug 2017 09:05:50 +0200 Subject: [PATCH 1/4] libgl1: add Breaks against glx-diversions (<< 0.8) which did not divert libGL.so.1.0.0 --- debian/changelog | 5 +++++ debian/control | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4662fa0..9a3c044 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ libglvnd (0.2.999+git20170802-3) UNRELEASED; urgency=medium + [ Timo Aaltonen ] * control: Add Breaks/Replaces to match mesa upload which enabled GLVND. (Closes: #870686) * control: Add back depends on default libegl/libglx vendor. + [ Andreas Beckmann ] + * libgl1: Add Breaks against glx-diversions (<< 0.8) which did not divert + libGL.so.1.0.0. + -- Timo Aaltonen <[email protected]> Fri, 11 Aug 2017 12:50:00 +0300 libglvnd (0.2.999+git20170802-2) unstable; urgency=medium diff --git a/debian/control b/debian/control index a56dafa..64b8457 100644 --- a/debian/control +++ b/debian/control @@ -114,7 +114,8 @@ Replaces: libglvnd0 (<< 0.2.999+git20170201-1) Breaks: libgl1-mesa-glx (<< 17.2.0~rc3-2), - libglvnd0 (<< 0.2.999+git20170201-1) + libglvnd0 (<< 0.2.999+git20170201-1), + glx-diversions (<< 0.8), Multi-Arch: same Description: Vendor neutral GL dispatch library -- legacy GL support This is an implementation of the vendor-neutral dispatch layer for -- 2.11.0
From 67e58c11e1ab8d83ec8182ea8d975da5a3ea4fb4 Mon Sep 17 00:00:00 2001 From: Andreas Beckmann <[email protected]> Date: Sun, 13 Aug 2017 09:25:27 +0200 Subject: [PATCH 2/4] libglvnd0: add Breaks+Replaces: libgldispatch0-nvidia which also shipped libGLdispatch.so.0 libgldispatch0-nvidia predates the naming decisions in src:libglvnd --- debian/changelog | 2 ++ debian/control | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9a3c044..ec56511 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ libglvnd (0.2.999+git20170802-3) UNRELEASED; urgency=medium [ Andreas Beckmann ] * libgl1: Add Breaks against glx-diversions (<< 0.8) which did not divert libGL.so.1.0.0. + * libglvnd0: Add Breaks+Replaces: libgldispatch0-nvidia which also shipped + libGLdispatch.so.0. -- Timo Aaltonen <[email protected]> Fri, 11 Aug 2017 12:50:00 +0300 diff --git a/debian/control b/debian/control index 64b8457..6170c39 100644 --- a/debian/control +++ b/debian/control @@ -55,6 +55,10 @@ Pre-Depends: ${misc:Pre-Depends}, Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: + libgldispatch0-nvidia, +Replaces: + libgldispatch0-nvidia, Multi-Arch: same Description: Vendor neutral GL dispatch library This is an implementation of the vendor-neutral dispatch layer for -- 2.11.0
From 6128187571b7286d4558e3e400406427cf9d6d80 Mon Sep 17 00:00:00 2001 From: Andreas Beckmann <[email protected]> Date: Sun, 13 Aug 2017 15:37:39 +0200 Subject: [PATCH 3/4] set paths in gbp.conf --- debian/gbp.conf | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 debian/gbp.conf diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..b171525 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,3 @@ +[buildpackage] +debian-branch = debian-unstable +upstream-branch = upstream-unstable -- 2.11.0
From 0771d0d8d988b69ddff25bd95a8742f99d9c45ca Mon Sep 17 00:00:00 2001 From: Andreas Beckmann <[email protected]> Date: Sun, 13 Aug 2017 16:02:34 +0200 Subject: [PATCH 4/4] add Conflicts/Replaces/Provides: $package --- debian/changelog | 2 ++ debian/control | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ec56511..e20736f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ libglvnd (0.2.999+git20170802-3) UNRELEASED; urgency=medium libGL.so.1.0.0. * libglvnd0: Add Breaks+Replaces: libgldispatch0-nvidia which also shipped libGLdispatch.so.0. + * library packages: Add Conflicts/Replaces/Provides: $package for easier + switching between alternate implementations. -- Timo Aaltonen <[email protected]> Fri, 11 Aug 2017 12:50:00 +0300 diff --git a/debian/control b/debian/control index 6170c39..776be52 100644 --- a/debian/control +++ b/debian/control @@ -55,10 +55,15 @@ Pre-Depends: ${misc:Pre-Depends}, Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: + libglvnd0, Breaks: libgldispatch0-nvidia, Replaces: + libglvnd0, libgldispatch0-nvidia, +Provides: + libglvnd0, Multi-Arch: same Description: Vendor neutral GL dispatch library This is an implementation of the vendor-neutral dispatch layer for @@ -74,12 +79,17 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libegl-mesa0 | libegl-vendor, +Conflicts: + libegl1, Replaces: + libegl1, libegl1-mesa (<< 17.2.0~rc3-2), libglvnd0 (<< 0.2.999+git20170201-1) Breaks: libegl1-mesa (<< 17.2.0~rc3-2), libglvnd0 (<< 0.2.999+git20170201-1) +Provides: + libegl1, Multi-Arch: same Description: Vendor neutral GL dispatch library -- EGL support This is an implementation of the vendor-neutral dispatch layer for @@ -94,10 +104,15 @@ Pre-Depends: ${misc:Pre-Depends}, Depends: ${shlibs:Depends}, ${misc:Depends}, +Conflicts: + libgles2, Replaces: + libgles2, libgles2-mesa (<< 17.2.0~rc3-2), Breaks: libgles2-mesa (<< 17.2.0~rc3-2), +Provides: + libgles2, Multi-Arch: same Description: Vendor neutral GL dispatch library -- GLES support This is an implementation of the vendor-neutral dispatch layer for @@ -113,13 +128,18 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libglx0 (= ${binary:Version}), +Conflicts: + libgl1, Replaces: + libgl1, libgl1-mesa-glx (<< 17.2.0~rc3-2), libglvnd0 (<< 0.2.999+git20170201-1) Breaks: libgl1-mesa-glx (<< 17.2.0~rc3-2), libglvnd0 (<< 0.2.999+git20170201-1), glx-diversions (<< 0.8), +Provides: + libgl1, Multi-Arch: same Description: Vendor neutral GL dispatch library -- legacy GL support This is an implementation of the vendor-neutral dispatch layer for @@ -135,12 +155,17 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libglx-mesa0 | libglx-vendor, +Conflicts: + libglx0, Replaces: + libglx0, libgl1-mesa-glx (<< 17.2.0~rc3-2), libglvnd0 (<< 0.2.999+git20170201-1) Breaks: libgl1-mesa-glx (<< 17.2.0~rc3-2), libglvnd0 (<< 0.2.999+git20170201-1) +Provides: + libglx0, Multi-Arch: same Description: Vendor neutral GL dispatch library -- GLX support This is an implementation of the vendor-neutral dispatch layer for @@ -155,8 +180,14 @@ Pre-Depends: ${misc:Pre-Depends}, Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: libglvnd0 (<< 0.2.999+git20170201-1) +Conflicts: + libopengl0, +Replaces: + libopengl0, + libglvnd0 (<< 0.2.999+git20170201-1), Breaks: libglvnd0 (<< 0.2.999+git20170201-1) +Provides: + libopengl0, Multi-Arch: same Description: Vendor neutral GL dispatch library -- OpenGL support This is an implementation of the vendor-neutral dispatch layer for -- 2.11.0
