Merge lp:~noskcaj/libgweather/3.14 into lp:~ubuntu-desktop/libgweather/ubuntu

[Jackson Doak]

Merge from debian. Waiting on geocode-glib MIR

[Tim Lunn (darkxst)]

Looks good

review: Approve

[lp:~noskcaj/libgweather/3.14]

67. By Jackson Doak on 2015-01-05

New upstream release

[Robert Ancell (robert-ancell)]

geocode-glib MIR was bug 1388294 (it has completed).

[Robert Ancell (robert-ancell)]

Thanks Jackson!

[Robert Ancell (robert-ancell)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-17 07:46:29 +0000
+++ debian/changelog	2015-01-05 19:51:24 +0000
@@ -1,3 +1,50 @@
+libgweather (3.14.2-0ubuntu1) vivid; urgency=medium
+
+  * New upstream release
+  * Merge from debian. Remaining changes:
+    - debian/control.in, debian/rules:
+      + Run autoreconf
+    - debian/rules:
+      + Generate POT files on build
+    - debian/patches/02_no_external_gettext.patch:
+      + Can't have both IT_PROG_INTLTOOL and AM_GNU_GETTEXT
+    - debian/control: Update Vcs-* field.
+
+ -- Jackson Doak <[e-mail]>  Tue, 06 Jan 2015 06:15:50 +1100
+
+libgweather (3.14.1-1) unstable; urgency=medium
+
+  * New upstream release.
+    - Fixes yr.no weather backend. (Closes: #761195)
+  * Add Homepage field.
+  * Bump Standards-Version to 3.9.6. No further changes.
+
+ -- Michael Biebl <[e-mail]>  Mon, 13 Oct 2014 20:57:00 +0200
+
+libgweather (3.14.0-2) unstable; urgency=medium
+
+  * Install gir1.2-gweather-3.0 files in multi-arch path (Closes: #764446)
+    - previous attempt at trying to avoid m-a installed things in wrong dir.
+
+ -- Andreas Henriksson <[e-mail]>  Thu, 09 Oct 2014 21:37:26 +0200
+
+libgweather (3.14.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/gir1.2-gweather-3.0.install: fix building with new
+    multiarchified gobject-introspection version.
+  * Upload to unstable.
+
+ -- Andreas Henriksson <[e-mail]>  Mon, 22 Sep 2014 19:55:36 +0200
+
+libgweather (3.13.91-1) experimental; urgency=medium
+
+  * New upstream release
+  * debian/libgweather-3-6.symbols: Updated
+  * debian/control.in: Bump b-d
+
+ -- Sjoerd Simons <[e-mail]>  Sun, 07 Sep 2014 14:18:36 +0200
+
 libgweather (3.12.3-0ubuntu1) utopic; urgency=medium
 
   * New upstream release.
@@ -5,6 +52,15 @@
 
  -- Jackson Doak <[e-mail]>  Fri, 17 Oct 2014 17:42:34 +1100
 
+libgweather (3.12.2-1) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Jackson Doak ]
+  * New upstream release
+
+ -- Andreas Henriksson <[e-mail]>  Sat, 12 Jul 2014 15:12:22 +0200
+
 libgweather (3.12.2-0ubuntu2) utopic; urgency=medium
 
   * debian/patches/git_update_yr.no_API.patch:
@@ -21,12 +77,39 @@
 
  -- Robert Ancell <[e-mail]>  Fri, 04 Jul 2014 11:08:29 +1200
 
+libgweather (3.12.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Andreas Henriksson <[e-mail]>  Fri, 09 May 2014 20:22:22 +0200
+
+libgweather (3.12.0-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Andreas Henriksson <[e-mail]>  Wed, 26 Mar 2014 19:04:18 +0100
+
+libgweather (3.11.91-1) experimental; urgency=medium
+
+  [ Jackson Doak ]
+  * New upstream release
+    - Update symbols for new release
+  * debian/control: Bump standard-version to 3.9.5 (no changes)
+
+ -- Andreas Henriksson <[e-mail]>  Sun, 16 Mar 2014 19:43:53 +0100
+
 libgweather (3.10.2-0ubuntu1) trusty; urgency=medium
 
   * New upstream release
 
  -- Robert Ancell <[e-mail]>  Tue, 04 Feb 2014 10:17:00 +0000
 
+libgweather (3.10.1-2) unstable; urgency=medium
+
+  * Upload to unstable.
+
+ -- Emilio Pozuelo Monfort <[e-mail]>  Sat, 22 Feb 2014 19:13:48 +0100
+
 libgweather (3.10.1-1ubuntu1) trusty; urgency=medium
 
   * Merge from debian experimental. Remaining changes:

=== modified file 'debian/control'
--- debian/control	2014-10-17 07:07:35 +0000
+++ debian/control	2015-01-05 19:51:24 +0000
@@ -7,7 +7,7 @@
 Priority: optional
 Maintainer: Ubuntu Desktop Team <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Sjoerd Simons <[e-mail]>
+Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Michael Biebl <[e-mail]>, Sjoerd Simons <[e-mail]>
 Build-Depends: debhelper (>= 8),
                autotools-dev,
                cdbs (>= 0.4.73),
@@ -16,7 +16,7 @@
                gnome-pkg-tools,
                libxml2-dev (>= 2.6.0),
                libglib2.0-dev (>= 2.35.1),
-               libgtk-3-dev (>= 3.0.0),
+               libgtk-3-dev (>= 3.13.5),
                libsoup2.4-dev (>= 2.34.0),
                intltool (>= 0.50.0),
                pkg-config (>= 0.19),
@@ -26,9 +26,11 @@
                libgtk-3-doc,
                libgirepository1.0-dev (>= 0.9.5),
                gobject-introspection (>= 0.9.12-4~),
-               valac (>= 0.20)
-Standards-Version: 3.9.4
+               valac (>= 0.20),
+               libgeocode-glib-dev
+Standards-Version: 3.9.6
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libgweather/ubuntu
+Homepage: https://wiki.gnome.org/Projects/LibGWeather
 
 
 Package: libgweather-3-dev

=== modified file 'debian/control.in'
--- debian/control.in	2014-02-04 10:16:43 +0000
+++ debian/control.in	2015-01-05 19:51:24 +0000
@@ -12,7 +12,7 @@
                gnome-pkg-tools,
                libxml2-dev (>= 2.6.0),
                libglib2.0-dev (>= 2.35.1),
-               libgtk-3-dev (>= 3.0.0),
+               libgtk-3-dev (>= 3.13.5),
                libsoup2.4-dev (>= 2.34.0),
                intltool (>= 0.50.0),
                pkg-config (>= 0.19),
@@ -22,9 +22,11 @@
                libgtk-3-doc,
                libgirepository1.0-dev (>= 0.9.5),
                gobject-introspection (>= 0.9.12-4~),
-               valac (>= 0.20)
-Standards-Version: 3.9.4
+               valac (>= 0.20),
+               libgeocode-glib-dev
+Standards-Version: 3.9.6
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libgweather/ubuntu
+Homepage: https://wiki.gnome.org/Projects/LibGWeather
 
 
 Package: libgweather-3-dev

=== modified file 'debian/gir1.2-gweather-3.0.install'
--- debian/gir1.2-gweather-3.0.install	2012-03-08 12:34:05 +0000
+++ debian/gir1.2-gweather-3.0.install	2015-01-05 19:51:24 +0000
@@ -1,1 +1,1 @@
-usr/lib/girepository-1.0/
+usr/lib/*/girepository-1.0/

=== modified file 'debian/libgweather-3-6.symbols'
--- debian/libgweather-3-6.symbols	2014-07-03 23:16:54 +0000
+++ debian/libgweather-3-6.symbols	2015-01-05 19:51:24 +0000
@@ -54,6 +54,8 @@
  gweather_info_store_cache@Base 3.10.0
  gweather_info_update@Base 3.7.91
  gweather_location_deserialize@Base 3.7.91
+ gweather_location_detect_nearest_city@Base 3.13.91
+ gweather_location_detect_nearest_city_finish@Base 3.13.91
  gweather_location_entry_get_location@Base 3.7.91
  gweather_location_entry_get_type@Base 3.7.91
  gweather_location_entry_has_custom_text@Base 3.7.91
@@ -62,13 +64,15 @@
  gweather_location_entry_set_location@Base 3.7.91
  gweather_location_equal@Base 3.7.91
  gweather_location_find_by_station_code@Base 3.7.91
- gweather_location_find_nearest_city@Base 3.12.0
+ gweather_location_find_nearest_city@Base 3.11.91
+ gweather_location_find_nearest_city_full@Base 3.13.91
  gweather_location_free_timezones@Base 3.7.91
  gweather_location_get_children@Base 3.7.91
  gweather_location_get_city_name@Base 3.7.91
  gweather_location_get_code@Base 3.7.91
  gweather_location_get_coords@Base 3.7.91
  gweather_location_get_country@Base 3.7.91
+ gweather_location_get_country_name@Base 3.13.91
  gweather_location_get_distance@Base 3.7.91
  gweather_location_get_level@Base 3.7.91
  gweather_location_get_name@Base 3.7.91
@@ -92,7 +96,7 @@
  gweather_sky_to_string@Base 3.7.91
  gweather_speed_unit_get_type@Base 3.7.91
  gweather_temperature_unit_get_type@Base 3.7.91
- gweather_timezone_get_by_tzid@Base 3.12.0
+ gweather_timezone_get_by_tzid@Base 3.11.91
  gweather_timezone_get_dst_offset@Base 3.7.91
  gweather_timezone_get_name@Base 3.7.91
  gweather_timezone_get_offset@Base 3.7.91

=== modified file 'debian/libgweather-common.install'
--- debian/libgweather-common.install	2012-07-04 23:30:26 +0000
+++ debian/libgweather-common.install	2015-01-05 19:51:24 +0000
@@ -1,4 +1,3 @@
 usr/share/glib-2.0/schemas
 usr/share/locale
 usr/share/libgweather
-usr/share/icons

=== modified file 'debian/patches/02_no_external_gettext.patch'
--- debian/patches/02_no_external_gettext.patch	2014-02-04 10:16:43 +0000
+++ debian/patches/02_no_external_gettext.patch	2015-01-05 19:51:24 +0000
@@ -4,7 +4,7 @@
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -58,9 +58,6 @@ dnl -- check for glib; redundant at this
+@@ -68,9 +68,6 @@ dnl -- check for glib; redundant at this
  AM_PATH_GLIB_2_0($GLIB_REQUIRED)
  
  dnl gettext