debian/changelog

@@ -8,6 +8,10 @@ libglvnd (1.2.0-1) UNRELEASED; urgency=medium
   * control: Drop old Breaks/Replaces.
   * libgles1: Override package-name-doesnt-match-sonames.
   * control: Support nocheck profile for xvfb build-dep. (Closes: #928475)
+  * control: Add mesa-common-dev to lib{gl,glx}-dev depends, due to
+    {gl,glx}_mangle.h includes.
+  * control: Fix lib{egl,gles,glx}-dev depends.
+  * Migrate to python3. (Closes: #936868)
 
  -- Timo Aaltonen <tjaalton@debian.org>  Wed, 13 Mar 2019 20:05:49 +0200
 

debian/control

@@ -7,8 +7,7 @@ Build-Depends:
  pkg-config,
  libx11-dev,
  libxext-dev,
- python-dev,
- python-libxml2,
+ python3-libxml2,
  x11proto-gl-dev,
  xauth,
  xvfb <!nocheck>,
@@ -35,6 +34,16 @@ Description: Vendor neutral GL dispatch library -- development files
  .
  This package contains the development files for libglvnd.
 
+Package: libglvnd-core-dev
+Section: oldlibs
+Architecture: any
+Depends:
+ libglvnd-dev,
+ ${misc:Depends},
+Multi-Arch: same
+Description: transitional dummy package
+ This is a transitional dummy package, it can be safely removed.
+
 Package: libglvnd0
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends},
@@ -71,6 +80,8 @@ Package: libegl-dev
 Architecture: any
 Depends:
  libegl1 (= ${binary:Version}),
+ libgl-dev,
+ libx11-dev,
  ${misc:Depends},
 Replaces:
  libegl1-mesa-dev (<< 19.2.0-1),
@@ -117,6 +128,8 @@ Description: Vendor neutral GL dispatch library -- GLESv2 support
 Package: libgles-dev
 Architecture: any
 Depends:
+ libegl-dev,
+ libgl-dev,
  libgles1 (= ${binary:Version}),
  libgles2 (= ${binary:Version}),
  ${misc:Depends},
@@ -153,6 +166,7 @@ Package: libgl-dev
 Architecture: any
 Depends:
  libgl1 (= ${binary:Version}),
+ mesa-common-dev,
  ${misc:Depends},
 Replaces:
  libgl1-mesa-dev (<< 19.2.0-1),
@@ -189,6 +203,8 @@ Package: libglx-dev
 Architecture: any
 Depends:
  libglx0 (= ${binary:Version}),
+ libx11-dev,
+ mesa-common-dev,
  ${misc:Depends},
 Replaces:
  libglvnd-dev (<< 1.2.0-1),

debian/rules

@@ -3,6 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+export PYTHON=/usr/bin/python3
+
 override_dh_auto_install:
 	dh_auto_install
 	find debian/tmp -name '*.la' -delete