[gmt] 01/02: Add patch rename psl library to gmt-psl to resolve conflict with libpsl.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Thu Jul 23 07:02:09 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository gmt.
commit ac5fb592be5ee36e24ab629d578d7c2299d92388
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Jul 3 23:32:23 2015 +0200
Add patch rename psl library to gmt-psl to resolve conflict with libpsl.
---
debian/changelog | 7 +
debian/control | 1 -
debian/libgmt5.symbols | 258 +++++++++++------------
debian/patches/rename-libpsl-to-libgmt-psl.patch | 16 ++
debian/patches/series | 1 +
5 files changed, 153 insertions(+), 130 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1df8ccd..544dfa3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gmt (5.1.2+dfsg1-1~exp9) UNRELEASED; urgency=medium
+
+ * Add patch rename psl library to gmt-psl to resolve conflict with
+ libpsl.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 23 Jul 2015 00:20:41 +0200
+
gmt (5.1.2+dfsg1-1~exp8) experimental; urgency=medium
* Drop Conflicts on turnin-ng & pslib-dev,
diff --git a/debian/control b/debian/control
index e7d9b15..6ce9c1c 100644
--- a/debian/control
+++ b/debian/control
@@ -97,7 +97,6 @@ Depends: ${shlibs:Depends},
libnetcdf-dev,
${misc:Depends}
Suggests: gmt
-Conflicts: libpsl-dev
Description: Generic Mapping Tools Library - Development files
These set of libraries allow manipulating geographic and Cartesian data sets
(including filtering, trend fitting, gridding, projecting, etc.) and
diff --git a/debian/libgmt5.symbols b/debian/libgmt5.symbols
index 7b1fa25..a396ee2 100644
--- a/debian/libgmt5.symbols
+++ b/debian/libgmt5.symbols
@@ -1,3 +1,132 @@
+libgmt-psl.so.5 libgmt5 #MINVER#
+ GMT_basename at Base 5.1.2
+ GMT_chop at Base 5.1.2
+ GMT_chop_ext at Base 5.1.2
+ GMT_cr2lf at Base 5.1.2
+ GMT_guess_sharedir at Base 5.1.2
+ GMT_runtime_bindir at Base 5.1.2
+ GMT_runtime_libdir at Base 5.1.2
+ GMT_strlcmp at Base 5.1.2
+ GMT_strlshift at Base 5.1.2
+ GMT_strrepc at Base 5.1.2
+ GMT_strstrip at Base 5.1.2
+ GMT_strtok at Base 5.1.2
+ GMT_verify_sharedir_version at Base 5.1.2
+ New_PSL_Ctrl at Base 5.1.2
+ PDF_transparency_modes at Base 5.1.2
+ PSL_beginaxes at Base 5.1.2
+ PSL_beginclipping at Base 5.1.2
+ PSL_beginlayer at Base 5.1.2
+ PSL_beginplot at Base 5.1.2
+ PSL_beginsession at Base 5.1.2
+ PSL_command at Base 5.1.2
+ PSL_comment at Base 5.1.2
+ PSL_defcolor at Base 5.1.2
+ PSL_definteger at Base 5.1.2
+ PSL_defpen at Base 5.1.2
+ PSL_defpoints at Base 5.1.2
+ PSL_deftextdim at Base 5.1.2
+ PSL_defunits at Base 5.1.2
+ PSL_endaxes at Base 5.1.2
+ PSL_endclipping at Base 5.1.2
+ PSL_endlayer at Base 5.1.2
+ PSL_endplot at Base 5.1.2
+ PSL_endsession at Base 5.1.2
+ PSL_fopen at Base 5.1.2
+ PSL_free_nonmacro at Base 5.1.2
+ PSL_initerr at Base 5.1.2
+ PSL_loadimage at Base 5.1.2
+ PSL_makepen at Base 5.1.2
+ PSL_message at Base 5.1.2
+ PSL_plotarc at Base 5.1.2
+ PSL_plotaxis at Base 5.1.2
+ PSL_plotbitimage at Base 5.1.2
+ PSL_plotbox at Base 5.1.2
+ PSL_plotcolorimage at Base 5.1.2
+ PSL_plotepsimage at Base 5.1.2
+ PSL_plotline at Base 5.1.2
+ PSL_plotparagraph at Base 5.1.2
+ PSL_plotparagraphbox at Base 5.1.2
+ PSL_plotpoint at Base 5.1.2
+ PSL_plotpolygon at Base 5.1.2
+ PSL_plotsegment at Base 5.1.2
+ PSL_plotsymbol at Base 5.1.2
+ PSL_plottext at Base 5.1.2
+ PSL_plottextbox at Base 5.1.2
+ PSL_plottextline at Base 5.1.2
+ PSL_setcolor at Base 5.1.2
+ PSL_setdash at Base 5.1.2
+ PSL_setdefaults at Base 5.1.2
+ PSL_setfill at Base 5.1.2
+ PSL_setfont at Base 5.1.2
+ PSL_setfontdims at Base 5.1.2
+ PSL_setformat at Base 5.1.2
+ PSL_setlinecap at Base 5.1.2
+ PSL_setlinejoin at Base 5.1.2
+ PSL_setlinewidth at Base 5.1.2
+ PSL_setmiterlimit at Base 5.1.2
+ PSL_setorigin at Base 5.1.2
+ PSL_setparagraph at Base 5.1.2
+ PSL_setpattern at Base 5.1.2
+ PSL_settransparencymode at Base 5.1.2
+ match_string_in_file at Base 5.1.2
+ psl_a85_encode at Base 5.1.2
+ psl_add_word_part at Base 5.1.2
+ psl_bitimage_cmap at Base 5.1.2
+ psl_bitreduce at Base 5.1.2
+ psl_cmyk_encode at Base 5.1.2
+ psl_cmyk_to_rgb at Base 5.1.2
+ psl_comp_long_asc at Base 5.1.2
+ psl_comp_rgb_asc at Base 5.1.2
+ psl_def_font_encoding at Base 5.1.2
+ psl_deflate_encode at Base 5.1.2
+ psl_defunits_array at Base 5.1.2
+ psl_encodefont at Base 5.1.2
+ psl_freewords at Base 5.1.2
+ psl_get_boundingbox at Base 5.1.2
+ psl_get_origin at Base 5.1.2
+ psl_get_uppercase at Base 5.1.2
+ psl_getsharepath at Base 5.1.2
+ psl_gray_encode at Base 5.1.2
+ psl_ip at Base 5.1.2
+ psl_ix at Base 5.1.2
+ psl_iy at Base 5.1.2
+ psl_iz at Base 5.1.2
+ psl_load_eps at Base 5.1.2
+ psl_load_raster at Base 5.1.2
+ psl_lzw_encode at Base 5.1.2
+ psl_lzw_putcode at Base 5.1.2
+ psl_makecolormap at Base 5.1.2
+ psl_matharc at Base 5.1.2
+ psl_mathrightangle at Base 5.1.2
+ psl_memory at Base 5.1.2
+ psl_paragraphprocess at Base 5.1.2
+ psl_patch at Base 5.1.2
+ psl_pattern_cleanup at Base 5.1.2
+ psl_pattern_init at Base 5.1.2
+ psl_prepare_text at Base 5.1.2
+ psl_putcolor at Base 5.1.2
+ psl_putdash at Base 5.1.2
+ psl_putfont at Base 5.1.2
+ psl_putusername at Base 5.1.2
+ psl_read_rasheader at Base 5.1.2
+ psl_remove_spaces at Base 5.1.2
+ psl_rgb_to_cmyk at Base 5.1.2
+ psl_rgb_to_cmyk_char at Base 5.1.2
+ psl_rgb_to_hsv at Base 5.1.2
+ psl_rle_decode at Base 5.1.2
+ psl_rle_encode at Base 5.1.2
+ psl_set_attr_arrays at Base 5.1.2
+ psl_set_int_array at Base 5.1.2
+ psl_set_path_arrays at Base 5.1.2
+ psl_set_real_array at Base 5.1.2
+ psl_set_reducedpath_arrays at Base 5.1.2
+ psl_set_txt_array at Base 5.1.2
+ psl_shorten_path at Base 5.1.2
+ psl_stream_dump at Base 5.1.2
+ psl_vector at Base 5.1.2
+ stresep at Base 5.1.2
+ strsepz at Base 5.1.2
libgmt.so.5 libgmt5 #MINVER#
ASCII_free at Base 5.1.2
ASCII_read at Base 5.1.2
@@ -2650,132 +2779,3 @@ libgmt.so.5 libgmt5 #MINVER#
write_output_trend1d at Base 5.1.2
write_output_trend2d at Base 5.1.2
write_record at Base 5.1.2
-libpsl.so.5 libgmt5 #MINVER#
- GMT_basename at Base 5.1.2
- GMT_chop at Base 5.1.2
- GMT_chop_ext at Base 5.1.2
- GMT_cr2lf at Base 5.1.2
- GMT_guess_sharedir at Base 5.1.2
- GMT_runtime_bindir at Base 5.1.2
- GMT_runtime_libdir at Base 5.1.2
- GMT_strlcmp at Base 5.1.2
- GMT_strlshift at Base 5.1.2
- GMT_strrepc at Base 5.1.2
- GMT_strstrip at Base 5.1.2
- GMT_strtok at Base 5.1.2
- GMT_verify_sharedir_version at Base 5.1.2
- New_PSL_Ctrl at Base 5.1.2
- PDF_transparency_modes at Base 5.1.2
- PSL_beginaxes at Base 5.1.2
- PSL_beginclipping at Base 5.1.2
- PSL_beginlayer at Base 5.1.2
- PSL_beginplot at Base 5.1.2
- PSL_beginsession at Base 5.1.2
- PSL_command at Base 5.1.2
- PSL_comment at Base 5.1.2
- PSL_defcolor at Base 5.1.2
- PSL_definteger at Base 5.1.2
- PSL_defpen at Base 5.1.2
- PSL_defpoints at Base 5.1.2
- PSL_deftextdim at Base 5.1.2
- PSL_defunits at Base 5.1.2
- PSL_endaxes at Base 5.1.2
- PSL_endclipping at Base 5.1.2
- PSL_endlayer at Base 5.1.2
- PSL_endplot at Base 5.1.2
- PSL_endsession at Base 5.1.2
- PSL_fopen at Base 5.1.2
- PSL_free_nonmacro at Base 5.1.2
- PSL_initerr at Base 5.1.2
- PSL_loadimage at Base 5.1.2
- PSL_makepen at Base 5.1.2
- PSL_message at Base 5.1.2
- PSL_plotarc at Base 5.1.2
- PSL_plotaxis at Base 5.1.2
- PSL_plotbitimage at Base 5.1.2
- PSL_plotbox at Base 5.1.2
- PSL_plotcolorimage at Base 5.1.2
- PSL_plotepsimage at Base 5.1.2
- PSL_plotline at Base 5.1.2
- PSL_plotparagraph at Base 5.1.2
- PSL_plotparagraphbox at Base 5.1.2
- PSL_plotpoint at Base 5.1.2
- PSL_plotpolygon at Base 5.1.2
- PSL_plotsegment at Base 5.1.2
- PSL_plotsymbol at Base 5.1.2
- PSL_plottext at Base 5.1.2
- PSL_plottextbox at Base 5.1.2
- PSL_plottextline at Base 5.1.2
- PSL_setcolor at Base 5.1.2
- PSL_setdash at Base 5.1.2
- PSL_setdefaults at Base 5.1.2
- PSL_setfill at Base 5.1.2
- PSL_setfont at Base 5.1.2
- PSL_setfontdims at Base 5.1.2
- PSL_setformat at Base 5.1.2
- PSL_setlinecap at Base 5.1.2
- PSL_setlinejoin at Base 5.1.2
- PSL_setlinewidth at Base 5.1.2
- PSL_setmiterlimit at Base 5.1.2
- PSL_setorigin at Base 5.1.2
- PSL_setparagraph at Base 5.1.2
- PSL_setpattern at Base 5.1.2
- PSL_settransparencymode at Base 5.1.2
- match_string_in_file at Base 5.1.2
- psl_a85_encode at Base 5.1.2
- psl_add_word_part at Base 5.1.2
- psl_bitimage_cmap at Base 5.1.2
- psl_bitreduce at Base 5.1.2
- psl_cmyk_encode at Base 5.1.2
- psl_cmyk_to_rgb at Base 5.1.2
- psl_comp_long_asc at Base 5.1.2
- psl_comp_rgb_asc at Base 5.1.2
- psl_def_font_encoding at Base 5.1.2
- psl_deflate_encode at Base 5.1.2
- psl_defunits_array at Base 5.1.2
- psl_encodefont at Base 5.1.2
- psl_freewords at Base 5.1.2
- psl_get_boundingbox at Base 5.1.2
- psl_get_origin at Base 5.1.2
- psl_get_uppercase at Base 5.1.2
- psl_getsharepath at Base 5.1.2
- psl_gray_encode at Base 5.1.2
- psl_ip at Base 5.1.2
- psl_ix at Base 5.1.2
- psl_iy at Base 5.1.2
- psl_iz at Base 5.1.2
- psl_load_eps at Base 5.1.2
- psl_load_raster at Base 5.1.2
- psl_lzw_encode at Base 5.1.2
- psl_lzw_putcode at Base 5.1.2
- psl_makecolormap at Base 5.1.2
- psl_matharc at Base 5.1.2
- psl_mathrightangle at Base 5.1.2
- psl_memory at Base 5.1.2
- psl_paragraphprocess at Base 5.1.2
- psl_patch at Base 5.1.2
- psl_pattern_cleanup at Base 5.1.2
- psl_pattern_init at Base 5.1.2
- psl_prepare_text at Base 5.1.2
- psl_putcolor at Base 5.1.2
- psl_putdash at Base 5.1.2
- psl_putfont at Base 5.1.2
- psl_putusername at Base 5.1.2
- psl_read_rasheader at Base 5.1.2
- psl_remove_spaces at Base 5.1.2
- psl_rgb_to_cmyk at Base 5.1.2
- psl_rgb_to_cmyk_char at Base 5.1.2
- psl_rgb_to_hsv at Base 5.1.2
- psl_rle_decode at Base 5.1.2
- psl_rle_encode at Base 5.1.2
- psl_set_attr_arrays at Base 5.1.2
- psl_set_int_array at Base 5.1.2
- psl_set_path_arrays at Base 5.1.2
- psl_set_real_array at Base 5.1.2
- psl_set_reducedpath_arrays at Base 5.1.2
- psl_set_txt_array at Base 5.1.2
- psl_shorten_path at Base 5.1.2
- psl_stream_dump at Base 5.1.2
- psl_vector at Base 5.1.2
- stresep at Base 5.1.2
- strsepz at Base 5.1.2
diff --git a/debian/patches/rename-libpsl-to-libgmt-psl.patch b/debian/patches/rename-libpsl-to-libgmt-psl.patch
new file mode 100644
index 0000000..cf2d72e
--- /dev/null
+++ b/debian/patches/rename-libpsl-to-libgmt-psl.patch
@@ -0,0 +1,16 @@
+Description: Rename psl library to gmt-psl to resolve conflict with libpsl.
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug: http://gmt.soest.hawaii.edu/issues/723
+Bug-Debian: https://bugs.debian.org/790524
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -308,7 +308,7 @@ endif (HAVE_ZLIB)
+ # set the build version (VERSION) and the API version (SOVERSION)
+ set_target_properties (pslib
+ PROPERTIES
+- OUTPUT_NAME psl
++ OUTPUT_NAME gmt-psl
+ PREFIX "${LIB_PREFIX}"
+ IMPORT_PREFIX "${LIB_PREFIX}"
+ VERSION ${GMT_LIB_VERSION}
diff --git a/debian/patches/series b/debian/patches/series
index 7ac938a..ae9a6fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ kfreebsd.patch
mips.patch
manpage-section.patch
dont-use-timestamped-gzip.patch
+rename-libpsl-to-libgmt-psl.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gmt.git
More information about the Pkg-grass-devel
mailing list