[Python-modules-commits] [python-social-auth] 01/02: Use dh_sphinxdoc to symlink static JS files in the documentation.

[Dmitry Shachnev]

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

mitya57 pushed a commit to branch master
in repository python-social-auth.

commit 0f004126ffa2cfce548bbec307f40be788e7ff4b
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Jun 1 14:01:33 2016 +0300

    Use dh_sphinxdoc to symlink static JS files in the documentation.
---
 debian/changelog                    | 5 +++--
 debian/control                      | 3 +--
 debian/python-social-auth-doc.links | 4 ----
 debian/rules                        | 4 +---
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index db26fc0..6b476df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,6 @@ python-social-auth (0.2.19+dfsg-1) unstable; urgency=medium
   * New upstream release.
   * Add newline at end of file for 'debian/source/options'.
   * Add 'python-social-auth-doc' binary package with HTML documentation:
-    - Add 'python-social-auth-doc.links' to symlink JavaScript files from
-    'libjs-sphinxdoc'.
     - Drop 'python-social-auth.docs' and 'python3-social-auth.docs'.
     - Register its documents with 'doc-base'.
   * Drop '0001-append-uncompressed-bootstrap-as-its-source.patch', as upstream
@@ -44,6 +42,9 @@ python-social-auth (0.2.19+dfsg-1) unstable; urgency=medium
     - Remove embedded JS files from documentation.
   * debian/watch: add 'dversionmangle' and 'repacksuffix' for '+dfsg' suffix.
 
+  [ Dmitry Shachnev ]
+  * Use dh_sphinxdoc to symlink static JS files in the documentation.
+
  -- Tiago Ilieve <tiago.myhro at gmail.com>  Mon, 30 May 2016 02:37:33 -0300
 
 python-social-auth (0.2.13-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 0001f70..700b6a4 100644
--- a/debian/control
+++ b/debian/control
@@ -51,8 +51,7 @@ Description: Python social authentication made simple (Python 3)
 Package: python-social-auth-doc
 Section: doc
 Architecture: all
-Depends: libjs-sphinxdoc,
-         ${misc:Depends},
+Depends: ${misc:Depends},
          ${sphinxdoc:Depends}
 Description: Python social authentication made simple (Documentation)
  Python Social Auth is an easy-to-setup social authentication/registration
diff --git a/debian/python-social-auth-doc.links b/debian/python-social-auth-doc.links
deleted file mode 100644
index c3958ff..0000000
--- a/debian/python-social-auth-doc.links
+++ /dev/null
@@ -1,4 +0,0 @@
-/usr/share/javascript/sphinxdoc/1.0/doctools.js /usr/share/doc/python-social-auth-doc/html/_static/doctools.js
-/usr/share/javascript/sphinxdoc/1.0/jquery.js /usr/share/doc/python-social-auth-doc/html/_static/jquery.js
-/usr/share/javascript/sphinxdoc/1.0/searchtools.js /usr/share/doc/python-social-auth-doc/html/_static/searchtools.js
-/usr/share/javascript/sphinxdoc/1.0/underscore.js /usr/share/doc/python-social-auth-doc/html/_static/underscore.js
diff --git a/debian/rules b/debian/rules
index dcb734d..943fb92 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,10 +10,8 @@ export http_proxy = http://127.0.9.1:9
 export https_proxy = https://127.0.9.1:9
 
 %:
-	dh $@ --with python2,python3 --buildsystem=pybuild
+	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
 override_dh_auto_build:
 	dh_auto_build
 	cd docs/ ; $(MAKE) html
-	# Remove JS files that will be symlinked from 'libjs-sphinxdoc':
-	cd docs/_build/html/_static/ ; rm doctools.js jquery.js searchtools.js underscore.js

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-social-auth.git