[libvigraimpex] 05/07: updated some patches
Daniel Stender
danstender-guest at moszumanska.debian.org
Mon Jan 25 22:11:42 UTC 2016
This is an automated email from the git hooks/post-receive script.
danstender-guest pushed a commit to branch master
in repository libvigraimpex.
commit 4c3c7a35c193c92a6554f4cf9872baa071cdf670
Author: Daniel Stender <debian at danielstender.com>
Date: Mon Jan 25 17:24:57 2016 +0100
updated some patches
---
debian/changelog | 4 +-
debian/patches/docsrc-out-of-source.diff | 21 +++++-----
debian/patches/docsrc-paths.diff | 68 +++++++++++++++++++++-----------
debian/patches/removed-static-docs.diff | 14 +++----
4 files changed, 65 insertions(+), 42 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4cce912..e0dca16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,10 @@ libvigraimpex (0.10.0+git20160120.803d5d4-1) UNRELEASED; urgency=medium
* Dropped:
+ deb/*.dirs (obsolete)
+ off-by-on-in-exportImageAlpha.diff (applied upstream).
+ * Updated docsrc-out-of-source.diff, docsrc-paths.diff, and
+ removed-static-docs.diff.
- -- Daniel Stender <debian at danielstender.com> Mon, 25 Jan 2016 17:16:14 +0100
+ -- Daniel Stender <debian at danielstender.com> Mon, 25 Jan 2016 17:23:08 +0100
libvigraimpex (1.10.0+dfsg-11) unstable; urgency=medium
diff --git a/debian/patches/docsrc-out-of-source.diff b/debian/patches/docsrc-out-of-source.diff
index 4526faf..6a8dec8 100644
--- a/debian/patches/docsrc-out-of-source.diff
+++ b/debian/patches/docsrc-out-of-source.diff
@@ -1,18 +1,17 @@
Description: Add support for out-of-source documentation building.
Author: Jakub Wilk <jwilk at debian.org>
Forwarded: not-needed
-Last-Update: 2010-04-16
+Reviewed-by: Daniel Stender <debian at danielstender.com>
+Last-Update: 2016-01-24
-Index: b/docsrc/makeFunctionIndex.py
-===================================================================
--- a/docsrc/makeFunctionIndex.py
+++ b/docsrc/makeFunctionIndex.py
-@@ -139,7 +139,7 @@
- # crosslinking of vigranumpy documentation.
- # Note that '::' are not allowed in reStructuedText link names,
+@@ -144,7 +144,7 @@ generateFunctionIndex(functionList)
+ # Note that '::' are not allowed in reStructuedText link names,
# so we have to use '.' instead.
--replaces=open("../vigranumpy/docsrc/c_api_replaces.txt","w")
-+replaces=open("../../vigranumpy/docsrc/c_api_replaces.txt","w")
- for i in range(len(functionList)):
- functionName = functionList[i][1]
- overloadDisambiguation = functionList[i][2]
+ try:
+- replaces=open("../vigranumpy/docsrc/c_api_replaces.txt","w")
++ replaces=open("../../vigranumpy/docsrc/c_api_replaces.txt","w")
+ except IOError:
+ print("Cannot open the 'c_api_replaces.txt' file, skipping.")
+ else:
diff --git a/debian/patches/docsrc-paths.diff b/debian/patches/docsrc-paths.diff
index 1dd6233..f21c87b 100644
--- a/debian/patches/docsrc-paths.diff
+++ b/debian/patches/docsrc-paths.diff
@@ -2,35 +2,59 @@ Description: Fix hyperlinks from the C++ library documentation to python-vigra d
Bug-Debian: http://bugs.debian.org/590069
Bug-Debian: http://bugs.debian.org/590068
Forwarded: not-needed
-Last-Update: 2011-03-02
+Reviewed-by: Daniel Stender <debian at danielstender.com>
+Last-Update: 2016-01-24
-Index: b/docsrc/credits_changelog.dxx
-===================================================================
--- a/docsrc/credits_changelog.dxx
+++ b/docsrc/credits_changelog.dxx
@@ -43,7 +43,7 @@
also contributed his pLSA (probabilistic latent semantic analysis) implementation.
-
- <li> Nathan Huesken and Christoph Sommer helped a lot in developing
+
+ <li> Nathan Huesken and Christoph Sommer helped a lot in developing
- <a href="../vigranumpy/index.html">vigranumpy</a>, the VIGRA Python bindings.
+ <a href="/usr/share/doc/python-vigra-doc/html/index.html">vigranumpy</a>, the VIGRA Python bindings.
-
+
<li> Jens-Malte Gottfried contributed to the cmake-based build system.
-@@ -177,7 +177,7 @@
-
+@@ -146,7 +146,7 @@ Many thanks to all!
+ <b> Changes from Version 1.8.0 to 1.9.0</b>
+
+ <ul>
+- <li> Flexible incremental computation of image and region statistics via \ref FeatureAccumulators and corresponding Python bindings (see <a href="../vigranumpy/index.html#vigra.analysis.extractFeatures">vigra.analysis.extractFeatures()</a> and <a href="../vigranumpy/index.html#vigra.analysis.extractRegionFeatures">vigra.analysis.extractRegionFeatures()</a>).
++ <li> Flexible incremental computation of image and region statistics via \ref FeatureAccumulators and corresponding Python bindings (see <a href="/usr/share/doc/python-vigra-doc/html/index.html#vigra.analysis.extractFeatures">vigra.analysis.extractFeatures()</a> and <a href="/usr/share/doc/python-vigra-doc/html/index.html#vigra.analysis.extractRegionFeatures">vigra.analysis.extractRegionFeatures()</a>).
+
+ <li> Simultaneous iteration over several arrays via \ref vigra::CoupledScanOrderIterator.
+
+@@ -158,7 +158,7 @@ Many thanks to all!
+
+ <li> Extended \ref vigra::SplineImageView to handle \ref vigra::TinyVector pixels.
+
+- <li> Various convenience functions for vigranumpy's <a href="../vigranumpy/index.html#vigra.VigraArray">VigraArray</a>.
++ <li> Various convenience functions for vigranumpy's <a href="/usr/share/doc/python-vigra-doc/html/index.html#vigra.VigraArray">VigraArray</a>.
+
+ <li> Minor improvements and bug fixes in the code and documentation.
+ </ul>
+@@ -203,7 +203,7 @@ Many thanks to all!
+ <li> Added support for the <a href="http://www.openexr.com/">OpenEXR image format</a> and multi-page TIFF. Improved
+ support for the SIF format.
+
+- <li> <b>vigranumpy</b>: added <a href="../vigranumpy/index.html#axistags-and-the-vigraarray-data-structure">axistags </a>
++ <li> <b>vigranumpy</b>: added <a href="/usr/share/doc/python-vigra-doc/html/index.html#axistags-and-the-vigraarray-data-structure">axistags </a>
+ and completly re-implemented VigraArray and the conversion between
+ Python and C++ arrays in terms of axistags.
+
+@@ -261,7 +261,7 @@ Many thanks to all!
+
<li> Added \ref vigra::NumpyAnyArray and \ref vigra::NumpyArray, improved \ref vigra::MultiArrayView.
-
+
- <li> Added <b><a href="../vigranumpy/index.html">vigranumpy</a></b> (VIGRA Python bindings).
+ <li> Added <b><a href="/usr/share/doc/python-vigra-doc/html/index.html">vigranumpy</a></b> (VIGRA Python bindings).
-
+
<li> Added \ref VigraMatlab.
-
-Index: b/docsrc/index.dxx
-===================================================================
+
--- a/docsrc/index.dxx
+++ b/docsrc/index.dxx
-@@ -32,7 +32,7 @@
+@@ -40,7 +40,7 @@
<BR> <em>Demonstration programs for VIGRA's usage </em>
<LI> \ref VigraMatlab
<BR> <em>VIGRA Matlab bindings</em>
@@ -39,11 +63,10 @@ Index: b/docsrc/index.dxx
<BR> <em>VIGRA Python bindings</em>
<LI> \ref CreditsChangelog
<BR> <em>Who contributed what?</em>
-Index: b/vigranumpy/docsrc/conf.py.in
-===================================================================
+
--- a/vigranumpy/docsrc/conf.py.in
+++ b/vigranumpy/docsrc/conf.py.in
-@@ -239,7 +239,7 @@
+@@ -239,7 +239,7 @@ for l in replace_file:
.. |%s| replace:: %s
"""% (replacement[0],replacement[0][k+1:])
rst_epilog += """
@@ -52,25 +75,24 @@ Index: b/vigranumpy/docsrc/conf.py.in
"""% (replacement[0],replacement[1])
# make python accumulators documentation better (?)
-Index: b/vigranumpy/docsrc/index.rst
-===================================================================
+
--- a/vigranumpy/docsrc/index.rst
+++ b/vigranumpy/docsrc/index.rst
-@@ -14,7 +14,7 @@
+@@ -15,7 +15,7 @@ Vigranumpy Reference
Introduction
------------
-Vigranumpy exports the functionality of the C++ image processing library `VIGRA <../vigra/index.html>`_ to Python. It can be invoked by importing the vigra module::
-+Vigranumpy exports the functionality of the C++ image processing library `VIGRA </usr/share/doc/libvigraimpex-doc/html/index.html>`_ to Python. It can be invoked by importing the vigra module::
++Vigranumpy exports the functionality of the C++ image processing library `VIGRA <usr/share/doc/libvigraimpex-doc/html/index.html>`_ to Python. It can be invoked by importing the vigra module::
import vigra
-@@ -260,7 +260,7 @@
+@@ -404,7 +404,7 @@ Color and Intensity Manipulation
The module vigra.colors provides functions to adjust image brightness and contrast,
and to transform between different color spaces.
-See `Color Conversions <../vigra/group__ColorConversions.html>`_ in the C++ documentation
-+See `Color Conversions </usr/share/doc/libvigraimpex-doc/group__ColorConversions.html>`_ in the C++ documentation
++See `Color Conversions <usr/share/doc/libvigraimpex-doc/html/group__ColorConversions.html>`_ in the C++ documentation
for more information.
.. automodule:: vigra.colors
diff --git a/debian/patches/removed-static-docs.diff b/debian/patches/removed-static-docs.diff
index b20f4d0..b16e700 100644
--- a/debian/patches/removed-static-docs.diff
+++ b/debian/patches/removed-static-docs.diff
@@ -3,18 +3,18 @@ Description: vigranumpy/docsrc/_static is removed in dfsg tarball,
Author: Former package maintainer
Forwarded: not-needed
Reviewed-by: Daniel Stender <debian at danielstender.com>
-Last-Update: 2014-12-09
+Last-Update: 2016-01-24
-Index: b/vigranumpy/docsrc/CMakeLists.txt
-===================================================================
--- a/vigranumpy/docsrc/CMakeLists.txt
+++ b/vigranumpy/docsrc/CMakeLists.txt
-@@ -19,7 +19,7 @@
+@@ -19,7 +19,7 @@ IF(PYTHON_SPHINX)
-c ${CMAKE_CURRENT_BINARY_DIR}
${SPHINX_OPTS})
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_static)
- configure_file(_static/vigra-icon.ico ${CMAKE_CURRENT_BINARY_DIR}/_static/vigra-icon.ico COPYONLY)
+ configure_file(../../docsrc/vigra-icon.ico ${CMAKE_CURRENT_BINARY_DIR}/_static/vigra-icon.ico COPYONLY)
-
- DEPENDENCY_PATH(VIGRAIMPEX_PATH vigraimpex)
- STRING(REGEX REPLACE "/vigra$" "" VIGRANUMPY_TMP_PATH ${vigranumpy_tmp_dir})
+
+ STRING(REGEX REPLACE "/vigra$" "" VIGRANUMPY_TMP_PATH ${vigranumpy_tmp_dir})
+
+
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libvigraimpex.git
More information about the debian-science-commits
mailing list