[libvigraimpex] 27/30: added patches of Andreas Metzler for build with 1-11-rc branch

Sun Feb 14 00:55:32 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 04f511426f77ce2d7a34348b7528bb359dbe36f5
Author: Daniel Stender <debian at danielstender.com>
Date:   Sun Feb 14 01:08:09 2016 +0100

    added patches of Andreas Metzler for build with 1-11-rc branch
---
 debian/changelog                         | 11 +++++++++--
 debian/control                           |  2 +-
 debian/patches/docsrc-out-of-source.diff |  2 +-
 debian/patches/docsrc-paths.diff         | 10 ++++------
 debian/patches/vigra-config-docdir.diff  | 10 ++++------
 debian/rules                             |  2 +-
 6 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 45e712b..1ffa6f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-libvigraimpex (1.10.0+git20160120.803d5d4-2) UNRELEASED; urgency=medium
+libvigraimpex (1.10.0+git20160211.167be93-1) UNRELEASED; urgency=medium
 
+  [ Daniel Stender ]
   * Build libvigraimpex6 (Closes: #813415).
   * deb/control:
     + depend libvigraimpex-dev on libpng-dev [thanks to Tobias Frost].
@@ -17,7 +18,13 @@ libvigraimpex (1.10.0+git20160120.803d5d4-2) UNRELEASED; urgency=medium
   * deb/README.Debian: corrected typo.
   * Dropped deb/libvigraimpex5v5.lintian-overrides.
 
- -- Daniel Stender <debian at danielstender.com>  Sun, 14 Feb 2016 00:21:11 +0100
+  [ Andreas Metzler ]
+  * Build with version-1-11-rc branch.
+    + Unfuzz patches.
+    + deb/control: version libboost-python-dev build-dependency.
+    + deb/rules: tighten dh_makeshlibs -V argument.
+
+ -- Daniel Stender <debian at danielstender.com>  Sun, 14 Feb 2016 01:05:22 +0100
 
 libvigraimpex (1.10.0+git20160120.803d5d4-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 29feae8..da5fbbf 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
  debhelper (>= 9),
  dh-python,
  dpkg-dev (>= 1.15.3~),
- libboost-python-dev,
+ libboost-python-dev (>= 1.40.0),
  libfftw3-dev,
  libhdf5-dev (>= 1.8),
  libjpeg-dev,
diff --git a/debian/patches/docsrc-out-of-source.diff b/debian/patches/docsrc-out-of-source.diff
index 6a8dec8..db2f4fa 100644
--- a/debian/patches/docsrc-out-of-source.diff
+++ b/debian/patches/docsrc-out-of-source.diff
@@ -6,7 +6,7 @@ Last-Update: 2016-01-24
 
 --- a/docsrc/makeFunctionIndex.py
 +++ b/docsrc/makeFunctionIndex.py
-@@ -144,7 +144,7 @@ generateFunctionIndex(functionList)
+@@ -145,7 +145,7 @@ generateFunctionIndex(functionList)
  # Note that '::' are not allowed in reStructuedText link names,
  # so we have to use '.' instead.
  try:
diff --git a/debian/patches/docsrc-paths.diff b/debian/patches/docsrc-paths.diff
index f21c87b..674539b 100644
--- a/debian/patches/docsrc-paths.diff
+++ b/debian/patches/docsrc-paths.diff
@@ -63,10 +63,9 @@ Last-Update: 2016-01-24
          <BR>   <em>VIGRA Python bindings</em>
      <LI> \ref CreditsChangelog
          <BR>   <em>Who contributed what?</em>
-
 --- a/vigranumpy/docsrc/conf.py.in
 +++ b/vigranumpy/docsrc/conf.py.in
-@@ -239,7 +239,7 @@ for l in replace_file:
+@@ -240,7 +240,7 @@ for l in replace_file:
      .. |%s| replace:: %s
  """% (replacement[0],replacement[0][k+1:])
      rst_epilog += """
@@ -75,7 +74,6 @@ Last-Update: 2016-01-24
  """% (replacement[0],replacement[1])
  
  # make python accumulators documentation better (?)
-
 --- a/vigranumpy/docsrc/index.rst
 +++ b/vigranumpy/docsrc/index.rst
 @@ -15,7 +15,7 @@ Vigranumpy Reference
@@ -87,10 +85,10 @@ Last-Update: 2016-01-24
  
      import vigra
  
-@@ -404,7 +404,7 @@ Color and Intensity Manipulation
+@@ -442,7 +442,7 @@ Color and Intensity Manipulation
  
- The module vigra.colors provides functions to adjust image brightness and contrast, 
- and to transform between different color spaces. 
+ 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/html/group__ColorConversions.html>`_ in the C++ documentation
  for more information.
diff --git a/debian/patches/vigra-config-docdir.diff b/debian/patches/vigra-config-docdir.diff
index 916f216..770f528 100644
--- a/debian/patches/vigra-config-docdir.diff
+++ b/debian/patches/vigra-config-docdir.diff
@@ -2,13 +2,11 @@ Description: Correct output of ‘vigra-config --docdir’.
 Author: Jakub Wilk <jwilk at debian.org>
 Forwarded: not-needed
 Last-Update: 2011-01-22
-Index: b/config/vigra-config.in
-===================================================================
 --- a/config/vigra-config.in
 +++ b/config/vigra-config.in
-@@ -91,4 +91,4 @@
-     print '@CMAKE_INSTALL_PREFIX@/include'
+@@ -93,4 +93,4 @@ if op.include_path: # was: --include_pat
+     print('@CMAKE_INSTALL_PREFIX@/include')
  
  if op.docdir:
--    print '@DOCDIR@'
-+    print '/usr/share/doc/libvigraimpex-dev/html/'
+-    print('@DOCDIR@')
++    print('/usr/share/doc/libvigraimpex-dev/html/')
diff --git a/debian/rules b/debian/rules
index 8978191..9efcb7d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -115,7 +115,7 @@ binary-arch: build-arch
 	dh_compress -a
 	dh_fixperms -a
 	dh_strip -a
-	dh_makeshlibs -a -V 'libvigraimpex6 (>= 1.10.0)'
+	dh_makeshlibs -a -V 'libvigraimpex6 (>= 1.10.0+git20160211.167be93)'
 	dh_shlibdeps -a
 	dh_numpy -p python-vigra
 	dh_installdeb -a

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

