debian/changelog

-sosi2osm (1.0.0-5) UNRELEASED; urgency=medium
+sosi2osm (1.0.0-5) unstable; urgency=medium
 
+  [ Bas Couwenberg ]
   * Bump Standards-Version to 4.2.1, no changes.
   * Update watch file to handle common issues.
 
- -- Bas Couwenberg <sebastic@debian.org>  Sun, 05 Aug 2018 21:00:14 +0200
+  [ Ruben Undheim ]
+  * debian/compat: level 11
+  * debian/control: debhelper >= 11
+  * debian/patches: Refreshed all patches using 'gbp pq'
+  * debian/tests: added autopkgtest
+  * Remove lintian override for testsuite-autopkgtest-missing.
+
+ -- Ruben Undheim <ruben.undheim@gmail.com>  Sat, 22 Sep 2018 15:37:13 +0200
 
 sosi2osm (1.0.0-4) unstable; urgency=medium
 

debian/compat

-9
+11

debian/control

@@ -3,7 +3,7 @@ Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
 Uploaders: Ruben Undheim <ruben.undheim@gmail.com>
 Section: utils
 Priority: optional
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 11),
                liblua5.1-0-dev,
                libfyba-dev,
                pkg-config,

debian/patches/01_fix_libsearchpath.patch

-Description: This patch makes sure that the dependencies are found and
+From: Ruben Undheim <ruben.undheim@gmail.com>
+Date: Sat, 22 Sep 2018 15:40:00 +0200
+Subject: This patch makes sure that the dependencies are found and
+
 that CPPFLAGS and LDFLAGS set by dh are applied during the build.
-Forwarded: done
-Author: Ruben Undheim <ruben.undheim@gmail.com>
-Index: sosi2osm/Makefile
-===================================================================
---- sosi2osm.orig/Makefile
-+++ sosi2osm/Makefile
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index cccb057..bc6a32c 100644
+--- a/Makefile
++++ b/Makefile
 @@ -1,8 +1,8 @@
  PROGNAME=sosi2osm
  OBJFILES=sosi2osm.o sosi.o tag.o node.o
  
 -CPPFLAGS = -I/usr/local/include/fyba -I/usr/include/fyba/ `pkg-config --cflags lua5.1-c++` -DLINUX -DUNIX -g
-+CPPFLAGS := $(CPPFLAGS) `pkg-config --cflags lua5.1-c++ fyba` -DLINUX -DUNIX -g
 -LDFLAGS = -lfyba -lfygm -lfyut -lproj `pkg-config --libs lua5.1-c++`
++CPPFLAGS := $(CPPFLAGS) `pkg-config --cflags lua5.1-c++ fyba` -DLINUX -DUNIX -g
 +LDFLAGS := $(LDFLAGS) -lproj `pkg-config --libs lua5.1-c++ fyba`
  
  all: $(PROGNAME)
+ 

debian/patches/02_fix_install.patch

-Description: This patch fixes the DESTDIR target
-Author: Ruben Undheim <ruben.undheim@gmail.com>
---- sosi2osm-1.0.0.orig/Makefile
-+++ sosi2osm-1.0.0/Makefile
+From: Ruben Undheim <ruben.undheim@gmail.com>
+Date: Sat, 22 Sep 2018 15:40:00 +0200
+Subject: This patch fixes the DESTDIR target
+
+===================================================================
+---
+ Makefile | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index bc6a32c..e2df03e 100644
+--- a/Makefile
++++ b/Makefile
 @@ -13,14 +13,15 @@ $(PROGNAME): $(OBJFILES)
  	$(CXX) $^ $(LDFLAGS) -o $@
  

debian/patches/spelling-errors.patch

-Description: Fix spelling errors.
- * coodinate -> coordinate
-Author: Bas Couwenberg <sebastic@debian.org>
+From: Bas Couwenberg <sebastic@debian.org>
+Date: Sat, 22 Sep 2018 15:40:00 +0200
+Subject: Fix spelling errors. * coodinate -> coordinate
 
+---
+ sosi.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sosi.cpp b/sosi.cpp
+index a94f1c7..d0d7f57 100644
 --- a/sosi.cpp
 +++ b/sosi.cpp
 @@ -98,7 +98,7 @@ const char* getCoordinateSystem() {

debian/patches/std-max.patch

-Description: Use std::max from algorithm.
-Author: Bas Couwenberg <sebastic@debian.org>
+From: Bas Couwenberg <sebastic@debian.org>
+Date: Sat, 22 Sep 2018 15:40:00 +0200
+Subject: Use std::max from algorithm.
 Bug-Debian: https://bugs.debian.org/835717
 Forwarded: https://github.com/Gnonthgol/sosi2osm/pull/6
 Applied-Upstream: https://github.com/Gnonthgol/sosi2osm/commit/4ead7f5a58fc05644ba5200a12135edd3fd37bf4
 
+---
+ node.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/node.cpp b/node.cpp
+index 21155fa..1641724 100644
 --- a/node.cpp
 +++ b/node.cpp
 @@ -1,5 +1,6 @@
@@ -13,7 +20,7 @@ Applied-Upstream: https://github.com/Gnonthgol/sosi2osm/commit/4ead7f5a58fc05644
  #include <proj_api.h>
  
  projPJ origProj, osmProj;
-@@ -51,7 +52,7 @@ long createNode(double lat, double lon,
+@@ -51,7 +52,7 @@ long createNode(double lat, double lon, short kp) {
      }
      
      if (lenM >= sizeM) {

debian/source/lintian-overrides

-# Not worth the effort
-testsuite-autopkgtest-missing
-

debian/tests/basic

+#!/bin/sh
+
+set -e
+WORKDIR=$(mktemp -d)
+trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
+
+
+echo ""
+echo "Testing with adresser.lua:"
+sosi2osm debian/tests/example.sos adresser.lua
+echo ""
+echo "Testing with default.lua:"
+sosi2osm debian/tests/example.sos default.lua
+echo ""
+echo "run: OK"

debian/tests/control

+Tests: basic
+Depends: sosi2osm

debian/tests/example.sos

+.HODE
+..TEGNSETT LATIN1
+..TRANSPAR
+...KOORDSYS 23
+...ORIGO-N 0 0
+...ENHET 0.01
+..OMRDE
+...MIN-N 6781600 163696
+...MAX-N 6826703 203546
+..SOSI-VERSJON 4.5
+..SOSI-NIV 2
+..PRODUSENT "Kartverket"
+..EIER "Kommunen og Kartverket"
+..OBJEKTKATALOG
+...KORTNAVN "Matrikkel-ADR0006"
+...OBJEKTKATALOG_FULLT_NAVN "Adresse - enkel - SOSI"
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+.PUNKT 1:
+..OBJTYPE Vegadresse
+..VEGADRESSEIDENT
+...KOMM 0544
+...ADRESSENAVN "vrebygdvegen"
+...ADRESSEKODE 1002
+...NUMMER 352
+..POSTNUMMEROMRDE
+...POSTNUMMER 2943
+...POSTSTED "ROGNE"
+..ADRESSETEKST "vrebygdvegen 352"
+..OPPDATERINGSDATO 20160929
+..KOPIDATA
+...OMRDEID 0544
+...ORIGINALDATAVERT "Matrikkelen"
+...KOPIDATO 20170626
+..N
+678821200 18354378
+.SLUTT