[cpl-plugin-hawki] 05/05: Adjust for new version

Ole Streicher olebole-guest at moszumanska.debian.org
Fri Apr 11 11:16:29 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-hawki.

commit 90f79173a177589b72e19472d5e991b5fc132b7a
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Apr 11 12:29:46 2014 +0200

    Adjust for new version
---
 debian/changelog                          |   7 ++
 debian/cpl-plugin-hawki.lintian-overrides |   2 +-
 debian/patches/force-serial-tests.patch   |   2 +-
 debian/patches/libadd_cpl.patch           | 131 ------------------------------
 debian/patches/series                     |   1 -
 5 files changed, 9 insertions(+), 134 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 04603fb..68d4463 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cpl-plugin-hawki (1.8.14+dfsg-1) unstable; urgency=medium
+
+  * New upstream version
+  * Change maintainer and VCS location to debian-astro
+
+ -- Ole Streicher <debian at liska.ath.cx>  Fri, 11 Apr 2014 12:27:53 +0200
+
 cpl-plugin-hawki (1.8.12+dfsg-2) unstable; urgency=low
 
   * Lower -doc dependency to "suggested"
diff --git a/debian/cpl-plugin-hawki.lintian-overrides b/debian/cpl-plugin-hawki.lintian-overrides
index 1c910fd..3db4c5a 100644
--- a/debian/cpl-plugin-hawki.lintian-overrides
+++ b/debian/cpl-plugin-hawki.lintian-overrides
@@ -1,2 +1,2 @@
 # This lib does not call any unfortified functions.
-cpl-plugin-hawki: hardening-no-fortify-functions usr/lib/x86_64-linux-gnu/cpl/plugins/hawki-1.8.12/hawki_util_stdstars.so
+cpl-plugin-hawki: hardening-no-fortify-functions usr/lib/*/cpl/plugins/hawki-*/hawki_util_stdstars.so
diff --git a/debian/patches/force-serial-tests.patch b/debian/patches/force-serial-tests.patch
index f16529d..b704625 100644
--- a/debian/patches/force-serial-tests.patch
+++ b/debian/patches/force-serial-tests.patch
@@ -27,7 +27,7 @@ Bug: http://bugs.debian.org/715204
 +++ 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  02111-1307  USA
+ ##   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  
 -AUTOMAKE_OPTIONS = 1.8 foreign
 +AUTOMAKE_OPTIONS = 1.13 foreign serial-tests
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
deleted file mode 100644
index 5c05683..0000000
--- a/debian/patches/libadd_cpl.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Add the cpl libraries to the recips.so and the test program
---- a/recipes/Makefile.am
-+++ b/recipes/Makefile.am
-@@ -54,96 +54,96 @@
-                         hawki_util_extinction.la
- 
- hawki_cal_dark_la_SOURCES = hawki_cal_dark.c 
--hawki_cal_dark_la_LIBADD = $(LIBHAWKI)
-+hawki_cal_dark_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLDRS) $(LIBCPLUI)
- hawki_cal_dark_la_LDFLAGS = -module -avoid-version -no-undefined
- hawki_cal_dark_la_DEPENDENCIES = $(LIBHAWKI)
- 
- hawki_cal_flat_la_SOURCES = hawki_cal_flat.c 
--hawki_cal_flat_la_LIBADD = $(LIBHAWKI)
-+hawki_cal_flat_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLDRS) $(LIBCPLUI)
- hawki_cal_flat_la_LDFLAGS = -module -avoid-version -no-undefined
- hawki_cal_flat_la_DEPENDENCIES = $(LIBHAWKI)
- 
- hawki_cal_zpoint_la_SOURCES = hawki_cal_zpoint.c 
--hawki_cal_zpoint_la_LIBADD = $(LIBHAWKI)
-+hawki_cal_zpoint_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLDRS) $(LIBCPLUI)
- hawki_cal_zpoint_la_LDFLAGS = -module -avoid-version -no-undefined
- hawki_cal_zpoint_la_DEPENDENCIES = $(LIBHAWKI)
- 
- hawki_util_extinction_la_SOURCES = hawki_util_extinction.c 
--hawki_util_extinction_la_LIBADD = $(LIBHAWKI)
-+hawki_util_extinction_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- hawki_util_extinction_la_LDFLAGS = -module -avoid-version -no-undefined
- hawki_util_extinction_la_DEPENDENCIES = $(LIBHAWKI)
- 
- hawki_cal_distortion_la_SOURCES = hawki_cal_distortion.c 
--hawki_cal_distortion_la_LIBADD = $(LIBHAWKI)
-+hawki_cal_distortion_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLDRS) $(LIBCPLUI)
- hawki_cal_distortion_la_LDFLAGS = -module -avoid-version -no-undefined
- hawki_cal_distortion_la_DEPENDENCIES = $(LIBHAWKI)
- 
- hawki_sci_jitter_la_SOURCES = hawki_sci_jitter.c 
--hawki_sci_jitter_la_LIBADD = $(LIBHAWKI)
-+hawki_sci_jitter_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLDRS) $(LIBCPLUI)
- hawki_sci_jitter_la_LDFLAGS = -module -avoid-version -no-undefined
- hawki_sci_jitter_la_DEPENDENCIES = $(LIBHAWKI)
- 
- hawki_step_basic_calib_la_SOURCES = hawki_step_basic_calib.c 
--hawki_step_basic_calib_la_LIBADD = $(LIBHAWKI)
-+hawki_step_basic_calib_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- hawki_step_basic_calib_la_LDFLAGS = -module -avoid-version -no-undefined
- hawki_step_basic_calib_la_DEPENDENCIES = $(LIBHAWKI)
- 
- hawki_step_stats_la_SOURCES = hawki_step_stats.c 
--hawki_step_stats_la_LIBADD = $(LIBHAWKI)
-+hawki_step_stats_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- hawki_step_stats_la_LDFLAGS = -module -avoid-version -no-undefined
- hawki_step_stats_la_DEPENDENCIES = $(LIBHAWKI)
- 
- hawki_step_compute_bkg_la_SOURCES = hawki_step_compute_bkg.cc 
--hawki_step_compute_bkg_la_LIBADD = $(LIBHAWKI)
-+hawki_step_compute_bkg_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- hawki_step_compute_bkg_la_LDFLAGS = -module -avoid-version -no-undefined
- hawki_step_compute_bkg_la_DEPENDENCIES = $(LIBHAWKI)
- 
- hawki_step_subtract_bkg_la_SOURCES = hawki_step_subtract_bkg.c 
--hawki_step_subtract_bkg_la_LIBADD = $(LIBHAWKI)
-+hawki_step_subtract_bkg_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- hawki_step_subtract_bkg_la_LDFLAGS = -module -avoid-version -no-undefined
- hawki_step_subtract_bkg_la_DEPENDENCIES = $(LIBHAWKI)
- 
- hawki_step_stitch_la_SOURCES = hawki_step_stitch.c 
--hawki_step_stitch_la_LIBADD = $(LIBHAWKI)
-+hawki_step_stitch_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- hawki_step_stitch_la_LDFLAGS = -module -avoid-version -no-undefined
- hawki_step_stitch_la_DEPENDENCIES = $(LIBHAWKI)
- 
- hawki_step_apply_dist_la_SOURCES = hawki_step_apply_dist.c 
--hawki_step_apply_dist_la_LIBADD = $(LIBHAWKI)
-+hawki_step_apply_dist_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- hawki_step_apply_dist_la_LDFLAGS = -module -avoid-version -no-undefined
- hawki_step_apply_dist_la_DEPENDENCIES = $(LIBHAWKI)
- 
- hawki_step_refine_offsets_la_SOURCES = hawki_step_refine_offsets.c 
--hawki_step_refine_offsets_la_LIBADD = $(LIBHAWKI)
-+hawki_step_refine_offsets_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- hawki_step_refine_offsets_la_LDFLAGS = -module -avoid-version -no-undefined
- hawki_step_refine_offsets_la_DEPENDENCIES = $(LIBHAWKI)
- 
- hawki_step_combine_la_SOURCES = hawki_step_combine.c 
--hawki_step_combine_la_LIBADD = $(LIBHAWKI)
-+hawki_step_combine_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLDRS) $(LIBCPLUI)
- hawki_step_combine_la_LDFLAGS = -module -avoid-version -no-undefined
- hawki_step_combine_la_DEPENDENCIES = $(LIBHAWKI)
- 
- hawki_step_detect_obj_la_SOURCES = hawki_step_detect_obj.c 
--hawki_step_detect_obj_la_LIBADD = $(LIBHAWKI)
-+hawki_step_detect_obj_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLDRS) $(LIBCPLUI)
- hawki_step_detect_obj_la_LDFLAGS = -module -avoid-version -no-undefined
- hawki_step_detect_obj_la_DEPENDENCIES = $(LIBHAWKI)
- 
- hawki_step_photom_2mass_la_SOURCES = hawki_step_photom_2mass.c 
--hawki_step_photom_2mass_la_LIBADD = $(LIBHAWKI)
-+hawki_step_photom_2mass_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLDRS) $(LIBCPLUI)
- hawki_step_photom_2mass_la_LDFLAGS = -module -avoid-version -no-undefined
- hawki_step_photom_2mass_la_DEPENDENCIES = $(LIBHAWKI)
- 
- hawki_tec_filtchk_la_SOURCES = hawki_tec_filtchk.c 
--hawki_tec_filtchk_la_LIBADD = $(LIBHAWKI)
-+hawki_tec_filtchk_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- hawki_tec_filtchk_la_LDFLAGS = -module -avoid-version -no-undefined
- hawki_tec_filtchk_la_DEPENDENCIES = $(LIBHAWKI)
- 
- hawki_util_gendist_la_SOURCES = hawki_util_gendist.c 
--hawki_util_gendist_la_LIBADD = $(LIBHAWKI)
-+hawki_util_gendist_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- hawki_util_gendist_la_LDFLAGS = -module -avoid-version -no-undefined
- hawki_util_gendist_la_DEPENDENCIES = $(LIBHAWKI)
- 
- hawki_util_stdstars_la_SOURCES = hawki_util_stdstars.c 
--hawki_util_stdstars_la_LIBADD = $(LIBHAWKI)
-+hawki_util_stdstars_la_LIBADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- hawki_util_stdstars_la_LDFLAGS = -module -avoid-version -no-undefined
- hawki_util_stdstars_la_DEPENDENCIES = $(LIBHAWKI)
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -32,7 +32,7 @@
- LIBHAWKI = $(top_builddir)/hawki/libhawki.la
- 
- AM_CPPFLAGS = -I$(top_builddir)hawki/
--LDADD = $(LIBHAWKI)
-+LDADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLUI)
- 
- check_PROGRAMS =
- 
diff --git a/debian/patches/series b/debian/patches/series
index 20ff8b9..3a289c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-libadd_cpl.patch
 set_plugindir.patch
 use-std-paths-for-cpl.patch
 fix_test_fail.patch

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

More information about the debian-science-commits mailing list