[python-xrayutilities] 02/02: Updated to upstream version 1.0.3

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch master
in repository python-xrayutilities.

commit e5c3b405bd903219122df84faca04e3106973c4c
Author: Eugen Wintersberger <eugen.wintersberger at gmail.com>
Date:   Sun Oct 27 11:47:51 2013 +0100

    Updated to upstream version 1.0.3
    
    Could not reproduce the lintina warning Frederic saw on a testing image with
    pbuilder. We may need further investigation on this issue.
    
    The database issue still remains but should not be critical. It might come from
    the fact that when sphinx is importing the modules the database files are not
    available.
---
 debian/changelog                                   |    2 +-
 ...eature-forwarded-add-the-build_doc-target.patch |   64 --------------------
 debian/patches/series                              |    1 -
 debian/rules                                       |    2 +-
 4 files changed, 2 insertions(+), 67 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dab9baa..11bda06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-xrayutilities (1.0.2-1) unstable; urgency=low
+python-xrayutilities (1.0.3-1) unstable; urgency=low
 
   * Initial release. (Closes: #723017)
 
diff --git a/debian/patches/0001-feature-forwarded-add-the-build_doc-target.patch b/debian/patches/0001-feature-forwarded-add-the-build_doc-target.patch
deleted file mode 100644
index a6221eb..0000000
--- a/debian/patches/0001-feature-forwarded-add-the-build_doc-target.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Sun, 20 Oct 2013 08:48:49 +0200
-Subject: feature forwarded add the build_doc target
-
----
- setup.py | 31 ++++++++++++++++++++++++++++++-
- 1 file changed, 30 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 556ac85..7376d5f 100644
---- a/setup.py
-+++ b/setup.py
-@@ -64,6 +64,8 @@ class build_ext_subclass( build_ext ):
-                 e.extra_link_args = lopt[ c ]
-         build_ext.build_extensions(self)
- 
-+cmdclass = {'build_ext': build_ext_subclass}
-+
- with open('README.txt') as f:
-     long_description = f.read()
- 
-@@ -76,6 +78,33 @@ extmodul = Extension('xrayutilities.cxrayutilities',
-                                 os.path.join('xrayutilities','src','gridder3d.c')],
-                      define_macros = user_macros)
- 
-+try:
-+    import sphinx
-+    import sys
-+
-+    from sphinx.setup_command import BuildDoc
-+
-+    class build_doc(BuildDoc):
-+        def run(self):
-+            # make sure the python path is pointing to the newly built
-+            # code so that the documentation is built on this and not a
-+            # previously installed version
-+            build = self.get_finalized_command('build')
-+            sys.path.insert(0, os.path.abspath(build.build_lib))
-+            try:
-+                sphinx.setup_command.BuildDoc.run(self)
-+            except UnicodeDecodeError:
-+                print("ERROR: unable to build documentation"
-+                      " because Sphinx do not handle"
-+                      " source path with non-ASCII characters. Please"
-+                      " try to move the source package to another"
-+                      " location (path with *only* ASCII characters)")
-+            sys.path.pop(0)
-+
-+    cmdclass['build_doc'] = build_doc
-+except ImportError:
-+    pass
-+
- setup(name="xrayutilities",
-       version="1.0.2",
-       author="Eugen Wintersberger, Dominik Kriegner",
-@@ -96,7 +125,7 @@ setup(name="xrayutilities",
-       requires=['numpy','scipy','matplotlib','tables'],
-       include_dirs = [numpy.get_include()],
-       ext_modules = [extmodul],
--      cmdclass = {'build_ext': build_ext_subclass },
-+      cmdclass = cmdclass,
-       url="http://xrayutilities.sourceforge.net",
-       license="GPLv2",
-       script_args = args
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 73f56d4..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-feature-forwarded-add-the-build_doc-target.patch
diff --git a/debian/rules b/debian/rules
index 42f75cf..7572399 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,8 +19,8 @@ override_dh_auto_build-indep:
 	python setup.py build_doc
 
 override_dh_auto_install:
-	dh_auto_install
 	dh_numpy
+	dh_auto_install
 
 override_dh_install:
 	# Install everything excluding the *_d.so debug extensions to python-foo

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