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

[Jackson Doak]

Merge 3.16 from debian, multiarchifies the package

[Didier Roche-Tolomelli (didrocks)]

Looking good and build fine, thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-28 19:58:55 +0000
+++ debian/changelog	2015-05-21 21:52:32 +0000
@@ -1,3 +1,26 @@
+libgweather (3.16.1-1ubuntu1) wily; urgency=medium
+
+  * 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]>  Fri, 22 May 2015 07:42:51 +1000
+
+libgweather (3.16.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Drop clean-la.mk include, we no longer ship any libtool .la files.
+  * Add new gweather_location_new_detached symbol to symbols file.
+  * Convert to multiarch.
+  * Bump debhelper compatibility level to 9.
+
+ -- Michael Biebl <[e-mail]>  Wed, 20 May 2015 01:00:54 +0200
+
 libgweather (3.16.0-0ubuntu1) vivid; urgency=medium
 
   * New upstream bugfix release

=== modified file 'debian/compat'
--- debian/compat	2012-03-08 12:34:05 +0000
+++ debian/compat	2015-05-21 21:52:32 +0000
@@ -1,1 +1,1 @@
-8
+9

=== modified file 'debian/control'
--- debian/control	2015-01-05 19:51:06 +0000
+++ debian/control	2015-05-21 21:52:32 +0000
@@ -5,12 +5,12 @@
 Source: libgweather
 Section: libs
 Priority: optional
-Maintainer: Ubuntu Desktop Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Michael Biebl <[e-mail]>, Sjoerd Simons <[e-mail]>
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 9),
                autotools-dev,
-               cdbs (>= 0.4.73),
+               cdbs (>= 0.4.93),
                dh-autoreconf,
                gnome-common,
                gnome-pkg-tools,
@@ -36,6 +36,7 @@
 Package: libgweather-3-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libgweather-3-6 (= ${binary:Version}),
          gir1.2-gweather-3.0 (= ${binary:Version}),
          libxml2-dev (>= 2.6.0),
@@ -51,6 +52,8 @@
 
 Package: libgweather-3-6
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends},
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libgweather-common (>= 3.5.0)
@@ -62,6 +65,7 @@
 
 Package: libgweather-common
 Architecture: all
+Multi-Arch: foreign
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Conflicts: libgweather1 (<< 2.22.2-2)
@@ -74,6 +78,7 @@
 Package: gir1.2-gweather-3.0
 Section: introspection
 Architecture: any
+Multi-Arch: same
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}

=== modified file 'debian/control.in'
--- debian/control.in	2014-12-20 07:25:53 +0000
+++ debian/control.in	2015-05-21 21:52:32 +0000
@@ -1,12 +1,12 @@
 Source: libgweather
 Section: libs
 Priority: optional
-Maintainer: Ubuntu Desktop Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 9),
                autotools-dev,
-               cdbs (>= 0.4.73),
+               cdbs (>= 0.4.93),
                dh-autoreconf,
                gnome-common,
                gnome-pkg-tools,
@@ -32,6 +32,7 @@
 Package: libgweather-3-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libgweather-3-6 (= ${binary:Version}),
          gir1.2-gweather-3.0 (= ${binary:Version}),
          libxml2-dev (>= 2.6.0),
@@ -47,6 +48,8 @@
 
 Package: libgweather-3-6
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends},
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libgweather-common (>= 3.5.0)
@@ -58,6 +61,7 @@
 
 Package: libgweather-common
 Architecture: all
+Multi-Arch: foreign
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Conflicts: libgweather1 (<< 2.22.2-2)
@@ -70,6 +74,7 @@
 Package: gir1.2-gweather-3.0
 Section: introspection
 Architecture: any
+Multi-Arch: same
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}

=== modified file 'debian/libgweather-3-6.install'
--- debian/libgweather-3-6.install	2014-02-04 10:16:43 +0000
+++ debian/libgweather-3-6.install	2015-05-21 21:52:32 +0000
@@ -1,1 +1,1 @@
-usr/lib/libgweather-3.so.*
+usr/lib/*/libgweather-3.so.*

=== modified file 'debian/libgweather-3-6.symbols'
--- debian/libgweather-3-6.symbols	2015-02-16 21:29:09 +0000
+++ debian/libgweather-3-6.symbols	2015-05-21 21:52:32 +0000
@@ -84,7 +84,7 @@
  gweather_location_get_world@Base 3.10.0
  gweather_location_has_coords@Base 3.7.91
  gweather_location_level_get_type@Base 3.7.91
- gweather_location_new_detached@Base 3.15.90
+ gweather_location_new_detached@Base 3.16.1
  gweather_location_new_world@Base 3.7.91
  gweather_location_ref@Base 3.7.91
  gweather_location_serialize@Base 3.7.91

=== modified file 'debian/libgweather-3-dev.install'
--- debian/libgweather-3-dev.install	2014-02-04 10:16:43 +0000
+++ debian/libgweather-3-dev.install	2015-05-21 21:52:32 +0000
@@ -1,7 +1,7 @@
 usr/include/libgweather-3.0/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
 usr/share/gtk-doc
 usr/share/gir-1.0/GWeather-3.0.gir
 usr/share/vala/vapi/gweather-3.0.*

=== modified file 'debian/rules'
--- debian/rules	2014-02-04 10:16:43 +0000
+++ debian/rules	2015-05-21 21:52:32 +0000
@@ -6,16 +6,16 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 LDFLAGS += -Wl,-O1 -Wl,--as-needed
 
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-locations-compression \
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
+                             --enable-locations-compression \
                              --enable-static \
                              --enable-gtk-doc
 
 build:
 	cd po; intltool-update --pot
-	cd po-locations; intltool-update --gettext-package libgweather-locations --pot
\ No newline at end of file
+	cd po-locations; intltool-update --gettext-package libgweather-locations --pot