Bug#876084: [libglvnd-dev] Can't upgrade libglvnd-dev anymore

[Andreas Beckmann <anbe@debian.org>]

Followup-For: Bug #876084

This bug could be related to several similar ones against
nvidia-graphics-drivers recently, finally fixed with 375.82-8 ...

I suggest to add a bug-control file to automatically record this fact in
case of bug reports. libgl1-nvidia-glx-any is a virtual package that is
provided by src:nvidia-graphics-drivers for several years already.

And there is another little patch switching to dh_missing ...

The --builddirectory=build/ is a bit unfortunate, since it clashes with
'dh build' in case someone manually runs it twice - which I obviously did :-)


Andreas

>From 3e268f4e30daf6fc78ba93f0ed134103da40006d Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <anbe@debian.org>
Date: Sat, 25 Nov 2017 16:02:17 +0000
Subject: [PATCH 3/4] bug-control: report whether the proprietary nvidia driver
 is installed

---
 debian/bug-control | 1 +
 debian/changelog   | 2 ++
 debian/rules       | 3 +++
 3 files changed, 6 insertions(+)
 create mode 100644 debian/bug-control

diff --git a/debian/bug-control b/debian/bug-control
new file mode 100644
index 0000000..584c4f9
--- /dev/null
+++ b/debian/bug-control
@@ -0,0 +1 @@
+package-status: libgl1-nvidia-glx-any
diff --git a/debian/changelog b/debian/changelog
index 76f7e56..a721dfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ libglvnd (1.0.0-2) UNRELEASED; urgency=medium
   * Use source format 3.0 (quilt).
   * kfreebsd-hurd.patch: New, fix FTBFS on kFreeBSD and Hurd.
     (Closes: #870445)
+  * Add bug-control file to report whether the proprietary nvidia driver is
+    installed.
 
  -- Andreas Beckmann <anbe@debian.org>  Sat, 25 Nov 2017 14:59:46 +0000
 
diff --git a/debian/rules b/debian/rules
index 4f302d8..e3df5b3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,9 @@ override_dh_auto_test:
 override_dh_makeshlibs:
 	dh_makeshlibs -a -- -c4
 
+override_dh_bugfiles:
+	dh_bugfiles -A
+
 %:
 	dh $@ --builddirectory=build/
 
-- 
2.5.1

>From 2b6d0c464c7c346babcb0bb20d38a238b6d51dfc Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <anbe@debian.org>
Date: Sat, 25 Nov 2017 16:05:28 +0000
Subject: [PATCH 4/4] switch to dh_missing --fail-missing

---
 debian/changelog | 1 +
 debian/rules     | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a721dfc..df4ac1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libglvnd (1.0.0-2) UNRELEASED; urgency=medium
     (Closes: #870445)
   * Add bug-control file to report whether the proprietary nvidia driver is
     installed.
+  * Switch to dh_missing --fail-missing.
 
  -- Andreas Beckmann <anbe@debian.org>  Sat, 25 Nov 2017 14:59:46 +0000
 
diff --git a/debian/rules b/debian/rules
index e3df5b3..e35daf7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,13 +3,15 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-override_dh_install:
+override_dh_auto_install:
+	dh_auto_install
 	find debian/tmp -name '*.la' -delete
 
 	# drop GLESv1
 	rm -f debian/tmp/usr/lib/*/libGLESv1*
 
-	dh_install --fail-missing
+override_dh_missing:
+	dh_missing --fail-missing
 
 # needs X
 override_dh_auto_test:
-- 
2.5.1