[python-xrayutilities] 03/03: Update to upstream version 1.2.0

[Eugen Wintersberger]

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

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

commit ad38e29b654286143471b81155762a9226154381
Author: Eugen Wintersberger <eugen.wintersberger at gmail.com>
Date:   Sun Aug 16 16:41:34 2015 +0200

    Update to upstream version 1.2.0
---
 debian/changelog                                     |  2 +-
 ...he-logo_only-option-from-the-documentation-.patch |  4 ++--
 ...Removed-mathjax-extension-from-sphinx-build.patch | 20 --------------------
 debian/patches/series                                |  1 -
 4 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 567623e..e60aa02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-xrayutilities (1.1.2-1) UNRELEASED; urgency=low
+python-xrayutilities (1.2.0-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #723017)
 
diff --git a/debian/patches/0001-Removed-the-logo_only-option-from-the-documentation-.patch b/debian/patches/0001-Removed-the-logo_only-option-from-the-documentation-.patch
index 3bd58dc..0bc2fa8 100644
--- a/debian/patches/0001-Removed-the-logo_only-option-from-the-documentation-.patch
+++ b/debian/patches/0001-Removed-the-logo_only-option-from-the-documentation-.patch
@@ -7,10 +7,10 @@ Subject: Removed the logo_only option from the documentation build
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/doc/source/conf.py b/doc/source/conf.py
-index f71467c..6c68735 100644
+index 8271825..3c7f510 100644
 --- a/doc/source/conf.py
 +++ b/doc/source/conf.py
-@@ -110,7 +110,7 @@ html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+@@ -109,7 +109,7 @@ html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
  # Theme options are theme-specific and customize the look and feel of a theme
  # further.  For a list of options available for each theme, see the
  # documentation.
diff --git a/debian/patches/0002-Removed-mathjax-extension-from-sphinx-build.patch b/debian/patches/0002-Removed-mathjax-extension-from-sphinx-build.patch
deleted file mode 100644
index e8a4674..0000000
--- a/debian/patches/0002-Removed-mathjax-extension-from-sphinx-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Eugen Wintersberger <eugen.wintersberger at gmail.com>
-Date: Sat, 25 Apr 2015 22:00:14 +0200
-Subject: Removed mathjax extension from sphinx build
-
----
- doc/source/conf.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 6c68735..a09eca5 100644
---- a/doc/source/conf.py
-+++ b/doc/source/conf.py
-@@ -35,7 +35,6 @@ extensions = [
-     'sphinx.ext.todo',
-     'sphinx.ext.coverage',
-     'sphinx.ext.pngmath',
--    'sphinx.ext.mathjax',
-     'sphinx.ext.viewcode',
-     'rst2pdf.pdfbuilder']
- 
diff --git a/debian/patches/series b/debian/patches/series
index 6f65ac6..c491fa1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-Removed-the-logo_only-option-from-the-documentation-.patch
-0002-Removed-mathjax-extension-from-sphinx-build.patch

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