[cpl-plugin-kmos] 06/06: Adjust for new version

[Ole Streicher]

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 f1e0d35e727d888e0a7863a8fac4a42f660c235c
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Apr 11 15:31:42 2014 +0200

    Adjust for new version
---
 debian/changelog                               |  7 ++++++
 debian/control                                 |  1 -
 debian/cpl-plugin-kmos.lintian-overrides       |  4 ++--
 debian/patches/fix_kmo_priv-combine-test.patch | 32 --------------------------
 debian/patches/series                          |  1 -
 5 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b3ee0db..99d7932 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cpl-plugin-kmos (1.3.1+dfsg-1) unstable; urgency=low
+
+  * New upstream version
+  * Change VCS location to debian-astro
+
+ -- Ole Streicher <debian at liska.ath.cx>  Fri, 11 Apr 2014 15:30:50 +0200
+
 cpl-plugin-kmos (1.3.0+dfsg-2) unstable; urgency=medium
 
   * [Yves Jung] Fix missing CDN_M keywords in input for test. 
diff --git a/debian/control b/debian/control
index 5804272..06a2ab4 100644
--- a/debian/control
+++ b/debian/control
@@ -45,7 +45,6 @@ Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}, cpl-plugin-kmos, wget
 Section: contrib/science
-
 Description: ESO data reduction pipeline calibration data downloader for KMOS
  This package downloads calibration and other static data of the 
  data reduction pipeline for the KMOS instrument of the
diff --git a/debian/cpl-plugin-kmos.lintian-overrides b/debian/cpl-plugin-kmos.lintian-overrides
index 6e841b6..6ae0c2b 100644
--- a/debian/cpl-plugin-kmos.lintian-overrides
+++ b/debian/cpl-plugin-kmos.lintian-overrides
@@ -1,4 +1,4 @@
 # False positive for checked strncat
-cpl-plugin-kmos: hardening-no-fortify-functions usr/lib/x86_64-linux-gnu/cpl/plugins/kmos-1.3.0/kmo_stats.so
+cpl-plugin-kmos: hardening-no-fortify-functions usr/lib/*/cpl/plugins/kmos-*/kmo_stats.so
 # False positive for checked strncpy
-cpl-plugin-kmos: hardening-no-fortify-functions usr/lib/x86_64-linux-gnu/cpl/plugins/kmos-1.3.0/kmo_std_star.so
+cpl-plugin-kmos: hardening-no-fortify-functions usr/lib/*/cpl/plugins/kmos-*/kmo_std_star.so
diff --git a/debian/patches/fix_kmo_priv-combine-test.patch b/debian/patches/fix_kmo_priv-combine-test.patch
deleted file mode 100644
index 6251129..0000000
--- a/debian/patches/fix_kmo_priv-combine-test.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Author: Yves Jung
-Description: Fix missing CDN_M keywords in input for test.
-Bug: https://bugs.debian.org/743080
---- a/kmos/tests/kmo_priv_combine-test.c
-+++ b/kmos/tests/kmo_priv_combine-test.c
-@@ -97,12 +97,20 @@
-     cpl_propertylist_append_string(header_data, "ESO PRO FRNAME", "ga");
-     cpl_propertylist_append_int(header_data, "ESO PRO IFUNR", 1);
- 
--    kmo_align_subpix(&xshift, &yshift,
--                           &data, NULL,
--                           &header_data, NULL,
--                           0, "BCS", BCS_NATURAL, tol, fid,
--                           &xmin, &xmax,
--                           &ymin, &ymax, "gaga");
-+    /* CDN_M Matrix needs to be specified - PIPE-5106 PIPE-5115 */
-+    /* If not specified, cpl_wcs() fails  */
-+    cpl_propertylist_append_double(header_data, CD1_1, -5.55555e-5);
-+    cpl_propertylist_append_double(header_data, CD1_2, 0);
-+    cpl_propertylist_append_double(header_data, CD1_3, 0);
-+    cpl_propertylist_append_double(header_data, CD2_1, 0);
-+    cpl_propertylist_append_double(header_data, CD2_2, -5.55555e-5);
-+    cpl_propertylist_append_double(header_data, CD2_3, 0);
-+    cpl_propertylist_append_double(header_data, CD3_1, 0);
-+    cpl_propertylist_append_double(header_data, CD3_2, 0);
-+    cpl_propertylist_append_double(header_data, CD3_3, 0.0002075);
-+
-+    kmo_align_subpix(&xshift, &yshift, &data, NULL, &header_data, NULL, 0, 
-+            "BCS", BCS_NATURAL, tol, fid, &xmin, &xmax, &ymin, &ymax, "gaga");
-     cpl_test_error(CPL_ERROR_NONE);
-     cpl_test_eq(xmin, 0);
-     cpl_test_eq(ymin, 0);
diff --git a/debian/patches/series b/debian/patches/series
index ae45b43..a5d423f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@ spellfix.patch
 fix_test_fail.patch
 force-serial-tests.patch
 kmclipm_disable_test.patch
-fix_kmo_priv-combine-test.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl-plugin-kmos.git