On 2016-02-13 Daniel Stender <deb...@danielstender.com> wrote:
> On 13.02.2016 07:52, Andreas Metzler wrote:
[...]
> > You are going for 1.11 rc1, I assume?
> That's a good idea! That's not official release candidate but would
> be much clearer.
According to dpkg-gensymbols the ABI has not changed from
1.10.0+git20160120.803d5d4 to 1.11 rc1 branch.
Trivial patches attached.
cu Andreas
--
`What a good friend you are to him, Dr. Maturin. His other friends are
so grateful to you.'
`I sew his ears on from time to time, sure'
>From 7fad4ee96cb68e558a523c836d3727e3b6cb2140 Mon Sep 17 00:00:00 2001
From: Andreas Metzler <ametz...@bebt.de>
Date: Sat, 13 Feb 2016 09:03:58 +0100
Subject: [PATCH 1/3] Upgrade to version-1-11-rc branch.
Unfuzz patches.
---
debian/changelog | 7 ++++++-
debian/patches/docsrc-out-of-source.diff | 2 +-
debian/patches/docsrc-paths.diff | 10 ++++------
debian/patches/vigra-config-docdir.diff | 10 ++++------
4 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 36ab631..08cb34c 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].
@@ -12,6 +13,10 @@ libvigraimpex (1.10.0+git20160120.803d5d4-2) UNRELEASED; urgency=medium
* deb/README.Debian: corrected typo.
* Dropped deb/libvigraimpex5v5.lintian-overrides.
+ [ Andreas Metzler ]
+ * Upgrade to version-1-11-rc branch.
+ + Unfuzz patches.
+
-- Daniel Stender <deb...@danielstender.com> Fri, 05 Feb 2016 20:03:23 +0100
libvigraimpex (1.10.0+git20160120.803d5d4-1) unstable; urgency=medium
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 <jw...@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/')
--
2.7.0
>From d16042a0aa72610072c4a1358238dc8d72ce8050 Mon Sep 17 00:00:00 2001
From: Andreas Metzler <ametz...@bebt.de>
Date: Sat, 13 Feb 2016 09:16:59 +0100
Subject: [PATCH 2/3] Version libboost-python-dev build-dependency.
---
debian/changelog | 1 +
debian/control | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 08cb34c..653c84c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ libvigraimpex (1.10.0+git20160211.167be93-1) UNRELEASED; urgency=medium
[ Andreas Metzler ]
* Upgrade to version-1-11-rc branch.
+ Unfuzz patches.
+ + Version libboost-python-dev build-dependency.
-- Daniel Stender <deb...@danielstender.com> Fri, 05 Feb 2016 20:03:23 +0100
diff --git a/debian/control b/debian/control
index 65c872c..1dae8ad 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,
--
2.7.0
>From 6798b8bd8fa04eb890f5acf2f2a71781cc7b61a2 Mon Sep 17 00:00:00 2001
From: Andreas Metzler <ametz...@bebt.de>
Date: Sat, 13 Feb 2016 09:36:29 +0100
Subject: [PATCH 3/3] Tighten dh_makeshlibs -V argument, this is not yet a
stable release.
---
debian/changelog | 1 +
debian/rules | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 653c84c..c6988b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ libvigraimpex (1.10.0+git20160211.167be93-1) UNRELEASED; urgency=medium
* Upgrade to version-1-11-rc branch.
+ Unfuzz patches.
+ Version libboost-python-dev build-dependency.
+ + Tighten dh_makeshlibs -V argument, this is not yet a stable release.
-- Daniel Stender <deb...@danielstender.com> Fri, 05 Feb 2016 20:03:23 +0100
diff --git a/debian/rules b/debian/rules
index 52c17ed..6e5ab71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -149,7 +149,7 @@ binary-arch: build-arch
dh_compress -a
dh_fixperms -a
dh_strip -a
- dh_makeshlibs -V 'libvigraimpex6 (>= 1.10.0)'
+ dh_makeshlibs -V 'libvigraimpex6 (>= 1.10.0+git20160211.167be93)'
dh_shlibdeps
# See <http://lists.debian.org/debian-python/2010/07/msg00042.html>:
dh_numpy -p python-vigra
--
2.7.0
