[Git][debian-gis-team/proj][master] 3 commits: Update symbols for alpha.

Bas Couwenberg gitlab at salsa.debian.org
Wed Mar 18 16:09:10 GMT 2020 


Bas Couwenberg pushed to branch master at Debian GIS Project / proj


Commits:
147b3ab3 by Bas Couwenberg at 2020-03-18T16:52:51+01:00
Update symbols for alpha.

- - - - -
8b7f0161 by Bas Couwenberg at 2020-03-18T16:53:35+01:00
Add upstream patch to fix pkg-config.

- - - - -
e5a328a5 by Bas Couwenberg at 2020-03-18T16:53:47+01:00
Set distribution to unstable.

- - - - -


4 changed files:

- debian/changelog
- debian/libproj19.symbols
- + debian/patches/0001-Autotools-pkg-conf-Define-datarootdir.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+proj (7.0.0-2) unstable; urgency=medium
+
+  * Update symbols for alpha.
+  * Add upstream patch to fix pkg-config.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 18 Mar 2020 16:53:38 +0100
+
 proj (7.0.0-1) unstable; urgency=medium
 
   * Bump debhelper compat to 10, changes:


=====================================
debian/libproj19.symbols
=====================================
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 7.0.0 arm64
+# SymbolsHelper-Confirmed: 7.0.0 alpha arm64
 libproj.so.19 #PACKAGE# #MINVER#
 * Build-Depends-Package: libproj-dev
  _Z10pj_ell_setP9projCtx_tP8ARG_listPdS3_ at Base 6.0.0
@@ -376,7 +376,7 @@ libproj.so.19 #PACKAGE# #MINVER#
  _ZN5osgeo4proj3crs9SingleCRSD1Ev at Base 6.0.0
  _ZN5osgeo4proj3crs9SingleCRSD2Ev at Base 6.0.0
  (arch=!amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZN5osgeo4proj4File9read_lineB5cxx11EjRbS2_ at Base 7.0.0
- (arch=amd64 arm64 ia64 kfreebsd-amd64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZN5osgeo4proj4File9read_lineB5cxx11EmRbS2_ at Base 7.0.0
+ _ZN5osgeo4proj4File9read_lineB5cxx11EmRbS2_ at Base 7.0.0
  _ZN5osgeo4proj4FileD0Ev at Base 7.0.0
  _ZN5osgeo4proj4FileD1Ev at Base 7.0.0
  _ZN5osgeo4proj4FileD2Ev at Base 7.0.0
@@ -1923,19 +1923,17 @@ libproj.so.19 #PACKAGE# #MINVER#
  (optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES6_ESaIS7_EE17_M_realloc_insertIJS7_EEEvN9__gnu_cxx17__normal_iteratorIPS7_S9_EEDpOT_ at Base 6.0.0
  (optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES6_ESaIS7_EEaSERKS9_ at Base 6.0.0
  (optional=templinst)_ZNSt6vectorIbSaIbEE13_M_insert_auxESt13_Bit_iteratorb at Base 6.0.0
- (optional=templinst|arch=!amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNSt6vectorIbSaIbEE14_M_fill_insertESt13_Bit_iteratorjb at Base 6.3.0
- (optional=templinst|arch=amd64 arm64 ia64 kfreebsd-amd64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZNSt6vectorIbSaIbEE14_M_fill_insertESt13_Bit_iteratormb at Base 6.3.0
+ (optional=templinst)_ZNSt6vectorIbSaIbEE14_M_fill_insertESt13_Bit_iteratormb at Base 6.3.0
  (optional=templinst)_ZNSt6vectorIbSaIbEE9push_backEb at Base 6.2.0
  (optional=templinst)_ZNSt6vectorIcSaIcEE12emplace_backIJcEEEvDpOT_ at Base 6.2.0
  (optional=templinst)_ZNSt6vectorIcSaIcEE17_M_realloc_insertIJcEEEvN9__gnu_cxx17__normal_iteratorIPcS1_EEDpOT_ at Base 6.2.0
  (optional=templinst)_ZNSt6vectorIdSaIdEE12emplace_backIJdEEEvDpOT_ at Base 6.0.0
- (optional=templinst|arch=!amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNSt6vectorIdSaIdEE17_M_default_appendEj at Base 6.3.0
- (optional=templinst|arch=amd64 arm64 ia64 kfreebsd-amd64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZNSt6vectorIdSaIdEE17_M_default_appendEm at Base 6.3.0
+ (optional=templinst)_ZNSt6vectorIdSaIdEE17_M_default_appendEm at Base 6.3.0
  (optional=templinst)_ZNSt6vectorIdSaIdEE17_M_realloc_insertIJdEEEvN9__gnu_cxx17__normal_iteratorIPdS1_EEDpOT_ at Base 6.0.0
  (optional=templinst)_ZNSt6vectorIdSaIdEEaSERKS1_ at Base 6.0.0
  (optional=templinst)_ZNSt6vectorIhSaIhEE13_M_assign_auxIPKhEEvT_S5_St20forward_iterator_tag at Base 7.0.0
  (optional=templinst|arch=!amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNSt6vectorIhSaIhEE17_M_default_appendEj at Base 7.0.0
- (optional=templinst|arch=amd64 arm64 ia64 kfreebsd-amd64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZNSt6vectorIhSaIhEE17_M_default_appendEm at Base 7.0.0
+ (optional=templinst)_ZNSt6vectorIhSaIhEE17_M_default_appendEm at Base 7.0.0
  (optional=templinst)_ZNSt6vectorIxSaIxEE17_M_realloc_insertIJxEEEvN9__gnu_cxx17__normal_iteratorIPxS1_EEDpOT_ at Base 7.0.0
  (optional=templinst)_ZNSt7__cxx1110_List_baseIN5osgeo4proj2io16AuthorityFactory7CRSInfoESaIS5_EE8_M_clearEv at Base 6.0.0
  (optional=templinst)_ZNSt7__cxx1110_List_baseINS_12basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE8_M_clearEv at Base 6.0.0
@@ -1964,7 +1962,7 @@ libproj.so.19 #PACKAGE# #MINVER#
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St6vectorIS5_SaIS5_EEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE24_M_get_insert_unique_posERS7_ at Base 6.0.0
  (optional=templinst|arch=amd64 arm64 hppa ia64 kfreebsd-amd64 m68k mips64el ppc64el riscv64 sh4 sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St6vectorIS5_SaIS5_EEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISB_ERS7_ at Base 6.0.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St6vectorIS5_SaIS5_EEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE8_M_eraseEPSt13_Rb_tree_nodeISB_E at Base 6.0.0
- (optional=templinst|arch=!hurd-i386 !i386 !kfreebsd-i386 !mipsel !powerpc !ppc64 !s390x)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St6vectorIS6_IS5_S5_ESaIS9_EEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJOS5_EESN_IJEEEEESt17_Rb_tree_iteratorISC_ESt23_Rb_tree_const_iteratorISC_EDpOT_ at Base 6.3.1
+ (optional=templinst|arch=!alpha !hurd-i386 !i386 !kfreebsd-i386 !mipsel !powerpc !ppc64 !s390x)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St6vectorIS6_IS5_S5_ESaIS9_EEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJOS5_EESN_IJEEEEESt17_Rb_tree_iteratorISC_ESt23_Rb_tree_const_iteratorISC_EDpOT_ at Base 6.3.1
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St6vectorIS6_IS5_S5_ESaIS9_EEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE24_M_get_insert_unique_posERS7_ at Base 6.3.1
  (optional=templinst|arch=amd64 arm64 hppa ia64 kfreebsd-amd64 m68k mips64el ppc64el riscv64 sh4 sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St6vectorIS6_IS5_S5_ESaIS9_EEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISC_ERS7_ at Base 6.3.1
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St6vectorIS6_IS5_S5_ESaIS9_EEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE4findERS7_ at Base 6.3.1
@@ -1992,7 +1990,7 @@ libproj.so.19 #PACKAGE# #MINVER#
  (optional=templinst)_ZNSt8_Rb_treeISt4pairIiNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEES0_IKS7_S6_ESt10_Select1stIS9_ESt4lessIS7_ESaIS9_EE24_M_get_insert_unique_posERS8_ at Base 7.0.0
  (optional=templinst)_ZNSt8_Rb_treeISt4pairIiNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEES0_IKS7_S6_ESt10_Select1stIS9_ESt4lessIS7_ESaIS9_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS9_ERS8_ at Base 7.0.0
  (optional=templinst)_ZNSt8_Rb_treeISt4pairIiNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEES0_IKS7_S6_ESt10_Select1stIS9_ESt4lessIS7_ESaIS9_EE8_M_eraseEPSt13_Rb_tree_nodeIS9_E at Base 7.0.0
- (optional=templinst|arch=armel armhf hurd-i386 i386 kfreebsd-i386 mipsel powerpc ppc64 s390x)_ZNSt8_Rb_treeIiSt4pairIKidESt10_Select1stIS2_ESt4lessIiESaIS2_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS1_EESD_IJEEEEESt17_Rb_tree_iteratorIS2_ESt23_Rb_tree_const_iteratorIS2_EDpOT_ at Base 7.0.0
+ (optional=templinst|arch=alpha armel armhf hurd-i386 i386 kfreebsd-i386 mipsel powerpc ppc64 s390x)_ZNSt8_Rb_treeIiSt4pairIKidESt10_Select1stIS2_ESt4lessIiESaIS2_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS1_EESD_IJEEEEESt17_Rb_tree_iteratorIS2_ESt23_Rb_tree_const_iteratorIS2_EDpOT_ at Base 7.0.0
  (optional=templinst)_ZNSt8_Rb_treeIiSt4pairIKidESt10_Select1stIS2_ESt4lessIiESaIS2_EE24_M_get_insert_unique_posERS1_ at Base 7.0.0
  (optional=templinst|arch=!armel !armhf !hurd-i386 !i386 !kfreebsd-i386 !mipsel !powerpc !ppc64 !s390x)_ZNSt8_Rb_treeIiSt4pairIKidESt10_Select1stIS2_ESt4lessIiESaIS2_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS2_ERS1_ at Base 7.0.0
  (optional=templinst)_ZNSt8_Rb_treeIiSt4pairIKidESt10_Select1stIS2_ESt4lessIiESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E at Base 7.0.0


=====================================
debian/patches/0001-Autotools-pkg-conf-Define-datarootdir.patch
=====================================
@@ -0,0 +1,28 @@
+Description: Autotools/pkg-conf: Define datarootdir
+ Fixes:
+ $ pkg-config proj --variable=prefix
+ Variable 'datarootdir' not defined in '/usr/lib/x86_64-linux-gnu/pkgconfig/proj.pc'
+Author: Mike Taves <mwtoews at gmail.com>
+Origin: https://github.com/OSGeo/PROJ/commit/d8835f1288207ba9a7e78082050ef61af3ded1e3
+Bug: https://github.com/OSGeo/PROJ/pull/2064
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -360,7 +360,4 @@ fi
+ 
+ AC_CONFIG_FILES([proj.pc])
+ 
+-dnl Ignore WARNING:  'proj.pc.in' seems to ignore the --datarootdir setting
+-AC_DEFUN([AC_DATAROOTDIR_CHECKED])
+-
+ AC_OUTPUT
+--- a/proj.pc.in
++++ b/proj.pc.in
+@@ -2,6 +2,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
++datarootdir=@datarootdir@
+ datadir=@datadir@/@PACKAGE@
+ 
+ Name: PROJ


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+0001-Autotools-pkg-conf-Define-datarootdir.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/proj/-/compare/e79a5c1cc4db2ddb06b7d581a5aac74edd8ffdbd...e5a328a57f21d0c85c23bfa17b5cc8092b97fd4b

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/proj/-/compare/e79a5c1cc4db2ddb06b7d581a5aac74edd8ffdbd...e5a328a57f21d0c85c23bfa17b5cc8092b97fd4b
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200318/bad95e00/attachment-0001.html>

More information about the Pkg-grass-devel mailing list