[python-shapely] 13/14: Don't use dh_link for mathjax symlink, breaks dh_sphinxdoc.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Fri Aug 28 14:21:45 UTC 2015


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

sebastic pushed a commit to branch master
in repository python-shapely.

commit 02b55d148bcc39107e0698a1dd3ae98168ec9b38
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Aug 28 16:01:51 2015 +0200

    Don't use dh_link for mathjax symlink, breaks dh_sphinxdoc.
    
    This reverts commit 131ecbbf6e11571b9d592e9dc3a000825ab7af4e.
    
    Conflicts:
    	debian/changelog
---
 debian/changelog                | 2 +-
 debian/python-shapely-doc.links | 1 -
 debian/rules                    | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ea18c4e..94fd5a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,10 +8,10 @@ python-shapely (1.5.12-1) UNRELEASED; urgency=medium
     - Change CC-BY shortname to CC-BY-3.0
     - Add license & copyright for ftools.py
   * Use dh_clean for additional file removals.
-  * Use dh_link for mathjax symlink.
   * Refresh patches.
   * Bump minimum required libgeos-dev to 3.3.0.
   * Add doc-base registration for Shapely documentation.
+  * Use dh_clean for additional file removals.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 28 Aug 2015 15:02:37 +0200
 
diff --git a/debian/python-shapely-doc.links b/debian/python-shapely-doc.links
deleted file mode 100644
index f6c7281..0000000
--- a/debian/python-shapely-doc.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/javascript/mathjax usr/share/doc/python-shapely-doc/html/_static/mathjax
diff --git a/debian/rules b/debian/rules
index a17e1e9..9b10617 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,4 +30,4 @@ override_dh_auto_build:
 	rm -f shapely/speedups/_speedups.c
 	dh_auto_build
 	python setup.py build_sphinx
-
+	ln -s /usr/share/javascript/mathjax build/sphinx/html/_static/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git



More information about the Pkg-grass-devel mailing list