[sosi2osm] 12/19: Gotten rid of many lintians

Sat Oct 4 13:08:54 UTC 2014

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository sosi2osm.

commit 0635f9042bdd4b1c4d4a39e6d7ec96c6e1f91c3a
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Fri Sep 5 17:47:29 2014 +0000

    Gotten rid of many lintians
---
 debian/changelog                          |  4 ++--
 debian/control                            |  8 +++++---
 debian/copyright                          | 33 +++++++++++++++++--------------
 debian/patches/01_fix_libsearchpath.patch |  6 +++++-
 debian/watch                              |  2 ++
 5 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 25125b0..67dcfdc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-sosi2osm (20140707git634fc65-1~trusty) trusty; urgency=low
+sosi2osm (20140707git634fc65-1~trusty) unstable; urgency=low
 
   * Initial release
 
- -- Ruben Undheim <ruben.undheim at gmail.com>  Mon, 07 Jul 2014 15:18:09 +0200
+ -- Ruben Undheim <ruben.undheim at gmail.com>  Fri, 05 Sep 2014 19:38:09 +0200
diff --git a/debian/control b/debian/control
index 60876de..425cf5d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,16 @@ Source: sosi2osm
 Section: utils
 Priority: optional
 Maintainer: Ruben Undheim <ruben.undheim at gmail.com>
-Build-Depends: debhelper (>= 8.0.0), liblua5.1-0-dev, libfyba-dev, pkg-config, libproj-dev
+Build-Depends: debhelper (>= 9.0.0), liblua5.1-0-dev, libfyba-dev, pkg-config, libproj-dev
 Standards-Version: 3.9.5
+Vcs-Git: git://github.com/rubund/sosi2osm.git -b debian
+Vcs-Browser: https://github.com/rubund/sosi2osm/tree/debian
 Homepage: https://github.com/Gnonthgol/sosi2osm
-Vcs-Git: https://github.com/Gnonthgol/sosi2osm.git
 
 Package: sosi2osm
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: SOSI to OSM converter
  This little utility converts .sosi files into .osm files which are 
- used by OpenStreetMap.
+ used by OpenStreetMap. It relies on the FYBA library released by the
+ Norwegian Mapping Authority (Statens kartverk).
diff --git a/debian/copyright b/debian/copyright
index cdc7dde..d50e84f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,20 +1,28 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: sosi2osm
-Source: <url://example.com>
+Source: https://github.com/Gnonthgol/sosi2osm/ 
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: <special license>
- <Put the license of the package here indented by 1 space>
- <This follows the format of Description: lines in control file>
+Copyright: 2013-2014 Knut Karevoll <gnonthgol at gmail.com>
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
  .
- <Including paragraphs>
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
-# If you want to use GPL v2 or later for the /debian/* files use 
-# the following clauses, or change it to suit. Delete these two lines
 Files: debian/*
-Copyright: 2014 Ruben <ruben at flodsvin>
+Copyright: 2014 Ruben Undheim <ruben.undheim at gmail.com>
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -31,8 +39,3 @@ License: GPL-2+
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
-# Please avoid to pick license terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.
diff --git a/debian/patches/01_fix_libsearchpath.patch b/debian/patches/01_fix_libsearchpath.patch
index db88e25..879db61 100644
--- a/debian/patches/01_fix_libsearchpath.patch
+++ b/debian/patches/01_fix_libsearchpath.patch
@@ -1,3 +1,7 @@
+Description: This patch makes sure that the dependencies are found and
+  that CPPFLAGS and LDFLAGS set by dh are applied during the build.
+Forwarded: will do
+Author: Ruben Undheim <ruben.undheim at gmail.com>
 Index: sosi2osm/Makefile
 ===================================================================
 --- sosi2osm.orig/Makefile
@@ -7,7 +11,7 @@ Index: sosi2osm/Makefile
  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 = `pkg-config --cflags lua5.1-c++ fyba` -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++`
 +LDFLAGS := $(LDFLAGS) -lproj `pkg-config --libs lua5.1-c++ fyba`
  
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..e327227
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+https://github.com/Gnonthgol/sosi2osm/releases /Gnonthgol/sosi2osm/archive/(\d\S+)\.tar\.(?:bz2|gz|xz)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/sosi2osm.git

