[sagemath] 02/04: pruner: include m4's in configure.ac, don't check for sglalchemy, run pruner from debian/rules.

[Tobias Hansen]

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

thansen pushed a commit to branch master
in repository sagemath.

commit d957eede1df615bc5b38f2be9a3f87956cffbd1d
Author: Tobias Hansen <tobias.han at gmx.de>
Date:   Thu Feb 5 00:20:35 2015 +0100

    pruner: include m4's in configure.ac, don't check for sglalchemy, run pruner from debian/rules.
---
 debian/pruner/configure.ac | 3 +++
 debian/pruner/pruner.py.in | 2 +-
 debian/rules               | 5 +++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/pruner/configure.ac b/debian/pruner/configure.ac
index 26d51cf..b6237b7 100644
--- a/debian/pruner/configure.ac
+++ b/debian/pruner/configure.ac
@@ -1,5 +1,8 @@
 AC_INIT()
 
+m4_include([/usr/share/aclocal/pkg.m4])
+m4_include([m4/python_module.m4])
+
 AC_ARG_WITH([sage-root],
             [  --with-sage-root=<path> path to where sage is unpacked],
 	    [SAGE_ROOT="$withval"],
diff --git a/debian/pruner/pruner.py.in b/debian/pruner/pruner.py.in
index 560af50..a3453b7 100644
--- a/debian/pruner/pruner.py.in
+++ b/debian/pruner/pruner.py.in
@@ -117,7 +117,7 @@ dico = {
     'singular': @HAS_SINGULAR@,
     'six': @HAS_SIX@,
     'sphinx': @HAS_SPHINX@,
-    'sqlalchemy': @HAS_SQLALCHEMY@,
+    #'sqlalchemy': @HAS_SQLALCHEMY@,
     'sqlite': @HAS_SQLITE@,
     'symmetrica': @HAS_SYMMETRICA@,
     'sympow': @HAS_SYMPOW@,
diff --git a/debian/rules b/debian/rules
index 4f3db01..16eff5e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,11 @@ VERSION := $(shell dpkg-parsechangelog | grep -x "Version:.*" | sed 's at Version:
 %:
 	dh $@ --builddirectory=sage
 
+override_dh_auto_configure:
+	cd debian/pruner && autoconf
+	debian/pruner/configure --with-sage-root="$(shell pwd)/sage"
+	cd sage && python ../pruner.py
+
 override_dh_auto_build:
 
 override_dh_auto_install:

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