libgweather

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

  1. 3.16.1
  2. Merge into ubuntu
Proposed by Jackson Doak
Status: Merged
Merged at revision: 69
Proposed branch: lp:~noskcaj/libgweather/3.16.1
Merge into: lp:~ubuntu-desktop/libgweather/ubuntu
Diff against target: 203 lines (+48/-15)
8 files modified
debian/changelog (+23/-0)
debian/compat (+1/-1)
debian/control (+8/-3)
debian/control.in (+8/-3)
debian/libgweather-3-6.install (+1/-1)
debian/libgweather-3-6.symbols (+1/-1)
debian/libgweather-3-dev.install (+3/-3)
debian/rules (+3/-3)
To merge this branch: bzr merge lp:~noskcaj/libgweather/3.16.1
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
Review via email: mp+259858@code.launchpad.net

Description of the change

Merge 3.16 from debian, multiarchifies the package

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Looking good and build fine, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1libgweather (3.16.1-1ubuntu1) wily; urgency=medium
2
3 * Merge from debian. Remaining changes:
4 - debian/control.in, debian/rules:
5 + Run autoreconf
6 - debian/rules:
7 + Generate POT files on build
8 - debian/patches/02_no_external_gettext.patch:
9 + Can't have both IT_PROG_INTLTOOL and AM_GNU_GETTEXT
10 - debian/control: Update Vcs-* field.
11
12 -- Jackson Doak <noskcaj@ubuntu.com> Fri, 22 May 2015 07:42:51 +1000
13
14libgweather (3.16.1-1) unstable; urgency=medium
15
16 * New upstream release.
17 * Drop clean-la.mk include, we no longer ship any libtool .la files.
18 * Add new gweather_location_new_detached symbol to symbols file.
19 * Convert to multiarch.
20 * Bump debhelper compatibility level to 9.
21
22 -- Michael Biebl <biebl@debian.org> Wed, 20 May 2015 01:00:54 +0200
23
1libgweather (3.16.0-0ubuntu1) vivid; urgency=medium24libgweather (3.16.0-0ubuntu1) vivid; urgency=medium
225
3 * New upstream bugfix release26 * New upstream bugfix release
427
=== 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 @@
1819
22
=== 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 @@
5Source: libgweather5Source: libgweather
6Section: libs6Section: libs
7Priority: optional7Priority: optional
8Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>8Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
9XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>9XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
10Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org>10Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org>
11Build-Depends: debhelper (>= 8),11Build-Depends: debhelper (>= 9),
12 autotools-dev,12 autotools-dev,
13 cdbs (>= 0.4.73),13 cdbs (>= 0.4.93),
14 dh-autoreconf,14 dh-autoreconf,
15 gnome-common,15 gnome-common,
16 gnome-pkg-tools,16 gnome-pkg-tools,
@@ -36,6 +36,7 @@
36Package: libgweather-3-dev36Package: libgweather-3-dev
37Section: libdevel37Section: libdevel
38Architecture: any38Architecture: any
39Multi-Arch: same
39Depends: libgweather-3-6 (= ${binary:Version}),40Depends: libgweather-3-6 (= ${binary:Version}),
40 gir1.2-gweather-3.0 (= ${binary:Version}),41 gir1.2-gweather-3.0 (= ${binary:Version}),
41 libxml2-dev (>= 2.6.0),42 libxml2-dev (>= 2.6.0),
@@ -51,6 +52,8 @@
5152
52Package: libgweather-3-653Package: libgweather-3-6
53Architecture: any54Architecture: any
55Multi-Arch: same
56Pre-Depends: ${misc:Pre-Depends},
54Depends: ${shlibs:Depends},57Depends: ${shlibs:Depends},
55 ${misc:Depends},58 ${misc:Depends},
56 libgweather-common (>= 3.5.0)59 libgweather-common (>= 3.5.0)
@@ -62,6 +65,7 @@
6265
63Package: libgweather-common66Package: libgweather-common
64Architecture: all67Architecture: all
68Multi-Arch: foreign
65Depends: ${shlibs:Depends},69Depends: ${shlibs:Depends},
66 ${misc:Depends}70 ${misc:Depends}
67Conflicts: libgweather1 (<< 2.22.2-2)71Conflicts: libgweather1 (<< 2.22.2-2)
@@ -74,6 +78,7 @@
74Package: gir1.2-gweather-3.078Package: gir1.2-gweather-3.0
75Section: introspection79Section: introspection
76Architecture: any80Architecture: any
81Multi-Arch: same
77Depends: ${gir:Depends},82Depends: ${gir:Depends},
78 ${shlibs:Depends},83 ${shlibs:Depends},
79 ${misc:Depends}84 ${misc:Depends}
8085
=== 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 @@
1Source: libgweather1Source: libgweather
2Section: libs2Section: libs
3Priority: optional3Priority: optional
4Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>5XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
6Uploaders: @GNOME_TEAM@6Uploaders: @GNOME_TEAM@
7Build-Depends: debhelper (>= 8),7Build-Depends: debhelper (>= 9),
8 autotools-dev,8 autotools-dev,
9 cdbs (>= 0.4.73),9 cdbs (>= 0.4.93),
10 dh-autoreconf,10 dh-autoreconf,
11 gnome-common,11 gnome-common,
12 gnome-pkg-tools,12 gnome-pkg-tools,
@@ -32,6 +32,7 @@
32Package: libgweather-3-dev32Package: libgweather-3-dev
33Section: libdevel33Section: libdevel
34Architecture: any34Architecture: any
35Multi-Arch: same
35Depends: libgweather-3-6 (= ${binary:Version}),36Depends: libgweather-3-6 (= ${binary:Version}),
36 gir1.2-gweather-3.0 (= ${binary:Version}),37 gir1.2-gweather-3.0 (= ${binary:Version}),
37 libxml2-dev (>= 2.6.0),38 libxml2-dev (>= 2.6.0),
@@ -47,6 +48,8 @@
4748
48Package: libgweather-3-649Package: libgweather-3-6
49Architecture: any50Architecture: any
51Multi-Arch: same
52Pre-Depends: ${misc:Pre-Depends},
50Depends: ${shlibs:Depends},53Depends: ${shlibs:Depends},
51 ${misc:Depends},54 ${misc:Depends},
52 libgweather-common (>= 3.5.0)55 libgweather-common (>= 3.5.0)
@@ -58,6 +61,7 @@
5861
59Package: libgweather-common62Package: libgweather-common
60Architecture: all63Architecture: all
64Multi-Arch: foreign
61Depends: ${shlibs:Depends},65Depends: ${shlibs:Depends},
62 ${misc:Depends}66 ${misc:Depends}
63Conflicts: libgweather1 (<< 2.22.2-2)67Conflicts: libgweather1 (<< 2.22.2-2)
@@ -70,6 +74,7 @@
70Package: gir1.2-gweather-3.074Package: gir1.2-gweather-3.0
71Section: introspection75Section: introspection
72Architecture: any76Architecture: any
77Multi-Arch: same
73Depends: ${gir:Depends},78Depends: ${gir:Depends},
74 ${shlibs:Depends},79 ${shlibs:Depends},
75 ${misc:Depends}80 ${misc:Depends}
7681
=== 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 @@
1usr/lib/libgweather-3.so.*1usr/lib/*/libgweather-3.so.*
22
=== 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 @@
84 gweather_location_get_world@Base 3.10.084 gweather_location_get_world@Base 3.10.0
85 gweather_location_has_coords@Base 3.7.9185 gweather_location_has_coords@Base 3.7.91
86 gweather_location_level_get_type@Base 3.7.9186 gweather_location_level_get_type@Base 3.7.91
87 gweather_location_new_detached@Base 3.15.9087 gweather_location_new_detached@Base 3.16.1
88 gweather_location_new_world@Base 3.7.9188 gweather_location_new_world@Base 3.7.91
89 gweather_location_ref@Base 3.7.9189 gweather_location_ref@Base 3.7.91
90 gweather_location_serialize@Base 3.7.9190 gweather_location_serialize@Base 3.7.91
9191
=== 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 @@
1usr/include/libgweather-3.0/*1usr/include/libgweather-3.0/*
2usr/lib/lib*.a2usr/lib/*/lib*.a
3usr/lib/lib*.so3usr/lib/*/lib*.so
4usr/lib/pkgconfig/*4usr/lib/*/pkgconfig/*
5usr/share/gtk-doc5usr/share/gtk-doc
6usr/share/gir-1.0/GWeather-3.0.gir6usr/share/gir-1.0/GWeather-3.0.gir
7usr/share/vala/vapi/gweather-3.0.*7usr/share/vala/vapi/gweather-3.0.*
88
=== 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 @@
6include /usr/share/cdbs/1/rules/debhelper.mk6include /usr/share/cdbs/1/rules/debhelper.mk
7include /usr/share/cdbs/1/class/gnome.mk7include /usr/share/cdbs/1/class/gnome.mk
8include /usr/share/cdbs/1/rules/utils.mk8include /usr/share/cdbs/1/rules/utils.mk
9include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
10include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk9include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
11-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk10-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
1211
13LDFLAGS += -Wl,-O1 -Wl,--as-needed12LDFLAGS += -Wl,-O1 -Wl,--as-needed
1413
15DEB_CONFIGURE_EXTRA_FLAGS += --enable-locations-compression \14DEB_CONFIGURE_EXTRA_FLAGS += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
15 --enable-locations-compression \
16 --enable-static \16 --enable-static \
17 --enable-gtk-doc17 --enable-gtk-doc
1818
19build:19build:
20 cd po; intltool-update --pot20 cd po; intltool-update --pot
21 cd po-locations; intltool-update --gettext-package libgweather-locations --pot
22\ No newline at end of file21\ No newline at end of file
22 cd po-locations; intltool-update --gettext-package libgweather-locations --pot

Subscribers

People subscribed via source and target branches

to all changes: