[hkl] 07/22: fix the build-dep and compilation

[Frédéric-Emmanuel Picca]

This is an automated email from the git hooks/post-receive script.

picca pushed a commit to branch experimental
in repository hkl.

commit 1e43f9b52583f65bdfe5b2080ae629156ae4eb87
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Fri Jan 30 13:37:36 2015 +0100

    fix the build-dep and compilation
---
 debian/changelog                                   | 28 ++++++++++-------
 debian/control                                     |  7 +++--
 .../0001-fix-compilation-with-matplotlib.patch     | 35 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f66f489..6d8265e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,17 +7,23 @@ hkl (4.99.99.1892-1~exp1) UNRELEASED; urgency=low
     - New binary packages, libhkl5, gir1.2-hkl-5.0
     - Deleted binary package, libhkl4
     - Build-Depends:
-      + dh-autoreconf (added)
-      + emacs (added)
-      + gobject-introspection (added)
-      + gtk-doc-tools (added)
-      + libbullet-dev (added)
-      + libg3d-dev (added)
-      + libgirepository1.0-dev (added)
-      + libyaml-dev (added)
-      + python-gi (added)
-      + python-matplotlib (added)
-      - libgtkmm-1.2-dev (deleted)
+      - added:
+        + dh-autoreconf
+        + emacs
+        + gobject-introspection
+        + gtk-doc-tools
+        + libbullet-dev
+        + libg3d-dev
+        + libg3d-plugins,
+        + libgirepository1.0-dev
+        + libgtk2.0-dev
+        + libgtkglext1-dev
+        + libyaml-dev
+        + python-gi
+        + python-matplotlib
+        + python-tk
+      - deleted:
+        - libgtkmm-1.2-dev
 
  -- Picca Frédéric-Emmanuel <picca at debian.org>  Fri, 31 Jan 2015 10:22:27 +0200
 
diff --git a/debian/control b/debian/control
index 1950e07..9ed89e2 100644
--- a/debian/control
+++ b/debian/control
@@ -10,12 +10,15 @@ Build-Depends: debhelper (>= 8.0.0),
                gtk-doc-tools,
                libbullet-dev,
                libg3d-dev,
-               libgsl0-dev,
+               libg3d-plugins,
                libgirepository1.0-dev,
+               libgsl0-dev,
                libgtk2.0-dev,
+               libgtkglext1-dev,
                libyaml-dev,
                python-gi,
-               python-matplotlib
+               python-matplotlib,
+	       python-tk
 Standards-Version: 3.9.6
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/hkl.git
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/hkl.git
diff --git a/debian/patches/0001-fix-compilation-with-matplotlib.patch b/debian/patches/0001-fix-compilation-with-matplotlib.patch
new file mode 100644
index 0000000..0dd6dad
--- /dev/null
+++ b/debian/patches/0001-fix-compilation-with-matplotlib.patch
@@ -0,0 +1,35 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Fri, 30 Jan 2015 12:07:24 +0100
+Subject: fix compilation with matplotlib
+
+---
+ Documentation/sphinx/source/pyplots/trajectory_full.py   | 2 ++
+ Documentation/sphinx/source/pyplots/trajectory_simple.py | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/Documentation/sphinx/source/pyplots/trajectory_full.py b/Documentation/sphinx/source/pyplots/trajectory_full.py
+index b8827a4..367151d 100755
+--- a/Documentation/sphinx/source/pyplots/trajectory_full.py
++++ b/Documentation/sphinx/source/pyplots/trajectory_full.py
+@@ -4,6 +4,8 @@
+ import math
+ import numpy
+ 
++import matplotlib
++matplotlib.use('Agg')
+ import matplotlib.pyplot as plt
+ 
+ from gi.repository import GLib
+diff --git a/Documentation/sphinx/source/pyplots/trajectory_simple.py b/Documentation/sphinx/source/pyplots/trajectory_simple.py
+index 21e1e2d..2d3e8be 100755
+--- a/Documentation/sphinx/source/pyplots/trajectory_simple.py
++++ b/Documentation/sphinx/source/pyplots/trajectory_simple.py
+@@ -4,6 +4,8 @@
+ import math
+ import numpy
+ 
++import matplotlib
++matplotlib.use('Agg')
+ import matplotlib.pyplot as plt
+ 
+ from gi.repository import GLib
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..61ff2b1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-fix-compilation-with-matplotlib.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/hkl.git