debian/README.Debian

@@ -27,6 +27,25 @@ Direct links to the relevant pages:
 - RDNAPTRANS2008.zip file
   https://www.kadaster.nl/documents/20838/87996/RDNAPTRANS2008/93c6e723-9e85-4b9d-abcb-a569e447d564
 
+For the 2018 update of the grids, more information (in dutch) is available
+on the Nederlandse Samenwerking Geodetische Infrastructuur (NSGI) website:
+
+https://www.nsgi.nl/geodetische-infrastructuur/producten/programma-rdnaptrans
+
+Like the 2008 grids, you need to fill inn a form before you can download
+the RDNAPTRANS.zip file.
+
+Direct links to the relevant pages:
+
+- RDNAPTRANS2018 request form
+  https://formulieren.kadaster.nl/aanvragen_rdnaptrans
+
+- RDNAPTRANS2018 download page
+  https://formulieren.kadaster.nl/page/download-rdnaptrans
+
+- RDNAPTRANS2018.zip file
+  https://kadaster.nl/documents/1888506/2496175/RDNAPTRANS.zip/827827a3-b88a-5d16-55b6-7f83010e1b2f?t=1565686584552
+
 The license contained in the RDNAPTRANS2008.zip file is problematic, because
 it doesn't allow distribution. The license is documented in the file
 "Use of RDNAPTRANS2008.doc" (use `antiword "Use of RDNAPTRANS2008.doc"` to
@@ -108,11 +127,26 @@ terminal). Quote:
  of the use of the correction grids for RD and NAP in NTv2 and Vdatum format.”
 "
 
-The get-orig-source script downloads the RDNAPTRANS2008.zip file, extracts
-the content of NTv2_2008.zip file from within it, and creates a tarball
-from the NTv2_2008.zip file content (documentation in PDF and grid files).
+The get-orig-source script used to download the RDNAPTRANS2008.zip file,
+extract the content of NTv2_2008.zip file from within it, and create a
+tarball from the NTv2_2008.zip file content (documentation in PDF and grid
+files).
+
+Because the RDNAPTRANS2008.zip file is no longer online, the get-orig-source
+script now downloads the content of the NTv2_2008.zip file from the git
+repository of the proj-rdnap Debian package.
+
+The 2018 grids have a different license, Creative Commons
+Attribution-NoDerivatives 4.0 International License (CC-BY-ND-4.0) for the
+documentation, and Creative Commons Attribution 4.0 International License
+(CC-BY-4.0) for the grid files.
+
+The get-orig-source script includes the content of the RDNAPTRANS.zip file
+as-is, the 2018 grids don't require special treatment.
+
+...
 
-To use the grid correction files the definitions as suggested by Kadaster
+To use the 2008 grid correction files the definitions as suggested by Kadaster
 are available in the /usr/share/proj/rdnap file when using PROJ < 6:
 
  # RDNAP with NTv2 and VDatum

debian/changelog

-proj-rdnap (2008-10) UNRELEASED; urgency=medium
+proj-rdnap (2008+2018-1) UNRELEASED; urgency=medium
 
+  * New upstream release.
   * Bump Standards-Version to 4.4.1, no changes.
+  * Update README.Debian & get-orig-source script for 2018 grids.
+  * Also install 2018 grids and its documentation.
+  * Update copyright for 2018 grids and its documentation.
 
- -- Bas Couwenberg <sebastic@debian.org>  Thu, 29 Aug 2019 13:06:57 +0200
+ -- Bas Couwenberg <sebastic@debian.org>  Wed, 02 Oct 2019 17:03:17 +0200
 
 proj-rdnap (2008-9) unstable; urgency=medium
 

debian/get-orig-source

 #!/bin/sh
-# if you need to repack for whatever reason you can
-# use this script via uscan or directly
 
 set -e
 
 COMPRESS=xz
 
-NAME=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
+NAME=`dpkg-parsechangelog -S Source`
 
 PACKAGE=$NAME
 
@@ -14,43 +12,37 @@ DEBIANDIR=$(readlink -f $(dirname $0))
 PACKAGEDIR=$(readlink -f $(dirname ${DEBIANDIR}))
 PARENTDIR=$(readlink -f $(dirname ${PACKAGEDIR}))
 
-CHANGELOGFILE=${DEBIANDIR}/changelog
-
 TMPDIR=$(mktemp -d)
 
 cd ${TMPDIR}
 
+VERSION="2008+2018"
+
+TARDIR=${NAME}-${VERSION}
+
 # RDNAPTRANS2008
 # https://www.kadaster.nl/documents/20838/87996/RDNAPTRANS2008/93c6e723-9e85-4b9d-abcb-a569e447d564
 #
 # Download page:
 # https://www.kadaster.nl/rdnaptrans2008-download-
 
-if ! echo $@ | grep -q upstream-version ; then
-    VERSION=`dpkg-parsechangelog -l"$CHANGELOGFILE" | awk '/^Version:/ { print $2 }' | sed 's/\([0-9\.]\+\)-[0-9]\+$/\1/'`
-    wget "https://www.kadaster.nl/documents/20838/87996/RDNAPTRANS2008/93c6e723-9e85-4b9d-abcb-a569e447d564" -O RDNAPTRANS2008.zip
-else
-    VERSION=`echo $@ | sed "s?^.*--upstream-version \([0-9.]\+\) .*${NAME}.*?\1?"`
-    if echo "$VERSION" | grep -q "upstream-version" ; then
-        echo "Unable to parse version number"
-        exit
-    fi
-fi
+wget "https://salsa.debian.org/debian-gis-team/proj-rdnap/-/archive/upstream/2008/proj-rdnap-upstream-2008.zip" -O proj-rdnap-upstream-2008.zip
 
-unzip RDNAPTRANS2008.zip -d RDNAPTRANS2008
+unzip proj-rdnap-upstream-2008.zip -d proj-rdnap-upstream-2008
 
-# RDNAPTRANS2008.zip is not redistributable! 
-# The grid correction files for PROJ are shipped in the file NTv2_2008.zip,
-# which is more permissively licensed.
+mv proj-rdnap-upstream-2008/proj-rdnap-upstream-2008 "${TARDIR}"
 
-unzip RDNAPTRANS2008/NTv2_2008.zip
+# RDNAPTRANS2018
+# https://kadaster.nl/documents/1888506/2496175/RDNAPTRANS.zip/827827a3-b88a-5d16-55b6-7f83010e1b2f
+#
+# Download page:
+# https://formulieren.kadaster.nl/page/download-rdnaptrans
 
-UPSTREAMTARDIR="NTv2_2008/"
-TARDIR=${NAME}-${VERSION}
+wget "https://kadaster.nl/documents/1888506/2496175/RDNAPTRANS.zip/827827a3-b88a-5d16-55b6-7f83010e1b2f" -O RDNAPTRANS.zip
+
+unzip RDNAPTRANS.zip -d RDNAPTRANS2018
 
-if [ "${UPSTREAMTARDIR}" != "${TARDIR}" ] ; then
-    mv "${UPSTREAMTARDIR}" "${TARDIR}"
-fi
+mv RDNAPTRANS2018/* "${TARDIR}"
 
 ORIGTARFILE="${PACKAGE}_${VERSION}.orig.tar.${COMPRESS}"
 

debian/proj-rdnap.dirs

+usr/share/proj-rdnap

debian/proj-rdnap.install

 naptrans2008.gtx usr/share/proj/
 rdtrans2008.gsb  usr/share/proj/
+
+Variant1/nlgeo2018.gtx    usr/share/proj/
+Variant1/nlgeo2018.txt    usr/share/proj-rdnap/
+Variant1/rdcorr2018.gsb   usr/share/proj/
+Variant1/rdcorr2018.txt   usr/share/proj-rdnap/
+Variant2/naptrans2018.gtx usr/share/proj/
+Variant2/naptrans2018.txt usr/share/proj-rdnap/
+Variant2/rdtrans2018.gsb  usr/share/proj/
+Variant2/rdtrans2018.txt  usr/share/proj-rdnap/