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

[Jackson Doak]

New upstream release

[Tim Lunn (darkxst)]

this looks fine to me, although I don't have upload rights for this package.

review: Approve

[Robert Ancell (robert-ancell)]

Sorry, I missed this MP and have done the update already - if you want you could merge this and update the small changes that remain.

review: Needs Fixing

Unmerged revisions

61. By Jackson Doak on 2014-05-27

* New upstream release
* Merge from debian experimental. 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.

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-04 10:19:54 +0000
+++ debian/changelog	2014-05-27 20:10:46 +0000
@@ -1,9 +1,50 @@
+libgweather (3.12.2-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release
+  * Merge from debian experimental. 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]>  Wed, 28 May 2014 05:54:41 +1000
+
+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:
@@ -437,4 +478,4 @@
     + Build depend on libxml-parser-perl (Closes: #471296).
   * 
 
- -- Sebastian Dröge <[e-mail]>  Tue, 08 Apr 2008 20:19:12 +0200
\ No newline at end of file
+ -- Sebastian Dröge <[e-mail]>  Tue, 08 Apr 2008 20:19:12 +0200

=== modified file 'debian/control'
--- debian/control	2014-02-04 10:16:43 +0000
+++ debian/control	2014-05-27 20:10:46 +0000
@@ -27,7 +27,7 @@
                libgirepository1.0-dev (>= 0.9.5),
                gobject-introspection (>= 0.9.12-4~),
                valac (>= 0.20)
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libgweather/ubuntu
 
 

=== modified file 'debian/control.in'
--- debian/control.in	2014-02-04 10:16:43 +0000
+++ debian/control.in	2014-05-27 20:10:46 +0000
@@ -23,7 +23,7 @@
                libgirepository1.0-dev (>= 0.9.5),
                gobject-introspection (>= 0.9.12-4~),
                valac (>= 0.20)
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libgweather/ubuntu
 
 

=== modified file 'debian/libgweather-3-6.symbols'
--- debian/libgweather-3-6.symbols	2014-02-04 10:16:43 +0000
+++ debian/libgweather-3-6.symbols	2014-05-27 20:10:46 +0000
@@ -62,6 +62,7 @@
  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.11.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
@@ -91,6 +92,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.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/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	2014-05-27 20:10:46 +0000
@@ -4,7 +4,7 @@
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -58,9 +58,6 @@ dnl -- check for glib; redundant at this
+@@ -67,9 +67,6 @@ dnl -- check for glib; redundant at this
  AM_PATH_GLIB_2_0($GLIB_REQUIRED)
  
  dnl gettext