Merge ~jelmer/ubuntu/+source/geonames:lintian-fixes into ubuntu/+source/geonames:ubuntu/devel

[Jelmer Vernooij]

Fix some issues reported by lintian
* Use correct machine-readable copyright file URI.
* Use secure URI in Vcs control header.

[Robie Basak (racb)]

Thank you for contributing these changes.

Please note that we don't yet have a process for arranging general sponsorship for MPs submitted through git-ubuntu. As these changes are so trivial, I don't think it's worth me spending time on arranging this right now.

Ideally these would appear in http://reqorts.qa.ubuntu.com/reports/sponsoring/index.html but they currently do not.

A contribution to adjust that report would be welcome.

Alternatively you could file a bug, subscribe ~ubuntu-sponsors and link this MP to it.

Until then I suspect this MP won't get looked at. Sorry!

[Dimitri John Ledkov (xnox)]

Can I somehow claim this review?

[Dimitri John Ledkov (xnox)]

review: Approve (uploaded)

Unmerged commits

eefc129... by Jelmer Vernooij on 2019-01-19

Use secure URI in Vcs control header.

The lp: prefix gets expanded to http://code.launchpad.net/ for
users that are not logged in on some versions of Bazaar.

Fixes lintian: vcs-field-uses-insecure-uri
See https://lintian.debian.org/tags/vcs-field-uses-insecure-uri.html for more details.

605c2ef... by Jelmer Vernooij on 2019-01-19

Use correct machine-readable copyright file URI.
Fixed-Lintian-Tag: out-of-date-copyright-format

f0de308... by Albert Astals Cid on 2017-02-20

Import patches-unapplied version 0.2+17.04.20170220-0ubuntu1 to ubuntu/zesty-proposed

Imported using git-ubuntu import.

Changelog parent: e064b6bd8b5da5a496fd0ccd73ffb0c1caeecd6c

New changelog entries:
  * Be less strict on city search (LP: #1590462)

e064b6b... by Michael Terry on 2016-04-26

Import patches-unapplied version 0.2+16.04.20160426-0ubuntu1 to ubuntu/yakkety-proposed

Imported using git-ubuntu import.

Changelog parent: c8105d13d19ef3d7259312dd6f03a9c880f03387

New changelog entries:
  * Add support for translations of city, states, and country names.

c8105d1... by Michael Zanetti on 2016-03-21

Import patches-unapplied version 0.2+16.04.20160321-0ubuntu1 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 97b65471bfe1bbdf6ac48d55890a4a772adc87e6

New changelog entries:
  [ Michael Terry ]
  * Add geonames_city_get_country_code, geonames_city_get_latitude,
    geonames_city_get_longitude, and geonames_city_get_population
  [ CI Train Bot ]
  * debian/libgeonames0.symbols: update to released version.
  * No-change rebuild.

97b6547... by Ken VanDine on 2016-03-15

Import patches-unapplied version 0.1+16.04.20160315-0ubuntu1 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 831939a411181d511f6559ca11b19dbf021a131d

New changelog entries:
  * Add demo application added: demo/ demo/Makefile.am demo/geonames-
    demo.c
  * Add documentation added: doc/ doc/Makefile.am doc/reference/
    doc/reference/Makefile.am doc/reference/geonames-docs.xml.in
  * Add geonames_get_n_cities()
  * Add geonames_query_cities_sync()
  * Add pkgconfig file added: src/geonames.pc.in
  * Add sanity test for empty results
  * Add support for g_autoptr
  * Don't install geonames-mkdb
  * Empty argument list is bad C99
  * Ensure that geonames db is loaded before querying it
  * Favor larger cities
  * Fix typo in public enum field
  * Install headers
  * demo: don't leak indices
  * query_cities: return array directly
  * query_cities_finish: write to indices out parameter
  * tests: link against libgeonames and use new sync api
  [ Michael Terry ]
  * Fix double-free when querying.
  * Merge debian packaging branch added: COPYING debian/
    debian/changelog debian/compat debian/control debian/copyright
    debian/libgeonames-dev.install debian/libgeonames0.install
    debian/libgeonames0.symbols debian/rules debian/source/
    debian/source/format

831939a... by Sebastien Bacher on 2015-12-09

Import patches-unapplied version 0.1-0ubuntu1 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

diff --git a/debian/changelog b/debian/changelog
index 251bc6e..7674bb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+geonames (0.2+17.04.20170220-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Use correct machine-readable copyright file URI.
+  * Use secure URI in Vcs control header.
+
+ -- Jelmer Vernooij <[e-mail]>  Sat, 19 Jan 2019 02:58:48 +0000
+
 geonames (0.2+17.04.20170220-0ubuntu1) zesty; urgency=medium
 
   * Be less strict on city search (LP: #1590462)
diff --git a/debian/control b/debian/control
index 030e547..b3c0cfc 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Homepage: https://launchpad.net/geonames
 # if you don't have have commit access to this branch but would like to upload
 # directly to Ubuntu, don't worry: your changes will be merged back into the
 # upstream branch
-Vcs-Bzr: lp:geonames
+Vcs-Bzr: https://code.launchpad.net/geonames
 
 Package: libgeonames0
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 05f75b8..4ef9305 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Contact: Lars Uebernickel <[e-mail]>
 Source: https://launchpad.net/geonames