[med-svn] [galaxy] 02/02: fix setup and config

[Olivier Sallou]

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

osallou pushed a commit to branch master
in repository galaxy.

commit 115dab7c4cedb43bb154eeac7218e0d6da2d4853
Author: Olivier Sallou <osallou at debian.org>
Date:   Sun Jan 15 13:54:56 2017 +0000

    fix setup and config
---
 debian/control        |  2 ++
 debian/galaxy.install |  5 ++---
 debian/rules          | 10 +++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index 6a525ce..c926167 100644
--- a/debian/control
+++ b/debian/control
@@ -62,6 +62,8 @@ Package: galaxy
 Architecture: all
 Depends: ${misc:Depends},
          ${perl:Depends},
+         ${python:Depends},
+               python,
                python-docutils,
                python-markupsafe,
                python-yaml,
diff --git a/debian/galaxy.install b/debian/galaxy.install
index b132c04..bdfedc4 100644
--- a/debian/galaxy.install
+++ b/debian/galaxy.install
@@ -4,13 +4,12 @@ scripts usr/share/galaxy
 templates usr/share/galaxy
 tools var/lib/galaxy
 tool-data var/lib/galaxy
-config/*.xml etc/galaxy/config
-config/*.sample etc/galaxy/config
+config/*.xml* etc/galaxy/config
+config/*.ini* etc/galaxy/config
 config/plugins usr/share/galaxy
 database var/lib/galaxy
 locale usr/share/galaxy
 *.sh usr/share/galaxy
-integrated_tool_panel.xml etc/galaxy
 openid usr/share/galaxy
 static usr/share/galaxy
 lib usr/share/galaxy
diff --git a/debian/rules b/debian/rules
index 84c7585..9e8a228 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,14 +27,14 @@ override_dh_install:
 	cp debian/galaxy-run.sh debian/galaxy/usr/bin/galaxy-run.sh
 	dh_install
 	sed -i "s;config/plugin;plugin;g" debian/galaxy/etc/galaxy/config/galaxy.ini.sample
-	sed -i "s;#visualization_plugins_directory;visualization_plugins_directory/g" debian/galaxy/etc/galaxy/config/galaxy.ini.sample
-	sed -i "s;#interactive_environment_plugins_directory;interactive_environment_plugins_directory/g" debian/galaxy/etc/galaxy/config/galaxy.ini.sample
-	sed -i "s;#tour_config_dir;tour_config_dir/g" debian/galaxy/etc/galaxy/config/galaxy.ini.sample
-	sed -i "s;#webhooks_dir;webhook_dir/g" debian/galaxy/etc/galaxy/config/galaxy.ini.sample
+	sed -i "s;#visualization_plugins_directory;visualization_plugins_directory;g" debian/galaxy/etc/galaxy/config/galaxy.ini.sample
+	sed -i "s;#interactive_environment_plugins_directory;interactive_environment_plugins_directory;g" debian/galaxy/etc/galaxy/config/galaxy.ini.sample
+	sed -i "s;#tour_config_dir;tour_config_dir;g" debian/galaxy/etc/galaxy/config/galaxy.ini.sample
+	sed -i "s;#webhooks_dir;webhook_dir;g" debian/galaxy/etc/galaxy/config/galaxy.ini.sample
 	find debian/galaxy -type f -name *.pyc | xargs rm -f
 
 override_dh_auto_build:
 	echo "skip make, nothing todo"
 
-override_auto_tests:
+override_auto_test:
 	./run_tests.sh --skip-venv  --unit test/unit

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/galaxy.git