libglvnd: Changes to 'debian-unstable'
debian/changelog | 11 +++++++++--
debian/control | 23 ++++++++++++++---------
debian/gbp.conf | 3 +++
3 files changed, 26 insertions(+), 11 deletions(-)
New commits:
commit 986acf166447a20eb30eb2703422f9360998574c
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Fri Sep 1 11:17:19 2017 +0300
release to sid
diff --git a/debian/changelog b/debian/changelog
index ec56511..a941e63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libglvnd (0.2.999+git20170802-3) UNRELEASED; urgency=medium
+libglvnd (0.2.999+git20170802-3) unstable; urgency=medium
[ Timo Aaltonen ]
* control: Add Breaks/Replaces to match mesa upload which enabled
@@ -11,7 +11,7 @@ libglvnd (0.2.999+git20170802-3) UNRELEASED; urgency=medium
* libglvnd0: Add Breaks+Replaces: libgldispatch0-nvidia which also shipped
libGLdispatch.so.0.
- -- Timo Aaltonen <tjaalton@debian.org> Fri, 11 Aug 2017 12:50:00 +0300
+ -- Timo Aaltonen <tjaalton@debian.org> Fri, 01 Sep 2017 11:15:04 +0300
libglvnd (0.2.999+git20170802-2) unstable; urgency=medium
commit 802e81b76a7ab376af0d5723d3286ac9b3574cd4
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Fri Sep 1 11:14:34 2017 +0300
Fix mesa R/B versions to match the version that got in experimental
diff --git a/debian/control b/debian/control
index 6170c39..70c4801 100644
--- a/debian/control
+++ b/debian/control
@@ -75,10 +75,10 @@ Depends:
${misc:Depends},
libegl-mesa0 | libegl-vendor,
Replaces:
- libegl1-mesa (<< 17.2.0~rc3-2),
+ libegl1-mesa (<< 17.2.0~rc4-1),
libglvnd0 (<< 0.2.999+git20170201-1)
Breaks:
- libegl1-mesa (<< 17.2.0~rc3-2),
+ libegl1-mesa (<< 17.2.0~rc4-1),
libglvnd0 (<< 0.2.999+git20170201-1)
Multi-Arch: same
Description: Vendor neutral GL dispatch library -- EGL support
@@ -95,9 +95,9 @@ Depends:
${shlibs:Depends},
${misc:Depends},
Replaces:
- libgles2-mesa (<< 17.2.0~rc3-2),
+ libgles2-mesa (<< 17.2.0~rc4-1),
Breaks:
- libgles2-mesa (<< 17.2.0~rc3-2),
+ libgles2-mesa (<< 17.2.0~rc4-1),
Multi-Arch: same
Description: Vendor neutral GL dispatch library -- GLES support
This is an implementation of the vendor-neutral dispatch layer for
@@ -114,10 +114,10 @@ Depends:
${misc:Depends},
libglx0 (= ${binary:Version}),
Replaces:
- libgl1-mesa-glx (<< 17.2.0~rc3-2),
+ libgl1-mesa-glx (<< 17.2.0~rc4-1),
libglvnd0 (<< 0.2.999+git20170201-1)
Breaks:
- libgl1-mesa-glx (<< 17.2.0~rc3-2),
+ libgl1-mesa-glx (<< 17.2.0~rc4-1),
libglvnd0 (<< 0.2.999+git20170201-1),
glx-diversions (<< 0.8),
Multi-Arch: same
@@ -136,10 +136,10 @@ Depends:
${misc:Depends},
libglx-mesa0 | libglx-vendor,
Replaces:
- libgl1-mesa-glx (<< 17.2.0~rc3-2),
+ libgl1-mesa-glx (<< 17.2.0~rc4-1),
libglvnd0 (<< 0.2.999+git20170201-1)
Breaks:
- libgl1-mesa-glx (<< 17.2.0~rc3-2),
+ libgl1-mesa-glx (<< 17.2.0~rc4-1),
libglvnd0 (<< 0.2.999+git20170201-1)
Multi-Arch: same
Description: Vendor neutral GL dispatch library -- GLX support
commit 63252ef2c1880573bca66dc8f4a49f4278181212
Author: Andreas Beckmann <anbe@debian.org>
Date: Sun Aug 13 15:37:39 2017 +0200
set paths in 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
commit 743f59dff20ab451fd502ec2610a14a430bb560b
Author: Andreas Beckmann <anbe@debian.org>
Date: Sun Aug 13 09:25:27 2017 +0200
libglvnd0: add Breaks+Replaces: libgldispatch0-nvidia
which also shipped libGLdispatch.so.0
libgldispatch0-nvidia predates the naming decisions in src:libglvnd
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 <tjaalton@debian.org> 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
commit 1c60618f40f53f6f9e307b78912d64f4d50c894c
Author: Andreas Beckmann <anbe@debian.org>
Date: Sun Aug 13 09:05:50 2017 +0200
libgl1: add Breaks against glx-diversions (<< 0.8)
which did not divert libGL.so.1.0.0
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 <tjaalton@debian.org> 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
Reply to: