Package: gtkgl2
Control: tags -1 pending
Dear maintainer,
I've prepared an NMU for gtkgl2 (versioned as 2.1.0-0.3) fixing this
bug. The diff with 2.1.0-0.1 is attached.
I have uploaded it to DELAYED/15.
Feel free to tell me if I should cancel this upload.
Regards.
diff --git a/debian/changelog b/debian/changelog
index dfe3329..cd3153d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+gtkgl2 (2.1.0-0.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * autopkgtest: call gcc instead of cc. Closes: #960872.
+ * Use substitution variables to restrict patterns in debhelper config files.
+
+ -- Nicolas Boulenguez <nico...@debian.org> Mon, 18 May 2020 00:31:57 +0000
+
+gtkgl2 (2.1.0-0.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Let autopkgtests explicitly depend on gcc.
+ * Drop obsolete libgtkgl2.0-dev.lintian-overrides.
+ * Debhelper 13.
+
+ -- Nicolas Boulenguez <nico...@debian.org> Sun, 03 May 2020 06:43:46 +0000
+
gtkgl2 (2.1.0-0.1) unstable; urgency=medium
* Non-maintainer upload.
diff --git a/debian/control b/debian/control
index b303b34..aa7d337 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Sam Hocevar <s...@debian.org>
Standards-Version: 4.5.0
Build-Depends:
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
libgl-dev,
libgtk2.0-dev,
Rules-Requires-Root: no
diff --git a/debian/libgtkgl2.0-1.install b/debian/libgtkgl2.0-1.install
index e5e5fe1..858d8e3 100644
--- a/debian/libgtkgl2.0-1.install
+++ b/debian/libgtkgl2.0-1.install
@@ -1 +1 @@
-usr/lib/*/libgtkgl*.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/libgtkgl*.so.*
diff --git a/debian/libgtkgl2.0-dev.install b/debian/libgtkgl2.0-dev.install
index 7ee2227..fb6ee69 100644
--- a/debian/libgtkgl2.0-dev.install
+++ b/debian/libgtkgl2.0-dev.install
@@ -1,4 +1,4 @@
usr/include/gtkgl-*/gtkgl/*.h
-usr/lib/*/libgtkgl-*.a
-usr/lib/*/libgtkgl-*.so
-usr/lib/*/pkgconfig/gtkgl-*.pc
+usr/lib/${DEB_HOST_MULTIARCH}/libgtkgl-*.a
+usr/lib/${DEB_HOST_MULTIARCH}/libgtkgl-*.so
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/gtkgl-*.pc
diff --git a/debian/libgtkgl2.0-dev.lintian-overrides b/debian/libgtkgl2.0-dev.lintian-overrides
deleted file mode 100644
index 9b22ef9..0000000
--- a/debian/libgtkgl2.0-dev.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# This package Depends: libgl1 via libgl-dev.
-pkg-config-references-unknown-shared-library usr/lib/*/pkgconfig/gtkgl-2.0.pc -lGL (line 10)
diff --git a/debian/not-installed b/debian/not-installed
index 7fdf2fe..9c992f6 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1 +1 @@
-usr/lib/*/libgtkgl-*.la
+usr/lib/${DEB_HOST_MULTIARCH}/libgtkgl-*.la
diff --git a/debian/tests/control b/debian/tests/control
index 213281a..74bf333 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,4 +1,4 @@
Tests: link-basic-example
-Depends: @, pkg-config, xauth, xvfb
+Depends: @, pkg-config, xauth, xvfb, gcc
Restrictions: allow-stderr
# Parsing of gtkgl headers emits deprecation warnings.
diff --git a/debian/tests/link-basic-example b/debian/tests/link-basic-example
index d2fe769..76453e5 100644
--- a/debian/tests/link-basic-example
+++ b/debian/tests/link-basic-example
@@ -6,5 +6,5 @@ sed 's/gtk_main();//' examples/simple.c > "$AUTOPKGTEST_TMP/m.c"
cd "$AUTOPKGTEST_TMP"
-cc -o m m.c `pkg-config --cflags --libs gtkgl-2.0`
+gcc -o m m.c `pkg-config --cflags --libs gtkgl-2.0`
xvfb-run ./m
