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 <sebas...@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 <sebas...@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@Base 5.1.2
+ GMT_chop@Base 5.1.2
+ GMT_chop_ext@Base 5.1.2
+ GMT_cr2lf@Base 5.1.2
+ GMT_guess_sharedir@Base 5.1.2
+ GMT_runtime_bindir@Base 5.1.2
+ GMT_runtime_libdir@Base 5.1.2
+ GMT_strlcmp@Base 5.1.2
+ GMT_strlshift@Base 5.1.2
+ GMT_strrepc@Base 5.1.2
+ GMT_strstrip@Base 5.1.2
+ GMT_strtok@Base 5.1.2
+ GMT_verify_sharedir_version@Base 5.1.2
+ New_PSL_Ctrl@Base 5.1.2
+ PDF_transparency_modes@Base 5.1.2
+ PSL_beginaxes@Base 5.1.2
+ PSL_beginclipping@Base 5.1.2
+ PSL_beginlayer@Base 5.1.2
+ PSL_beginplot@Base 5.1.2
+ PSL_beginsession@Base 5.1.2
+ PSL_command@Base 5.1.2
+ PSL_comment@Base 5.1.2
+ PSL_defcolor@Base 5.1.2
+ PSL_definteger@Base 5.1.2
+ PSL_defpen@Base 5.1.2
+ PSL_defpoints@Base 5.1.2
+ PSL_deftextdim@Base 5.1.2
+ PSL_defunits@Base 5.1.2
+ PSL_endaxes@Base 5.1.2
+ PSL_endclipping@Base 5.1.2
+ PSL_endlayer@Base 5.1.2
+ PSL_endplot@Base 5.1.2
+ PSL_endsession@Base 5.1.2
+ PSL_fopen@Base 5.1.2
+ PSL_free_nonmacro@Base 5.1.2
+ PSL_initerr@Base 5.1.2
+ PSL_loadimage@Base 5.1.2
+ PSL_makepen@Base 5.1.2
+ PSL_message@Base 5.1.2
+ PSL_plotarc@Base 5.1.2
+ PSL_plotaxis@Base 5.1.2
+ PSL_plotbitimage@Base 5.1.2
+ PSL_plotbox@Base 5.1.2
+ PSL_plotcolorimage@Base 5.1.2
+ PSL_plotepsimage@Base 5.1.2
+ PSL_plotline@Base 5.1.2
+ PSL_plotparagraph@Base 5.1.2
+ PSL_plotparagraphbox@Base 5.1.2
+ PSL_plotpoint@Base 5.1.2
+ PSL_plotpolygon@Base 5.1.2
+ PSL_plotsegment@Base 5.1.2
+ PSL_plotsymbol@Base 5.1.2
+ PSL_plottext@Base 5.1.2
+ PSL_plottextbox@Base 5.1.2
+ PSL_plottextline@Base 5.1.2
+ PSL_setcolor@Base 5.1.2
+ PSL_setdash@Base 5.1.2
+ PSL_setdefaults@Base 5.1.2
+ PSL_setfill@Base 5.1.2
+ PSL_setfont@Base 5.1.2
+ PSL_setfontdims@Base 5.1.2
+ PSL_setformat@Base 5.1.2
+ PSL_setlinecap@Base 5.1.2
+ PSL_setlinejoin@Base 5.1.2
+ PSL_setlinewidth@Base 5.1.2
+ PSL_setmiterlimit@Base 5.1.2
+ PSL_setorigin@Base 5.1.2
+ PSL_setparagraph@Base 5.1.2
+ PSL_setpattern@Base 5.1.2
+ PSL_settransparencymode@Base 5.1.2
+ match_string_in_file@Base 5.1.2
+ psl_a85_encode@Base 5.1.2
+ psl_add_word_part@Base 5.1.2
+ psl_bitimage_cmap@Base 5.1.2
+ psl_bitreduce@Base 5.1.2
+ psl_cmyk_encode@Base 5.1.2
+ psl_cmyk_to_rgb@Base 5.1.2
+ psl_comp_long_asc@Base 5.1.2
+ psl_comp_rgb_asc@Base 5.1.2
+ psl_def_font_encoding@Base 5.1.2
+ psl_deflate_encode@Base 5.1.2
+ psl_defunits_array@Base 5.1.2
+ psl_encodefont@Base 5.1.2
+ psl_freewords@Base 5.1.2
+ psl_get_boundingbox@Base 5.1.2
+ psl_get_origin@Base 5.1.2
+ psl_get_uppercase@Base 5.1.2
+ psl_getsharepath@Base 5.1.2
+ psl_gray_encode@Base 5.1.2
+ psl_ip@Base 5.1.2
+ psl_ix@Base 5.1.2
+ psl_iy@Base 5.1.2
+ psl_iz@Base 5.1.2
+ psl_load_eps@Base 5.1.2
+ psl_load_raster@Base 5.1.2
+ psl_lzw_encode@Base 5.1.2
+ psl_lzw_putcode@Base 5.1.2
+ psl_makecolormap@Base 5.1.2
+ psl_matharc@Base 5.1.2
+ psl_mathrightangle@Base 5.1.2
+ psl_memory@Base 5.1.2
+ psl_paragraphprocess@Base 5.1.2
+ psl_patch@Base 5.1.2
+ psl_pattern_cleanup@Base 5.1.2
+ psl_pattern_init@Base 5.1.2
+ psl_prepare_text@Base 5.1.2
+ psl_putcolor@Base 5.1.2
+ psl_putdash@Base 5.1.2
+ psl_putfont@Base 5.1.2
+ psl_putusername@Base 5.1.2
+ psl_read_rasheader@Base 5.1.2
+ psl_remove_spaces@Base 5.1.2
+ psl_rgb_to_cmyk@Base 5.1.2
+ psl_rgb_to_cmyk_char@Base 5.1.2
+ psl_rgb_to_hsv@Base 5.1.2
+ psl_rle_decode@Base 5.1.2
+ psl_rle_encode@Base 5.1.2
+ psl_set_attr_arrays@Base 5.1.2
+ psl_set_int_array@Base 5.1.2
+ psl_set_path_arrays@Base 5.1.2
+ psl_set_real_array@Base 5.1.2
+ psl_set_reducedpath_arrays@Base 5.1.2
+ psl_set_txt_array@Base 5.1.2
+ psl_shorten_path@Base 5.1.2
+ psl_stream_dump@Base 5.1.2
+ psl_vector@Base 5.1.2
+ stresep@Base 5.1.2
+ strsepz@Base 5.1.2
libgmt.so.5 libgmt5 #MINVER#
ASCII_free@Base 5.1.2
ASCII_read@Base 5.1.2
@@ -2650,132 +2779,3 @@ libgmt.so.5 libgmt5 #MINVER#
write_output_trend1d@Base 5.1.2
write_output_trend2d@Base 5.1.2
write_record@Base 5.1.2
-libpsl.so.5 libgmt5 #MINVER#
- GMT_basename@Base 5.1.2
- GMT_chop@Base 5.1.2
- GMT_chop_ext@Base 5.1.2
- GMT_cr2lf@Base 5.1.2
- GMT_guess_sharedir@Base 5.1.2
- GMT_runtime_bindir@Base 5.1.2
- GMT_runtime_libdir@Base 5.1.2
- GMT_strlcmp@Base 5.1.2
- GMT_strlshift@Base 5.1.2
- GMT_strrepc@Base 5.1.2
- GMT_strstrip@Base 5.1.2
- GMT_strtok@Base 5.1.2
- GMT_verify_sharedir_version@Base 5.1.2
- New_PSL_Ctrl@Base 5.1.2
- PDF_transparency_modes@Base 5.1.2
- PSL_beginaxes@Base 5.1.2
- PSL_beginclipping@Base 5.1.2
- PSL_beginlayer@Base 5.1.2
- PSL_beginplot@Base 5.1.2
- PSL_beginsession@Base 5.1.2
- PSL_command@Base 5.1.2
- PSL_comment@Base 5.1.2
- PSL_defcolor@Base 5.1.2
- PSL_definteger@Base 5.1.2
- PSL_defpen@Base 5.1.2
- PSL_defpoints@Base 5.1.2
- PSL_deftextdim@Base 5.1.2
- PSL_defunits@Base 5.1.2
- PSL_endaxes@Base 5.1.2
- PSL_endclipping@Base 5.1.2
- PSL_endlayer@Base 5.1.2
- PSL_endplot@Base 5.1.2
- PSL_endsession@Base 5.1.2
- PSL_fopen@Base 5.1.2
- PSL_free_nonmacro@Base 5.1.2
- PSL_initerr@Base 5.1.2
- PSL_loadimage@Base 5.1.2
- PSL_makepen@Base 5.1.2
- PSL_message@Base 5.1.2
- PSL_plotarc@Base 5.1.2
- PSL_plotaxis@Base 5.1.2
- PSL_plotbitimage@Base 5.1.2
- PSL_plotbox@Base 5.1.2
- PSL_plotcolorimage@Base 5.1.2
- PSL_plotepsimage@Base 5.1.2
- PSL_plotline@Base 5.1.2
- PSL_plotparagraph@Base 5.1.2
- PSL_plotparagraphbox@Base 5.1.2
- PSL_plotpoint@Base 5.1.2
- PSL_plotpolygon@Base 5.1.2
- PSL_plotsegment@Base 5.1.2
- PSL_plotsymbol@Base 5.1.2
- PSL_plottext@Base 5.1.2
- PSL_plottextbox@Base 5.1.2
- PSL_plottextline@Base 5.1.2
- PSL_setcolor@Base 5.1.2
- PSL_setdash@Base 5.1.2
- PSL_setdefaults@Base 5.1.2
- PSL_setfill@Base 5.1.2
- PSL_setfont@Base 5.1.2
- PSL_setfontdims@Base 5.1.2
- PSL_setformat@Base 5.1.2
- PSL_setlinecap@Base 5.1.2
- PSL_setlinejoin@Base 5.1.2
- PSL_setlinewidth@Base 5.1.2
- PSL_setmiterlimit@Base 5.1.2
- PSL_setorigin@Base 5.1.2
- PSL_setparagraph@Base 5.1.2
- PSL_setpattern@Base 5.1.2
- PSL_settransparencymode@Base 5.1.2
- match_string_in_file@Base 5.1.2
- psl_a85_encode@Base 5.1.2
- psl_add_word_part@Base 5.1.2
- psl_bitimage_cmap@Base 5.1.2
- psl_bitreduce@Base 5.1.2
- psl_cmyk_encode@Base 5.1.2
- psl_cmyk_to_rgb@Base 5.1.2
- psl_comp_long_asc@Base 5.1.2
- psl_comp_rgb_asc@Base 5.1.2
- psl_def_font_encoding@Base 5.1.2
- psl_deflate_encode@Base 5.1.2
- psl_defunits_array@Base 5.1.2
- psl_encodefont@Base 5.1.2
- psl_freewords@Base 5.1.2
- psl_get_boundingbox@Base 5.1.2
- psl_get_origin@Base 5.1.2
- psl_get_uppercase@Base 5.1.2
- psl_getsharepath@Base 5.1.2
- psl_gray_encode@Base 5.1.2
- psl_ip@Base 5.1.2
- psl_ix@Base 5.1.2
- psl_iy@Base 5.1.2
- psl_iz@Base 5.1.2
- psl_load_eps@Base 5.1.2
- psl_load_raster@Base 5.1.2
- psl_lzw_encode@Base 5.1.2
- psl_lzw_putcode@Base 5.1.2
- psl_makecolormap@Base 5.1.2
- psl_matharc@Base 5.1.2
- psl_mathrightangle@Base 5.1.2
- psl_memory@Base 5.1.2
- psl_paragraphprocess@Base 5.1.2
- psl_patch@Base 5.1.2
- psl_pattern_cleanup@Base 5.1.2
- psl_pattern_init@Base 5.1.2
- psl_prepare_text@Base 5.1.2
- psl_putcolor@Base 5.1.2
- psl_putdash@Base 5.1.2
- psl_putfont@Base 5.1.2
- psl_putusername@Base 5.1.2
- psl_read_rasheader@Base 5.1.2
- psl_remove_spaces@Base 5.1.2
- psl_rgb_to_cmyk@Base 5.1.2
- psl_rgb_to_cmyk_char@Base 5.1.2
- psl_rgb_to_hsv@Base 5.1.2
- psl_rle_decode@Base 5.1.2
- psl_rle_encode@Base 5.1.2
- psl_set_attr_arrays@Base 5.1.2
- psl_set_int_array@Base 5.1.2
- psl_set_path_arrays@Base 5.1.2
- psl_set_real_array@Base 5.1.2
- psl_set_reducedpath_arrays@Base 5.1.2
- psl_set_txt_array@Base 5.1.2
- psl_shorten_path@Base 5.1.2
- psl_stream_dump@Base 5.1.2
- psl_vector@Base 5.1.2
- stresep@Base 5.1.2
- strsepz@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 <sebas...@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
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
