[Python-modules-commits] [python-djvulibre] 04/04: deb/rules: build_ext inplace for Sphinx docs

[Daniel Stender]

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

danstender-guest pushed a commit to branch master
in repository python-djvulibre.

commit 9ab97735a6b62bda5d7b411130e6911781b0cb9a
Author: Daniel Stender <debian at danielstender.com>
Date:   Thu May 7 15:24:07 2015 +0200

    deb/rules: build_ext inplace for Sphinx docs
---
 debian/changelog                        |  4 +++-
 debian/clean                            |  2 ++
 debian/patches/series                   |  1 -
 debian/patches/sphinx-modules-path.diff | 16 ----------------
 debian/rules                            |  1 +
 5 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d98645e..d99bc37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ python-djvulibre (0.3.10-2) UNRELEASED; urgency=medium
     + added override for dh_strip (Closes: #775657).
     + dropped nodocs build option check (obsolete) and destdir export
       (not needed here).
+    + build_ext once more inplace for Sphinx docs (with that, dropped
+      sphinx-modules-path.diff, added deb/clean).
 
- -- Daniel Stender <debian at danielstender.com>  Thu, 07 May 2015 12:36:39 +0200
+ -- Daniel Stender <debian at danielstender.com>  Thu, 07 May 2015 15:37:24 +0200
 
 python-djvulibre (0.3.10-1) unstable; urgency=medium
 
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..27890c1
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+djvu/decode.so
+djvu/sexpr.so
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a1765ae..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-sphinx-modules-path.diff
diff --git a/debian/patches/sphinx-modules-path.diff b/debian/patches/sphinx-modules-path.diff
deleted file mode 100644
index da30554..0000000
--- a/debian/patches/sphinx-modules-path.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: fix module import path for sphinx_build
-Author: Daniel Stender <debian at danielstender.com>
-Forwarded: not-needed
-Last-Update: 2015-01-22
-
---- a/setup.py
-+++ b/setup.py
-@@ -212,7 +212,7 @@
-             # the extension modules. Prepend the directory that build_ext would
-             # use instead.
-             build_ext = self.get_finalized_command('build_ext')
--            sys.path[:0] = [build_ext.build_lib]
-+            sys.path[:0] = ['debian/python-djvu/usr/lib/python2.7/dist-packages']
-             for ext in ext_modules:
-                 __import__('djvu.' + ext)
-             del sys.path[0]
diff --git a/debian/rules b/debian/rules
index e42fb32..09234a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,7 @@ override_dh_install:
 	rm -r debian/python*-djvu/usr/lib/python*/dist-packages/djvu/dllpath.py
 
 override_dh_installdocs:
+	python setup.py build_ext -i
 	http_proxy='127.0.0.1:9' python setup.py build_sphinx
 	dh_installdocs -Xobjects.inv -A doc/credits.txt
 

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