[cylc] 11/11: Use debian cherrypy and markupsafe pkgs

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository cylc.

commit b3975672c9350e95c0d3b30f16a08fe803820f74
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Jul 19 12:29:32 2017 +0100

    Use debian cherrypy and markupsafe pkgs
---
 debian/control           | 2 +-
 debian/rules             | 4 +++-
 lib/cherrypy/__main__.py | 0
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 6acb2f8..7c4feca 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Build-Conflicts: cylc
 Build-Depends: debhelper (>= 10), dh-python, python-all-dev, 
  python-pygraphviz, pyro, python-jinja2, 
  texlive-latex-extra, texlive-fonts-recommended, lmodern, tex4ht, imagemagick, sqlite3,
- tex-gyre, python-gtk2
+ tex-gyre, python-gtk2, python-markupsafe, python-cherrypy3
 Standards-Version: 4.0.0
 Homepage: http://cylc.github.io/cylc
 Vcs-Git: git://git.debian.org/git/debian-science/packages/cylc.git
diff --git a/debian/rules b/debian/rules
index 2952a21..41101cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,8 +30,10 @@ override_dh_auto_install:
 	install -m 0644 images/icon.png $(CURDIR)/debian/cylc/usr/share/pixmaps/cylc.png
 
 override_dh_fixperms:
-	# Delete after install. Use Pyro package instead.
+	# Delete after install. Use packages instead.
 	rm -rf debian/python-cylc/usr/lib/python2.7/dist-packages/Pyro
+	rm -rf debian/python-cylc/usr/lib/python2.7/dist-packages/cherrypy
+	rm -rf debian/python-cylc/usr/lib/python2.7/dist-packages/markupsafe
 	dh_fixperms
 	
 override_dh_auto_clean:
diff --git a/lib/cherrypy/__main__.py b/lib/cherrypy/__main__.py
old mode 100755
new mode 100644

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