debian/bug-control | 1 + debian/changelog | 16 ++++++++++++++++ debian/control | 8 +------- debian/patches/kfreebsd-hurd.patch | 14 ++++++++++++++ debian/patches/series | 1 + debian/rules | 9 +++++++-- debian/source/format | 2 +- 7 files changed, 41 insertions(+), 10 deletions(-)
New commits: commit 7747a342109ad9291b819d5fc153ef7b4c4b123e Author: Andreas Boll <andreas.boll....@gmail.com> Date: Thu Dec 14 21:41:58 2017 +0100 control: Remove duplicated Section fields. diff --git a/debian/changelog b/debian/changelog index 50f6408..e4eebc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ libglvnd (1.0.0-2) UNRELEASED; urgency=medium [ Andreas Boll ] * Bump standards version to 4.1.2. + * control: Remove duplicated Section fields. -- Andreas Beckmann <a...@debian.org> Sat, 25 Nov 2017 14:59:46 +0000 diff --git a/debian/control b/debian/control index aacb500..34545f4 100644 --- a/debian/control +++ b/debian/control @@ -59,7 +59,6 @@ Description: Vendor neutral GL dispatch library -- core development files package for Mesa. Package: libglvnd0 -Section: libs Architecture: any Pre-Depends: ${misc:Pre-Depends}, Depends: @@ -77,7 +76,6 @@ Description: Vendor neutral GL dispatch library This package contains the GL dispatch library. Package: libegl1 -Section: libs Architecture: any Pre-Depends: ${misc:Pre-Depends}, Depends: @@ -99,7 +97,6 @@ Description: Vendor neutral GL dispatch library -- EGL support This package contains support for EGL. Package: libgles2 -Section: libs Architecture: any Pre-Depends: ${misc:Pre-Depends}, Depends: @@ -118,7 +115,6 @@ Description: Vendor neutral GL dispatch library -- GLES support This package contains support for GLES. Package: libgl1 -Section: libs Architecture: any Pre-Depends: ${misc:Pre-Depends}, Depends: @@ -141,7 +137,6 @@ Description: Vendor neutral GL dispatch library -- legacy GL support This package contains support for old libGL for compatibility reasons. Package: libglx0 -Section: libs Architecture: any Pre-Depends: ${misc:Pre-Depends}, Depends: @@ -163,7 +158,6 @@ Description: Vendor neutral GL dispatch library -- GLX support This package contains support for GLX. Package: libopengl0 -Section: libs Architecture: any Pre-Depends: ${misc:Pre-Depends}, Depends: commit 6c081f9f704217742440ccb1b4ecbfcc2c574310 Author: Andreas Boll <andreas.boll....@gmail.com> Date: Thu Dec 14 21:35:41 2017 +0100 Bump standards version to 4.1.2. diff --git a/debian/changelog b/debian/changelog index df4ac1f..50f6408 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ libglvnd (1.0.0-2) UNRELEASED; urgency=medium + [ Andreas Beckmann ] * Use source format 3.0 (quilt). * kfreebsd-hurd.patch: New, fix FTBFS on kFreeBSD and Hurd. (Closes: #870445) @@ -7,6 +8,9 @@ libglvnd (1.0.0-2) UNRELEASED; urgency=medium installed. * Switch to dh_missing --fail-missing. + [ Andreas Boll ] + * Bump standards version to 4.1.2. + -- Andreas Beckmann <a...@debian.org> Sat, 25 Nov 2017 14:59:46 +0000 libglvnd (1.0.0-1) unstable; urgency=high diff --git a/debian/control b/debian/control index 70f0669..aacb500 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: python-dev, python-libxml2, x11proto-gl-dev, -Standards-Version: 4.1.1 +Standards-Version: 4.1.2 Section: libs Homepage: https://github.com/NVIDIA/libglvnd Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/lib/libglvnd.git commit 63ab5c3d480631efc694009c493ac9f9252453b6 Author: Andreas Beckmann <a...@debian.org> Date: Sat Nov 25 16:05:28 2017 +0000 switch to dh_missing --fail-missing 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 <a...@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: commit 431e79ddd9955e16a889f87466468f1f7059f1cc Author: Andreas Beckmann <a...@debian.org> Date: Sat Nov 25 16:02:17 2017 +0000 bug-control: report whether the proprietary nvidia driver is installed 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 <a...@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/ commit d3ca12084669032f3bf9037c42b4ead8f72296d8 Author: Andreas Beckmann <a...@debian.org> Date: Sat Nov 25 15:10:20 2017 +0000 fix FTBFS on kFreeBSD and Hurd diff --git a/debian/changelog b/debian/changelog index ded1623..76f7e56 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,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) -- Andreas Beckmann <a...@debian.org> Sat, 25 Nov 2017 14:59:46 +0000 diff --git a/debian/patches/kfreebsd-hurd.patch b/debian/patches/kfreebsd-hurd.patch new file mode 100644 index 0000000..c504e51 --- /dev/null +++ b/debian/patches/kfreebsd-hurd.patch @@ -0,0 +1,14 @@ +Author: Andreas Beckmann <a...@debian.org> +Description: fix FTBFS on kFreeBSD and Hurd + +--- a/src/GLdispatch/vnd-glapi/u_execmem.c ++++ b/src/GLdispatch/vnd-glapi/u_execmem.c +@@ -68,7 +68,7 @@ static unsigned char *exec_mem = NULL; + static unsigned char *write_mem = NULL; + + +-#if defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__) || defined(__sun) || defined(__HAIKU__) ++#if defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__) || defined(__sun) || defined(__HAIKU__) || defined(__FreeBSD_kernel__) || defined(__GNU__) + + #include <unistd.h> + #include <sys/mman.h> diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..1dfcb87 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +kfreebsd-hurd.patch commit 3c8596e52aa371fc8dcdf4db14bdc42a3379962c Author: Andreas Beckmann <a...@debian.org> Date: Sat Nov 25 15:00:32 2017 +0000 use source format 3.0 (quilt) diff --git a/debian/changelog b/debian/changelog index 207a54a..ded1623 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libglvnd (1.0.0-2) UNRELEASED; urgency=medium + + * Use source format 3.0 (quilt). + + -- Andreas Beckmann <a...@debian.org> Sat, 25 Nov 2017 14:59:46 +0000 + libglvnd (1.0.0-1) unstable; urgency=high [ Andreas Boll ] diff --git a/debian/source/format b/debian/source/format index d3827e7..163aaf8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -1.0 +3.0 (quilt)