Indicator Applet

Merge lp:~matttbe/indicator-applet/ubuntu_0.5.0-0ubuntu3 into lp:~ubuntu-desktop/indicator-applet/ubuntu

  1. ubuntu_0.5.0-0ubuntu3
  2. Merge into ubuntu
Proposed by Matthieu Baerts
Status: Merged
Merged at revision: 299
Proposed branch: lp:~matttbe/indicator-applet/ubuntu_0.5.0-0ubuntu3
Merge into: lp:~ubuntu-desktop/indicator-applet/ubuntu
Diff against target: 74 lines (+34/-2)
5 files modified
debian/changelog (+11/-0)
debian/control (+3/-2)
debian/patches/01-fixed_compilation_error_with_glib_2.33.patch (+18/-0)
debian/patches/series (+1/-0)
debian/rules (+1/-0)
To merge this branch: bzr merge lp:~matttbe/indicator-applet/ubuntu_0.5.0-0ubuntu3
Reviewer Review Type Date Requested Status
Ubuntu Desktop Pending
Review via email: mp+114766@code.launchpad.net

Description of the change

Hello,

This is just a patch to fix a compilation error if GLib 2.33 is used (e.g. in Quantal).

Regards,

Matt

@Sebastien Bacher: sorry for the error with the previous version, I only tested the new version of the apport hook and I didn't try to rebuild the package...

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-07-12 19:37:45 +0000
3+++ debian/changelog 2012-07-13 01:03:20 +0000
4@@ -1,3 +1,14 @@
5+indicator-applet (0.5.0-0ubuntu3) quantal; urgency=low
6+
7+ * debian/patches/01-fixed_compilation_error_with_glib_2.33.patch:
8+ - Fixed a compilation error if GLib 2.33 is used.
9+ * debian/control and debian/rules:
10+ - Added Quilt needed for the new patch.
11+ * debian/control:
12+ - Bump Standards-Version
13+
14+ -- Matthieu Baerts (matttbe) <matttbe@gmail.com> Fri, 13 Jul 2012 02:08:33 +0200
15+
16 indicator-applet (0.5.0-0ubuntu2) quantal; urgency=low
17
18 * debian/source_indicator-applet.py:
19
20=== modified file 'debian/control'
21--- debian/control 2012-07-12 19:37:45 +0000
22+++ debian/control 2012-07-13 01:03:20 +0000
23@@ -13,8 +13,9 @@
24 gtk-doc-tools,
25 libindicator3-dev,
26 dh-autoreconf,
27- libx11-dev
28-Standards-Version: 3.9.1
29+ libx11-dev,
30+ quilt
31+Standards-Version: 3.9.3
32 Homepage: https://launchpad.net/indicator-applet
33 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-applet/ubuntu
34 Vcs-Browser: https://code.launchpad.net/~ubuntu-desktop/indicator-applet/ubuntu
35
36=== added file 'debian/patches/01-fixed_compilation_error_with_glib_2.33.patch'
37--- debian/patches/01-fixed_compilation_error_with_glib_2.33.patch 1970-01-01 00:00:00 +0000
38+++ debian/patches/01-fixed_compilation_error_with_glib_2.33.patch 2012-07-13 01:03:20 +0000
39@@ -0,0 +1,18 @@
40+From: Matthieu Baerts <matttbe@gmail.com>
41+Subject: Fixed a compilation error with GLib 2.33
42+Bug: https://code.launchpad.net/~matttbe/indicator-applet/glib_error/+merge/114763
43+Forwarded: yes
44+
45+Index: indicator-applet_ubuntu-desktop/src/tomboykeybinder.h
46+===================================================================
47+--- indicator-applet_ubuntu-desktop.orig/src/tomboykeybinder.h 2012-07-13 00:21:42.782048000 +0200
48++++ indicator-applet_ubuntu-desktop/src/tomboykeybinder.h 2012-07-13 02:02:01.221440930 +0200
49+@@ -18,7 +18,7 @@
50+ #ifndef __TOMBOY_KEY_BINDER_H__
51+ #define __TOMBOY_KEY_BINDER_H__
52+
53+-#include <glib/gtypes.h>
54++#include <glib.h>
55+
56+ G_BEGIN_DECLS
57+
58
59=== added file 'debian/patches/series'
60--- debian/patches/series 1970-01-01 00:00:00 +0000
61+++ debian/patches/series 2012-07-13 01:03:20 +0000
62@@ -0,0 +1,1 @@
63+01-fixed_compilation_error_with_glib_2.33.patch
64
65=== modified file 'debian/rules'
66--- debian/rules 2012-02-08 15:47:19 +0000
67+++ debian/rules 2012-07-13 01:03:20 +0000
68@@ -1,5 +1,6 @@
69 #!/usr/bin/make -f
70
71+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
72 include /usr/share/cdbs/1/rules/autoreconf.mk
73 include /usr/share/cdbs/1/rules/debhelper.mk
74 include /usr/share/cdbs/1/class/gnome.mk

Subscribers

People subscribed via source and target branches