[Python-apps-commits] r11776 - in packages/pylint/trunk/debian (5 files)

[morph at users.alioth.debian.org]

    Date: Sunday, March 1, 2015 @ 12:53:27
  Author: morph
Revision: 11776

* debian/{patches/build_doc.patch, rules}
  - use the built code instead of the system-wide to build doc

Added:
  packages/pylint/trunk/debian/patches/
  packages/pylint/trunk/debian/patches/build_doc.patch
  packages/pylint/trunk/debian/patches/series
Modified:
  packages/pylint/trunk/debian/changelog
  packages/pylint/trunk/debian/rules

Modified: packages/pylint/trunk/debian/changelog
===================================================================
--- packages/pylint/trunk/debian/changelog	2015-02-28 23:12:37 UTC (rev 11775)
+++ packages/pylint/trunk/debian/changelog	2015-03-01 12:53:27 UTC (rev 11776)
@@ -2,8 +2,10 @@
 
   * Provide py3k package, adapted from Ubuntu packaging; Closes: #606165
   * build doc at build time and provide a -doc package
+  * debian/{patches/build_doc.patch, rules}
+    - use the built code instead of the system-wide to build doc
 
- -- Sandro Tosi <morph at debian.org>  Sat, 28 Feb 2015 23:11:31 +0000
+ -- Sandro Tosi <morph at debian.org>  Sun, 01 Mar 2015 12:52:51 +0000
 
 pylint (1.4.1-1) experimental; urgency=medium
 

Added: packages/pylint/trunk/debian/patches/build_doc.patch
===================================================================
--- packages/pylint/trunk/debian/patches/build_doc.patch	                        (rev 0)
+++ packages/pylint/trunk/debian/patches/build_doc.patch	2015-03-01 12:53:27 UTC (rev 11776)
@@ -0,0 +1,26 @@
+Description: Make the doc buildable using the current checkout
+Author: Sandro Tosi <morph at debian.org>
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2015-03-01
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -6,6 +6,7 @@ SPHINXOPTS    =
+ SPHINXBUILD   = sphinx-build
+ PAPER         =
+ BUILDDIR      = _build
++PYTHONPATH    =
+ 
+ # Internal variables.
+ PAPEROPT_a4     = -D latex_paper_size=a4
+@@ -138,7 +139,7 @@ features:
+ 	echo "" >> features.rst
+ 	echo ".. generated by pylint --full-documentation" >> features.rst
+ 	echo "" >> features.rst
+-	pylint --full-documentation >> features.rst
++	PYTHONPATH=$(PYTHONPATH) pylint --full-documentation >> features.rst
+ 
+ gen-examples:
+ 	chmod u+w ../examples/pylintrc

Added: packages/pylint/trunk/debian/patches/series
===================================================================
--- packages/pylint/trunk/debian/patches/series	                        (rev 0)
+++ packages/pylint/trunk/debian/patches/series	2015-03-01 12:53:27 UTC (rev 11776)
@@ -0,0 +1 @@
+build_doc.patch

Modified: packages/pylint/trunk/debian/rules
===================================================================
--- packages/pylint/trunk/debian/rules	2015-02-28 23:12:37 UTC (rev 11775)
+++ packages/pylint/trunk/debian/rules	2015-03-01 12:53:27 UTC (rev 11776)
@@ -6,6 +6,8 @@
 PYVERS := $(shell pyversions -s -v)
 PYTHON2 := $(shell pyversions -s)
 PYTHON3 := $(shell py3versions -s)
+PY2LIB := $(shell python -c "from distutils.command.build import build ; from distutils.core import Distribution ; b = build(Distribution()) ; b.finalize_options() ; print b.build_purelib")
+PY2SCRIPT := $(shell python -c "from distutils.command.build import build ; from distutils.core import Distribution ; b = build(Distribution()) ; b.finalize_options() ; print b.build_scripts")
 
 %:
 	dh $@ --with python2,python3,sphinxdoc
@@ -16,7 +18,7 @@
 	for python in $(PYTHON2) $(PYTHON3) ; do \
 		NO_SETUPTOOLS=1 $$python setup.py build ; \
 	done
-	$(MAKE) -C doc html
+	PATH=$(CURDIR)/$(PY2SCRIPT):$$PATH $(MAKE) -C doc html PYTHONPATH=$(CURDIR)/$(PY2LIB)
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))