[forge] 09/14: change version to 0.9.2-1 (UNRELEASED) Switch to git-dpm. New upstream release. Drop patch Fix-build-of-examples-with-the-system-cl2hpp.patch, applied upstream. New patch No-version-queries-with-Git.patch, avoid spurious "git not found" entries in the build log when the documentation is generated.
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Wed Dec 21 19:36:13 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository forge.
commit f6adb0a1642d8d70a93b915de72e2449a51cfa69
Merge: 0e7ebe7 9d545fd
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Wed Dec 21 18:40:43 2016 +0000
change version to 0.9.2-1 (UNRELEASED)
Switch to git-dpm.
New upstream release.
Drop patch Fix-build-of-examples-with-the-system-cl2hpp.patch, applied
upstream.
New patch No-version-queries-with-Git.patch, avoid spurious "git not
found" entries in the build log when the documentation is generated.
CMakeModules/FindFontConfig.cmake | 20 +-
CMakeModules/Version.cmake | 2 +-
debian/.git-dpm | 6 +-
debian/changelog | 11 +
debian/patches/0001-Use-system-MathJax.patch | 4 +-
...-build-of-examples-with-the-system-cl2hpp.patch | 35 -
.../patches/0002-No-version-queries-with-Git.patch | 22 +
debian/patches/series | 2 +-
docs/doxygen.mk | 2 +-
docs/images/gfx_palette.png | Bin 84784 -> 0 bytes
examples/cpu/surface.cpp | 16 +-
include/fg/chart.h | 33 +-
include/fg/defines.h | 20 +-
src/api/c/chart.cpp | 22 +
src/api/cpp/chart.cpp | 18 +
src/backend/chart.hpp | 6 +
src/backend/cmap.hpp | 2980 ++++++++++++++------
src/backend/opengl/chart_impl.cpp | 26 +-
src/backend/opengl/chart_impl.hpp | 4 +
src/backend/opengl/colormap_impl.cpp | 136 +-
src/backend/opengl/colormap_impl.hpp | 34 +-
src/backend/opengl/common.cpp | 1 -
src/backend/opengl/font_atlas_impl.hpp | 4 +-
src/backend/opengl/surface_impl.cpp | 108 +-
src/backend/opengl/window_impl.cpp | 37 +-
25 files changed, 2450 insertions(+), 1099 deletions(-)
diff --cc debian/.git-dpm
index e2efe57,0000000..9df7683
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- 623f75eea36c34d4092f8f34242cc1431e09536c
- 623f75eea36c34d4092f8f34242cc1431e09536c
- 5a0b1e32150fb3501b34f23323007a30943f78d6
++9d545fd0f27ad2f403e2d1e2c55268cabf64f45d
++9d545fd0f27ad2f403e2d1e2c55268cabf64f45d
++d3ade76f38b23a7f20f2df9a4cf01cc59a7bb40f
+d3ade76f38b23a7f20f2df9a4cf01cc59a7bb40f
+forge_0.9.2.orig.tar.gz
+dfea07522a1c8fb622b83fd2bcfe5924f73bd90c
+735452
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index 05d7b88,0000000..a85bc5f
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,0 +1,25 @@@
++forge (0.9.2-1) UNRELEASED; urgency=medium
++
++ * Switch to git-dpm.
++ * New upstream release.
++ * Drop patch Fix-build-of-examples-with-the-system-cl2hpp.patch, applied
++ upstream.
++ * New patch No-version-queries-with-Git.patch, avoid spurious "git not
++ found" entries in the build log when the documentation is generated.
++
++ -- Ghislain Antony Vaillant <ghisvail at gmail.com> Wed, 21 Dec 2016 18:40:43 +0000
++
+forge (0.9.0-2) unstable; urgency=medium
+
+ * Update patch queue.
+ - Refresh Use-system-MathJax.patch.
+ - New patch Fix-build-of-examples-with-the-system-cl2hpp.patch.
+ * Add packaging testsuite.
+
+ -- Ghislain Antony Vaillant <ghisvail at gmail.com> Tue, 06 Dec 2016 19:37:43 +0000
+
+forge (0.9.0-1) unstable; urgency=low
+
+ * Initial release. (Closes: #834723)
+
+ -- Ghislain Antony Vaillant <ghisvail at gmail.com> Wed, 14 Sep 2016 00:25:40 +0100
diff --cc debian/patches/0001-Use-system-MathJax.patch
index 1c3ca14,0000000..8dc6607
mode 100644,000000..100644
--- a/debian/patches/0001-Use-system-MathJax.patch
+++ b/debian/patches/0001-Use-system-MathJax.patch
@@@ -1,22 -1,0 +1,22 @@@
- From 881c8d72bec681e5f9f9c62c3b06cd4a36f0d85b Mon Sep 17 00:00:00 2001
++From 5a8c79948706034862341b2f1f7ef971075f8c93 Mon Sep 17 00:00:00 2001
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Wed, 24 Aug 2016 11:23:13 +0100
- Subject: Use system MathJax.
++Subject: Use system MathJax
+
+---
+ docs/doxygen.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/doxygen.mk b/docs/doxygen.mk
+index 44a5e8a..4f2ddf0 100644
+--- a/docs/doxygen.mk
++++ b/docs/doxygen.mk
+@@ -1452,7 +1452,7 @@ MATHJAX_FORMAT = HTML-CSS
+ # The default value is: http://cdn.mathjax.org/mathjax/latest.
+ # This tag requires that the tag USE_MATHJAX is set to YES.
+
+-MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
++MATHJAX_RELPATH = /usr/share/javascript/mathjax
+
+ # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+ # extension names that should be enabled during MathJax rendering. For example
diff --cc debian/patches/0002-No-version-queries-with-Git.patch
index 0000000,0000000..257fd84
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-No-version-queries-with-Git.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 9d545fd0f27ad2f403e2d1e2c55268cabf64f45d Mon Sep 17 00:00:00 2001
++From: Ghislain Antony Vaillant <ghisvail at gmail.com>
++Date: Wed, 21 Dec 2016 17:42:21 +0000
++Subject: No version queries with Git
++
++---
++ docs/doxygen.mk | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/docs/doxygen.mk b/docs/doxygen.mk
++index 4f2ddf0..6dd5edd 100644
++--- a/docs/doxygen.mk
+++++ b/docs/doxygen.mk
++@@ -663,7 +663,7 @@ SHOW_NAMESPACES = YES
++ # by doxygen. Whatever the program writes to standard output is used as the file
++ # version. For an example see the documentation.
++
++-FILE_VERSION_FILTER = "/bin/sh -c 'git log --pretty=\"format:%ci, (build %h)\" -1' \"${1}\""
+++FILE_VERSION_FILTER =
++
++ # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
++ # by doxygen. The layout file controls the global structure of the generated
diff --cc debian/patches/series
index 147eef7,0000000..ff8bed8
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,2 @@@
+0001-Use-system-MathJax.patch
- 0002-Fix-build-of-examples-with-the-system-cl2hpp.patch
++0002-No-version-queries-with-Git.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/forge.git
More information about the debian-science-commits
mailing list