libindicate

Merge lp:~indicator-applet-developers/libindicate/ubuntu into lp:~ubuntu-desktop/libindicate/ubuntu

  1. ubuntu
  2. Merge into ubuntu
Proposed by Ted Gould
Status: Merged
Merged at revision: 260
Proposed branch: lp:~indicator-applet-developers/libindicate/ubuntu
Merge into: lp:~ubuntu-desktop/libindicate/ubuntu
Diff against target: 259 lines (+76/-29)
6 files modified
AUTHORS (+2/-1)
ChangeLog (+2/-0)
Makefile.am (+25/-0)
debian/changelog (+22/-2)
debian/control (+16/-17)
libindicate/listener.h (+9/-9)
To merge this branch: bzr merge lp:~indicator-applet-developers/libindicate/ubuntu
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Pending
Review via email: mp+36744@code.launchpad.net

Description of the change

FTBFS Fix

To post a comment you must log in.
lp:~indicator-applet-developers/libindicate/ubuntu updated
324. By Ted Gould

Adding bug number

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'AUTHORS'
2--- AUTHORS 2009-02-11 21:59:42 +0000
3+++ AUTHORS 2010-09-27 16:42:44 +0000
4@@ -1,1 +1,2 @@
5-Ted Gould <ted@canonical.com>
6+# Generated by Makefile
7+
8
9=== modified file 'ChangeLog'
10--- ChangeLog 2008-10-30 02:30:35 +0000
11+++ ChangeLog 2010-09-27 16:42:44 +0000
12@@ -0,0 +1,2 @@
13+# Genrated by Makefile
14+
15
16=== modified file 'Makefile.am'
17--- Makefile.am 2010-06-02 17:53:11 +0000
18+++ Makefile.am 2010-09-27 16:42:44 +0000
19@@ -20,3 +20,28 @@
20 libindicate-*.tar.gz \
21 gtk-doc.make
22
23+dist-hook:
24+ @if test -d "$(top_srcdir)/.bzr"; \
25+ then \
26+ echo Creating ChangeLog && \
27+ ( cd "$(top_srcdir)" && \
28+ echo '# Generated by Makefile. Do not edit.'; echo; \
29+ $(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \
30+ && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
31+ || (rm -f ChangeLog.tmp; \
32+ echo Failed to generate ChangeLog >&2 ); \
33+ else \
34+ echo Failed to generate ChangeLog: not a branch >&2; \
35+ fi
36+ @if test -d "$(top_srcdir)/.bzr"; \
37+ then \
38+ echo Creating AUTHORS && \
39+ ( cd "$(top_srcdir)" && \
40+ echo '# Generated by Makefile. Do not edit.'; echo; \
41+ $(top_srcdir)/missing --run bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \
42+ && mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \
43+ || (rm -f AUTHORS.tmp; \
44+ echo Failed to generate AUTHORS >&2 ); \
45+ else \
46+ echo Failed to generate AUTHORS: not a branch >&2; \
47+ fi
48
49=== modified file 'debian/changelog'
50--- debian/changelog 2010-09-15 18:01:49 +0000
51+++ debian/changelog 2010-09-27 16:42:44 +0000
52@@ -1,3 +1,11 @@
53+libindicate (0.4.4-0ubuntu2~ppa1) maverick; urgency=low
54+
55+ * Upstream Merge
56+ * Updating dist build to generate AUTHORS and ChangeLog
57+ * Expanding typedef'd callbacks for Vala 0.10 FTBFS (LP: #649083)
58+
59+ -- Ted Gould <ted@ubuntu.com> Mon, 27 Sep 2010 10:41:17 -0500
60+
61 libindicate (0.4.4-0ubuntu1) maverick; urgency=low
62
63 * New upstream release.
64@@ -19,6 +27,16 @@
65
66 -- Ted Gould <ted@ubuntu.com> Thu, 09 Sep 2010 12:19:03 -0500
67
68+libindicate (0.4.1-2) unstable; urgency=low
69+
70+ * Fix package name in debian/rules and use the correct SONAME in the
71+ dllmap for indicate-sharp.dll and indicate-gtk-sharp.dll
72+ Closes: #595318
73+ Thanks: Andrew Mitchell
74+ * Standards-Version: 3.9.1
75+
76+ -- Evgeni Golov <evgeni@debian.org> Fri, 10 Sep 2010 09:43:36 +0200
77+
78 libindicate (0.4.1-1) unstable; urgency=low
79
80 * Merge from Ubuntu.
81@@ -28,7 +46,9 @@
82 - Add myself as Uploader.
83 - Update Vcs-* fields.
84 - Standards-Version: 3.8.4
85- - Update package descriptions.
86+ - Update package descriptions.
87+ - -doc package is Arch:all
88+ - -doc package does not need to depend on the lib.
89 * debian/copyright:
90 - Convert to DEP5 format.
91 - Add Ken and Sebastien, according to changelog.
92@@ -36,7 +56,7 @@
93 * debian/{control,rules}:
94 - Force python2.6.
95
96- -- Evgeni Golov <evgeni@debian.org> Wed, 16 Jun 2010 11:49:45 +0200
97+ -- Evgeni Golov <evgeni@debian.org> Sun, 20 Jun 2010 14:01:00 +0200
98
99 libindicate (0.4.1-0ubuntu4) maverick; urgency=low
100
101
102=== modified file 'debian/control'
103--- debian/control 2010-09-09 16:49:35 +0000
104+++ debian/control 2010-09-27 16:42:44 +0000
105@@ -30,7 +30,7 @@
106 python-all-dev,
107 python-gtk2-dev,
108 valac
109-Standards-Version: 3.8.4
110+Standards-Version: 3.9.1
111 Homepage: https://launchpad.net/libindicate
112 Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libindicate/ubuntu
113 Vcs-Browser: http://bazaar.launchpad.net/~indicator-applet-developers/libindicate/ubuntu
114@@ -84,11 +84,11 @@
115 Architecture: any
116 Depends: ${shlibs:Depends},
117 ${misc:Depends}
118-Description: library for raising indicators via DBus - GTK bindings
119+Description: library for raising indicators via DBus - GTK+ bindings
120 A small library for applications to raise "flags" on DBus for other components
121 of the desktop to pick up and visualize.
122 .
123- This package contains shared libraries to be used by applications.
124+ This package contains shared libraries to be used by GTK+ applications.
125
126 Package: libindicate-gtk-dev
127 Section: libdevel
128@@ -99,26 +99,21 @@
129 libindicate-dev (= ${binary:Version}),
130 libdbus-glib-1-dev (>= 0.76),
131 libgtk2.0-dev (>= 2.12.0)
132-Description: library for raising indicators via DBus - GTK bindings development files
133+Description: library for raising indicators via DBus - GTK+ bindings development files
134 A small library for applications to raise "flags" on DBus for other components
135 of the desktop to pick up and visualize.
136 .
137- This package contains files that are needed to build applications.
138+ This package contains files that are needed to build GTK+ applications.
139
140 Package: libindicate-doc
141 Section: doc
142-Architecture: any
143-Depends: ${shlibs:Depends},
144- ${misc:Depends},
145- libindicate4 (= ${binary:Version}),
146- libindicate-gtk2 (= ${binary:Version}),
147- libdbus-glib-1-dev (>= 0.76),
148- libgtk2.0-dev (>= 2.12.0)
149+Architecture: all
150+Depends: ${misc:Depends},
151 Description: library for raising indicators via DBus - documentation
152- indicator-applet is an applet to display information from
153- various applications consistently in the GNOME panel.
154+ A small library for applications to raise "flags" on DBus for other components
155+ of the desktop to pick up and visualize.
156 .
157- This package contains files that are needed to build applications.
158+ This package contains the documentation.
159
160 Package: gir1.0-indicate-0.2
161 Section: libs
162@@ -131,6 +126,8 @@
163 A small library for applications to raise "flags" on DBus for other components
164 of the desktop to pick up and visualize.
165 .
166+ This package can be used by other packages using the GIRepository format to
167+ generate dynamic bindings for libindicate4.
168
169 Package: gir1.0-indicate-gtk-0.2
170 Section: libs
171@@ -143,6 +140,8 @@
172 A small library for applications to raise "flags" on DBus for other components
173 of the desktop to pick up and visualize.
174 .
175+ This package can be used by other packages using the GIRepository format to
176+ generate dynamic bindings for libindicate-gtk2.
177
178 Package: libindicate0.1-cil
179 Section: cli-mono
180@@ -189,7 +188,7 @@
181 This package provides the indicate-sharp assembly that allows CLI (.NET)
182 programs to display information consistently in the GNOME panel.
183 .
184- This package contains assemblies to be used by applications.
185+ This package contains assemblies to be used by GTK# applications.
186
187 Package: libindicate-gtk0.1-cil-dev
188 Section: libdevel
189@@ -205,4 +204,4 @@
190 This package provides the indicate-sharp assembly that allows CLI (.NET)
191 programs to display information consistently in the GNOME panel.
192 .
193- This package contains files that are needed to build applications.
194+ This package contains files that are needed to build GTK# applications.
195
196=== modified file 'libindicate/listener.h'
197--- libindicate/listener.h 2010-02-15 14:35:52 +0000
198+++ libindicate/listener.h 2010-09-27 16:42:44 +0000
199@@ -126,31 +126,31 @@
200 IndicateListenerServer * server,
201 IndicateListenerIndicator * indicator,
202 gchar * property,
203- indicate_listener_get_property_value_cb callback,
204+ void (*callback) (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, const GValue * propertydata, gpointer data),
205 gpointer data);
206 void indicate_listener_get_property (IndicateListener * listener,
207 IndicateListenerServer * server,
208 IndicateListenerIndicator * indicator,
209 gchar * property,
210- indicate_listener_get_property_cb callback,
211+ void (*callback) (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, const gchar * propertydata, gpointer data),
212 gpointer data);
213 void indicate_listener_get_property_time (IndicateListener * listener,
214 IndicateListenerServer * server,
215 IndicateListenerIndicator * indicator,
216 gchar * property,
217- indicate_listener_get_property_time_cb callback,
218+ void (*callback) (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, const GTimeVal * propertydata, gpointer data),
219 gpointer data);
220 void indicate_listener_get_property_int (IndicateListener * listener,
221 IndicateListenerServer * server,
222 IndicateListenerIndicator * indicator,
223 gchar * property,
224- indicate_listener_get_property_int_cb callback,
225+ void (*callback) (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, gint propertydata, gpointer data),
226 gpointer data);
227 void indicate_listener_get_property_bool (IndicateListener * listener,
228 IndicateListenerServer * server,
229 IndicateListenerIndicator * indicator,
230 gchar * property,
231- indicate_listener_get_property_bool_cb callback,
232+ void (*callback) (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, gboolean propertydata, gpointer data),
233 gpointer data);
234 void indicate_listener_display (IndicateListener * listener,
235 IndicateListenerServer * server,
236@@ -162,19 +162,19 @@
237 gboolean displayed);
238 void indicate_listener_server_get_type (IndicateListener * listener,
239 IndicateListenerServer * server,
240- indicate_listener_get_server_property_cb callback,
241+ void (*callback) (IndicateListener * listener, IndicateListenerServer * server, gchar * value, gpointer data),
242 gpointer data);
243 void indicate_listener_server_get_desktop (IndicateListener * listener,
244 IndicateListenerServer * server,
245- indicate_listener_get_server_property_cb callback,
246+ void (*callback) (IndicateListener * listener, IndicateListenerServer * server, gchar * value, gpointer data),
247 gpointer data);
248 void indicate_listener_server_get_count (IndicateListener * listener,
249 IndicateListenerServer * server,
250- indicate_listener_get_server_uint_property_cb callback,
251+ void (*callback) (IndicateListener * listener, IndicateListenerServer * server, guint value, gpointer data),
252 gpointer data);
253 void indicate_listener_server_get_menu (IndicateListener * listener,
254 IndicateListenerServer * server,
255- indicate_listener_get_server_property_cb callback,
256+ void (*callback) (IndicateListener * listener, IndicateListenerServer * server, gchar * value, gpointer data),
257 gpointer data);
258 const gchar * indicate_listener_server_get_dbusname (IndicateListenerServer * server);
259 guint indicate_listener_indicator_get_id (IndicateListenerIndicator * indicator);

Subscribers

People subscribed via source and target branches

to all changes: