[cpl-plugin-fors] 03/03: Adjust patches for new version
Ole Streicher
olebole at moszumanska.debian.org
Sat Apr 18 15:45:41 UTC 2015
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian
in repository cpl-plugin-fors.
commit 88eff40cc9e3be679f95de00a9c53a6d1c3bec9b
Author: Ole Streicher <olebole at debian.org>
Date: Sat Apr 18 17:45:29 2015 +0200
Adjust patches for new version
---
debian/changelog | 5 +++--
debian/patches/dont_build_sextractor.patch | 2 +-
debian/patches/fix_test_fail.patch | 2 +-
debian/patches/set_plugindir.patch | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 771dcc2..8faeb38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-cpl-plugin-fors (5.0.0+dfsg-3) UNRELEASED; urgency=low
+cpl-plugin-fors (5.0.11+dfsg-1) UNRELEASED; urgency=low
+ * New upstream version
* Add simple CI test
- -- Ole Streicher <olebole at debian.org> Fri, 17 Apr 2015 14:37:46 +0200
+ -- Ole Streicher <olebole at debian.org> Sat, 18 Apr 2015 17:44:16 +0200
cpl-plugin-fors (5.0.0+dfsg-2) unstable; urgency=low
diff --git a/debian/patches/dont_build_sextractor.patch b/debian/patches/dont_build_sextractor.patch
index 8906fbf..5a7a478 100644
--- a/debian/patches/dont_build_sextractor.patch
+++ b/debian/patches/dont_build_sextractor.patch
@@ -25,7 +25,7 @@ Description: Use the system provided sextractor binary
[Absolute path to the sextractor executable])
--- a/configure.ac
+++ b/configure.ac
-@@ -92,9 +92,6 @@
+@@ -96,9 +96,6 @@
FORS_SET_SEX_PREFIX
diff --git a/debian/patches/fix_test_fail.patch b/debian/patches/fix_test_fail.patch
index 7be30aa..4da200f 100644
--- a/debian/patches/fix_test_fail.patch
+++ b/debian/patches/fix_test_fail.patch
@@ -2,7 +2,7 @@ Author: Ole Streicher <debian at liska.ath.cx>
Description: Increase tolerance to fix FTBS on mips, mipsel64, and ia64
--- a/irplib/tests/irplib_polynomial-test.c
+++ b/irplib/tests/irplib_polynomial-test.c
-@@ -560,16 +560,16 @@
+@@ -567,16 +567,16 @@
const double root = cpl_vector_get(roots, i);
const double residual = cpl_polynomial_eval_1d(p1d, root, NULL);
diff --git a/debian/patches/set_plugindir.patch b/debian/patches/set_plugindir.patch
index 9560155..3c366b8 100644
--- a/debian/patches/set_plugindir.patch
+++ b/debian/patches/set_plugindir.patch
@@ -54,7 +54,7 @@ Description: Set the plugin directory so that esorex and python-cpl can find it.
[Absolute path to the sextractor executable])
--- a/reflex/fors_spec.xml.in
+++ b/reflex/fors_spec.xml.in
-@@ -6051,7 +6051,7 @@
+@@ -5935,7 +5935,7 @@
</entity>
<entity name="DataOrganizer" class="org.eso.DataOrganizer">
<display name="Data Organiser"/>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl-plugin-fors.git
More information about the debian-science-commits
mailing list