[Proj] Missing proj_def.dat in 4.9.1 release

[Greg Troxel]

Sebastiaan Couwenberg <sebastic at xs4all.nl> writes:

> On 07-09-15 11:40, Even Rouault wrote:
>> And I've added also additional fixes : proj_def.dat was also missing in cmake, 
>> and there were also other 4 files in nad/ that weren't in the EXTRA_DIST.
>
> The new files in nad/ in 4.9.2 compared with 4.9.1 are:
>
>  nad/ntf_r93.gsb
>  nad/ntv1_can.dat
>  nad/null.lla
>  nad/nzgd2kgrid0005.gsb
>  nad/proj_def.dat
>  nad/testflaky
>  nad/tf_out.dist
>
> This now duplicates files that are also extracted from the
> proj-datumgrids zipfile.

I updated pkgsrc to 4.9.2RC1 (locally) and was going to post the same
thing.

> ntf_r93.gsb, ntv1_can.dat & nzgd2kgrid0005.gsb are included in
> proj-datumgrid-1.5 & proj-datumgrid-1.6RC1 too.
>
> null.lla is only in proj-datumgrid-1.5, because proj-datumgrid-1.6RC1
> has switched to the "CTable2" format that doesn't require compiling the
> .lla files anymore.

I see the same 4 files, and have:

DATUMGRID_FILES_SAME= ntv1_can.dat ntf_r93.gsb null.lla  nzgd2kgrid0005.gsb

In building the package, the other files are linked into nad/ and those
are checked for being the same.

(I wonder why we don't just add all of these to proj proper and drop the
datumgrid distribution entirely.)


Nits:

  The 4.9.2RC1 unpacked to 4.9.2, not 4.9.2RC1.  The normal expectation
  is that the tarball name and the unpack directory are the same.  But I
  gather the version is not set to RC1 in configure.in.

  NEWS does not mention anything about what's in 4.9.2.   It
  doesn't mention the extra 4 grid files.  It doesn't mention the
  restored proj_def.dat.  It would be good to look at the history and
  spiff up NEWS.

  I found the following changes in the set of installed files:

    diff -u -p -u -0 -r1.3 PLIST
    --- PLIST       14 Mar 2015 17:59:10 -0000      1.3
    +++ PLIST       8 Sep 2015 23:46:21 -0000
    @@ -20,0 +21 @@ share/proj/CH
    +share/proj/CMakeLists.txt
    @@ -33,0 +35 @@ share/proj/hawaii
    +share/proj/makefile.vc
    @@ -39,0 +42 @@ share/proj/null
    +share/proj/null.lla
    @@ -41,0 +45,2 @@ share/proj/other.extra
    +share/proj/proj_def.dat
    +share/proj/proj_outIGNF.dist
    @@ -45,0 +51 @@ share/proj/stpaul
    +share/proj/testIGNF

I'm not sure if these are intended or not; they should either be fixed
or listed in NEWS.

> I think only nad/proj_def.dat, nad/testflaky & nad/tf_out.dist should be
> included in proj 4.9.2, the others should remain in proj-datumgrid.

That's an entirely reasonable position.  The other is to include all of
them and get rid of proj-datumgrid.


I don't mean to sound complaining; this is why we have RCs.  Thanks for
doing it and I think an RC2 is in order after things are addressed.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 180 bytes
Desc: not available
Url : http://lists.maptools.org/pipermail/proj/attachments/20150908/549a1540/attachment.pgp