[Python-modules-commits] r29921 - in packages/nltk/trunk/debian (5 files)

[danstender-guest at users.alioth.debian.org]

    Date: Friday, July 25, 2014 @ 22:44:13
  Author: danstender-guest
Revision: 29921

transferred sphinx-apidoc/build calls to rules (saves patch)

Modified:
  packages/nltk/trunk/debian/changelog
  packages/nltk/trunk/debian/patches/series
  packages/nltk/trunk/debian/rules
  packages/nltk/trunk/debian/source/options
Deleted:
  packages/nltk/trunk/debian/patches/sphinx_buildir.diff

Modified: packages/nltk/trunk/debian/changelog
===================================================================
--- packages/nltk/trunk/debian/changelog	2014-07-25 21:09:57 UTC (rev 29920)
+++ packages/nltk/trunk/debian/changelog	2014-07-25 22:44:13 UTC (rev 29921)
@@ -2,4 +2,4 @@
 
   * Initial release (Closes: #279422, LP: #1155282).
 
- -- Daniel Stender <debian at danielstender.com>  Thu, 24 Jul 2014 11:12:30 +0200
+ -- Daniel Stender <debian at danielstender.com>  Sat, 26 Jul 2014 00:33:04 +0200

Modified: packages/nltk/trunk/debian/patches/series
===================================================================
--- packages/nltk/trunk/debian/patches/series	2014-07-25 21:09:57 UTC (rev 29920)
+++ packages/nltk/trunk/debian/patches/series	2014-07-25 22:44:13 UTC (rev 29921)
@@ -1,2 +1 @@
 fix_fsf_address.diff
-sphinx_buildir.diff

Deleted: packages/nltk/trunk/debian/patches/sphinx_buildir.diff
===================================================================
--- packages/nltk/trunk/debian/patches/sphinx_buildir.diff	2014-07-25 21:09:57 UTC (rev 29920)
+++ packages/nltk/trunk/debian/patches/sphinx_buildir.diff	2014-07-25 22:44:13 UTC (rev 29921)
@@ -1,16 +0,0 @@
-Description: change documentation build dir
-Author: Daniel Stender <debian at danielstender.com>
-Forwarded: not-needed
-Last-Update: 2014-07-24
-
---- a/web/Makefile
-+++ b/web/Makefile
-@@ -6,7 +6,7 @@ SPHINXOPTS    =
- SPHINXBUILD   = sphinx-build
- PAPER         =
- BUILDDIR      = _build
--WEB           = ../../nltk.github.com
-+WEB           = _build/html
- 
- # Internal variables.
- PAPEROPT_a4     = -D latex_paper_size=a4

Modified: packages/nltk/trunk/debian/rules
===================================================================
--- packages/nltk/trunk/debian/rules	2014-07-25 21:09:57 UTC (rev 29920)
+++ packages/nltk/trunk/debian/rules	2014-07-25 22:44:13 UTC (rev 29921)
@@ -11,12 +11,10 @@
 	rm -rf web/_build
 	dh_auto_clean
 
-override_dh_auto_install:
-	dh_auto_install
-	rm -rf debian/python*-nltk/usr/lib/python*/dist-packages/nltk/test
-
 override_dh_installdocs:
-	cd web && $(MAKE) without_api
+	sphinx-apidoc -o web/api nltk
+	rm -rf web/api/nltk.examples.rst # encoding related build break
+	sphinx-build -d web/_build/doctrees web/ web/_build/html
 	dh_installdocs
 	rm -fv debian/python-nltk-doc/usr/share/doc/python-nltk-doc/html/_static/jquery.js
 	ln -s /usr/share/javascript/jquery/jquery.js \

Modified: packages/nltk/trunk/debian/source/options
===================================================================
--- packages/nltk/trunk/debian/source/options	2014-07-25 21:09:57 UTC (rev 29920)
+++ packages/nltk/trunk/debian/source/options	2014-07-25 22:44:13 UTC (rev 29921)
@@ -1 +1 @@
-extend-diff-ignore="\.egg.info"
\ No newline at end of file
+extend-diff-ignore="\.egg.info|web/api"
\ No newline at end of file