[cpl-plugin-kmos] 02/03: Adjust patches for new upstream version
Ole Streicher
olebole-guest at moszumanska.debian.org
Tue Sep 9 13:21:35 UTC 2014
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian
in repository cpl-plugin-kmos.
commit 1eb9fc45d0656ecd32ce16470ff4f355883b18b6
Author: Ole Streicher <olebole at debian.org>
Date: Tue Sep 9 14:43:17 2014 +0200
Adjust patches for new upstream version
---
debian/changelog | 6 ++++++
debian/patches/fix_test_fail.patch | 6 ++----
debian/patches/force-serial-tests.patch | 18 ++++++------------
debian/patches/fortify.patch | 6 ++----
debian/patches/kmclipm_disable_test.patch | 6 ++----
debian/patches/libadd_cpl.patch | 6 ++----
debian/patches/no_test_data.patch | 6 ++----
debian/patches/set_plugindir.patch | 6 ++----
debian/patches/spellfix.patch | 11 +++++++++++
debian/patches/use-std-paths-for-cpl.patch | 6 ++----
10 files changed, 37 insertions(+), 40 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index aee7db8..9bf9f9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cpl-plugin-kmos (1.3.5+dfsg-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Ole Streicher <ole at baikal.ole.ath.cx> Tue, 09 Sep 2014 14:42:31 +0200
+
cpl-plugin-kmos (1.3.4+dfsg-1) unstable; urgency=low
* New upstream version
diff --git a/debian/patches/fix_test_fail.patch b/debian/patches/fix_test_fail.patch
index c717083..3fdc536 100644
--- a/debian/patches/fix_test_fail.patch
+++ b/debian/patches/fix_test_fail.patch
@@ -1,9 +1,7 @@
Author: Ole Streicher <debian at liska.ath.cx>
Description: Increase tolerance to fix FTBS on mips and ia64
-Index: kmos/irplib/tests/irplib_polynomial-test.c
-===================================================================
---- kmos.orig/irplib/tests/irplib_polynomial-test.c 2014-07-25 14:29:01.674611756 +0200
-+++ kmos/irplib/tests/irplib_polynomial-test.c 2014-07-25 14:29:01.674611756 +0200
+--- a/irplib/tests/irplib_polynomial-test.c
++++ b/irplib/tests/irplib_polynomial-test.c
@@ -576,7 +576,7 @@
for (i = nreal; i < degree; i++) {
const double root = cpl_vector_get(roots, i);
diff --git a/debian/patches/force-serial-tests.patch b/debian/patches/force-serial-tests.patch
index 96e61b7..6b44d92 100644
--- a/debian/patches/force-serial-tests.patch
+++ b/debian/patches/force-serial-tests.patch
@@ -1,10 +1,8 @@
Author: Ole Streicher <debian at liska.ath.cx>
Description: Force serial-tests to get better verbose output
Bug: http://bugs.debian.org/715204
-Index: kmos/kmos/tests/Makefile.am
-===================================================================
---- kmos.orig/kmos/tests/Makefile.am 2014-07-25 14:29:05.394611874 +0200
-+++ kmos/kmos/tests/Makefile.am 2014-07-25 14:29:05.370611874 +0200
+--- a/kmos/tests/Makefile.am
++++ b/kmos/tests/Makefile.am
@@ -17,7 +17,7 @@
## along with this program; if not, write to the Free Software
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@@ -14,10 +12,8 @@ Index: kmos/kmos/tests/Makefile.am
DISTCLEANFILES = *~
-Index: kmos/regtests/tests/Makefile.am
-===================================================================
---- kmos.orig/regtests/tests/Makefile.am 2014-07-25 14:29:05.394611874 +0200
-+++ kmos/regtests/tests/Makefile.am 2014-07-25 14:29:05.370611874 +0200
+--- a/regtests/tests/Makefile.am
++++ b/regtests/tests/Makefile.am
@@ -17,7 +17,7 @@
## along with this program; if not, write to the Free Software
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
@@ -27,10 +23,8 @@ Index: kmos/regtests/tests/Makefile.am
DISTCLEANFILES = *~
-Index: kmos/irplib/tests/Makefile.am
-===================================================================
---- kmos.orig/irplib/tests/Makefile.am 2014-07-25 14:29:05.394611874 +0200
-+++ kmos/irplib/tests/Makefile.am 2014-07-25 14:29:05.370611874 +0200
+--- a/irplib/tests/Makefile.am
++++ b/irplib/tests/Makefile.am
@@ -17,7 +17,7 @@
## along with this program; if not, write to the Free Software
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02111-1307 USA
diff --git a/debian/patches/fortify.patch b/debian/patches/fortify.patch
index cf81edf..e36929e 100644
--- a/debian/patches/fortify.patch
+++ b/debian/patches/fortify.patch
@@ -1,9 +1,7 @@
Author: Ole Streicher <debian at liska.ath.cx>
Description: Replace strcat calls with size checked strncat calls
-Index: kmos/recipes/kmo_stats.c
-===================================================================
---- kmos.orig/recipes/kmo_stats.c 2014-07-25 14:27:46.558609370 +0200
-+++ kmos/recipes/kmo_stats.c 2014-07-25 14:27:46.554609370 +0200
+--- a/recipes/kmo_stats.c
++++ b/recipes/kmo_stats.c
@@ -848,9 +848,10 @@
sub_header = kmo_dfs_load_sub_header(frameset, STATS, extnr,
FALSE));
diff --git a/debian/patches/kmclipm_disable_test.patch b/debian/patches/kmclipm_disable_test.patch
index 71867b3..bad682c 100644
--- a/debian/patches/kmclipm_disable_test.patch
+++ b/debian/patches/kmclipm_disable_test.patch
@@ -2,10 +2,8 @@ Author; Ole Streicher <debian at liska.ath.cx>
Description: Disable priv_reconstruct patch on mips.
This test takes ages on MIPS and goes beyound the time limits of the buildd without
gaining anything.
-Index: kmos/kmclipm/test/Makefile.am
-===================================================================
---- kmos.orig/kmclipm/test/Makefile.am 2014-07-25 14:29:08.022611958 +0200
-+++ kmos/kmclipm/test/Makefile.am 2014-07-25 14:29:08.018611958 +0200
+--- a/kmclipm/test/Makefile.am
++++ b/kmclipm/test/Makefile.am
@@ -39,14 +39,7 @@
noinst_HEADERS =
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
index 3400b50..3e33fda 100644
--- a/debian/patches/libadd_cpl.patch
+++ b/debian/patches/libadd_cpl.patch
@@ -1,9 +1,7 @@
Author: Ole Streicher <debian at liska.ath.cx>
Description: Add the cpl libraries to the recips.so and the test program
-Index: kmos/recipes/Makefile.am
-===================================================================
---- kmos.orig/recipes/Makefile.am 2014-07-25 14:24:17.754602736 +0200
-+++ kmos/recipes/Makefile.am 2014-07-25 14:26:55.474607747 +0200
+--- a/recipes/Makefile.am
++++ b/recipes/Makefile.am
@@ -58,127 +58,127 @@
kmos_gen_reflines.la
diff --git a/debian/patches/no_test_data.patch b/debian/patches/no_test_data.patch
index d3070e4..9f90ba3 100644
--- a/debian/patches/no_test_data.patch
+++ b/debian/patches/no_test_data.patch
@@ -1,10 +1,8 @@
Author: Ole Streicher <debian at liska.ath.cx>
Description: Disable tests that require test data from the ref_data subdir
These data were removed from the tar file due to their huge size.
-Index: kmos/kmos/tests/Makefile.am
-===================================================================
---- kmos.orig/kmos/tests/Makefile.am 2014-07-25 14:27:44.766609313 +0200
-+++ kmos/kmos/tests/Makefile.am 2014-07-25 14:27:44.762609313 +0200
+--- a/kmos/tests/Makefile.am
++++ b/kmos/tests/Makefile.am
@@ -21,7 +21,7 @@
DISTCLEANFILES = *~
diff --git a/debian/patches/set_plugindir.patch b/debian/patches/set_plugindir.patch
index 4476916..a3dd429 100644
--- a/debian/patches/set_plugindir.patch
+++ b/debian/patches/set_plugindir.patch
@@ -1,9 +1,7 @@
Author: Ole Streicher <debian at liska.ath.cx>
Description: Set the plugin directory so that esorex and python-cpl can find it.
-Index: kmos/acinclude.m4
-===================================================================
---- kmos.orig/acinclude.m4 2014-07-25 14:27:39.370609142 +0200
-+++ kmos/acinclude.m4 2014-07-25 14:27:39.370609142 +0200
+--- a/acinclude.m4
++++ b/acinclude.m4
@@ -84,15 +84,15 @@
AC_DEFUN([KMOS_SET_PATHS],
[
diff --git a/debian/patches/spellfix.patch b/debian/patches/spellfix.patch
index 49ec30d..e2da2f2 100644
--- a/debian/patches/spellfix.patch
+++ b/debian/patches/spellfix.patch
@@ -62,3 +62,14 @@ Description: Remove several small spelling errors
"the waveband (4 for IZ band, 5 for HK, 6 for the others)\n"
"\n"
"ADVANCED PARAMETERS\n"
+--- a/recipes/kmos_gen_reflines.c
++++ b/recipes/kmos_gen_reflines.c
+@@ -65,7 +65,7 @@
+ " IZ 1 0.966044 -1 1150 80 2000\n"
+ " IZ 1 1.04729 -1 1730 80 200\n"
+ " IZ 1 1.06765 2 128 40 80\n"
+-"...\n"
++" ...\n"
+ "This recipe produces 1 file:\n"
+ "First product: the table with the configuration for the model.\n" ;
+
diff --git a/debian/patches/use-std-paths-for-cpl.patch b/debian/patches/use-std-paths-for-cpl.patch
index cabe639..f768445 100644
--- a/debian/patches/use-std-paths-for-cpl.patch
+++ b/debian/patches/use-std-paths-for-cpl.patch
@@ -1,9 +1,7 @@
Author: Ole Streicher <debian at liska.ath.cx>
Description: Use standard path and name for cpl
-Index: kmos/m4macros/cpl.m4
-===================================================================
---- kmos.orig/m4macros/cpl.m4 2014-07-25 14:27:42.982609256 +0200
-+++ kmos/m4macros/cpl.m4 2014-07-25 14:27:42.978609256 +0200
+--- a/m4macros/cpl.m4
++++ b/m4macros/cpl.m4
@@ -9,7 +9,7 @@
cpl_cfitsio_check_version="$1"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl-plugin-kmos.git
More information about the debian-science-commits
mailing list