summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-02-24 16:34:40 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-02-24 16:35:18 +0000
commit8688db2f09928d576a26fc98da3546b5f9feaeea (patch)
treed1af9fa671063ae692d7a4728116e8cf20efeb36
parentReleasing progress-linux version 0.1.0-2~dschinn1. (diff)
downloadlibgltf-8688db2f09928d576a26fc98da3546b5f9feaeea.zip
libgltf-8688db2f09928d576a26fc98da3546b5f9feaeea.tar.xz
Merging debian version 0.1.0-3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog8
-rw-r--r--debian/control5
-rw-r--r--debian/patches/glm-0.9.9.diff12
-rw-r--r--debian/patches/series1
4 files changed, 24 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index d283fba..43d22e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libgltf (0.1.0-3) unstable; urgency=medium
+
+ * fix build with glm 0.9.9 by defining -DGLM_ENABLE_EXPERIMENTAL in
+ GLM_CFLAGS (closes: #888930)
+ * set Maintainer to Debian QA Group <packages@qa.debian.org>
+
+ -- Rene Engelhard <rene@debian.org> Mon, 05 Feb 2018 21:05:03 +0000
+
libgltf (0.1.0-2~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 7ee5faf..b9588a0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,7 @@ Source: libgltf
Priority: optional
Maintainer: Progress Linux Maintainers <maintainers@lists.progress-linux.org>
XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org>
-XSBC-Original-Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
-XSBC-Original-Uploaders: Rene Engelhard <rene@debian.org>
+XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
Bugs: mailto:maintainers@lists.progress-linux.org
Build-Depends: debhelper (>= 10), dh-autoreconf, libboost-dev, libglm-dev, libepoxy-dev (>= 1.3.1), pkg-config
# , libcppunit-dev, libpng-dev, libgl1-mesa-dev, libx11-dev
@@ -11,6 +10,8 @@ Standards-Version: 3.9.5
Section: libs
Vcs-Browser: https://sources.progress-linux.org/distributions/dschinn-backports/packages/libgltf
Vcs-Git: https://sources.progress-linux.org/distributions/dschinn-backports/packages/libgltf
+XSBC-Original-Vcs-Git: https://salsa.debian.org/debian/libgltf.git
+XSBC-Original-Vcs-Browser: https://salsa.debian.org/debian/libgltf
Package: libgltf-dev
Section: libdevel
diff --git a/debian/patches/glm-0.9.9.diff b/debian/patches/glm-0.9.9.diff
new file mode 100644
index 0000000..51eefdd
--- /dev/null
+++ b/debian/patches/glm-0.9.9.diff
@@ -0,0 +1,12 @@
+diff --git a/configure.ac b/configure.ac
+index e9d5020..7a4cb1e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -64,6 +64,7 @@ AC_SUBST([EPOXY_LIBS])
+ # =========
+ AC_LANG_PUSH([C++])
+ save_CPPFLAGS=$CPPFLAGS
++GLM_CFLAGS="$GLM_CFLAGS -DGLM_ENABLE_EXPERIMENTAL"
+ CPPFLAGS="$CPPFLAGS $GLM_CFLAGS"
+ AC_CHECK_HEADERS(
+ glm/glm.hpp \
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e5d730a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+glm-0.9.9.diff