Merge lp:~jbicha/libappindicator/drop-python-appindicator into lp:libappindicator/16.10
- drop-python-appindicator
- Merge into trunk.16.10
Proposed by
Jeremy Bícha
Status: | Merged |
---|---|
Approved by: | Sebastien Bacher |
Approved revision: | 289 |
Merged at revision: | 292 |
Proposed branch: | lp:~jbicha/libappindicator/drop-python-appindicator |
Merge into: | lp:libappindicator/16.10 |
Diff against target: |
711 lines (+16/-510) 14 files modified
bindings/Makefile.am (+3/-6) bindings/python/Makefile.am (+0/-39) bindings/python/__init__.py (+0/-27) bindings/python/appindicator-arg-types.py (+0/-27) bindings/python/appindicator.defs (+0/-200) bindings/python/appindicator.override.in (+0/-65) bindings/python/appindicatormodule.c (+0/-49) configure.ac (+0/-29) debian/control (+0/-28) debian/gir1.2-appindicator-0.1.install (+0/-1) debian/libappindicator-dev.install (+0/-2) debian/python-appindicator.install (+0/-2) debian/rules (+4/-20) src/Makefile.am (+9/-15) |
To merge this branch: | bzr merge lp:~jbicha/libappindicator/drop-python-appindicator |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sebastien Bacher | Approve | ||
Review via email: mp+335606@code.launchpad.net |
Commit message
Drop python-appindicator and gir1.2-
Description of the change
See LP: #1740637 for more details
To post a comment you must log in.
- 285. By Olivier Tilloy
-
Fix build failures on bionic,
and update Vcs-* fields in debian/control. (LP: #1757121)Approved by: Marco Trevisan (Treviño)
- 286. By CI Train Bot Account
-
Releasing 12.10.1+
18.04.20180320- 0ubuntu1 - 287. By Unit 193
-
Have -dev package depend on libgtk2.0-dev or libgk-3-dev according to its pkgconfig file (LP: #1757574) (LP: #1757574)
Approved by: Jeremy Bicha
- 288. By CI Train Bot Account
-
Releasing 12.10.1+
18.04.20180322. 1-0ubuntu1 - 289. By Jeremy Bícha
-
Drop python-appindicator and gir1.2-
appindicator- 0.1 packages (LP: #1740637)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'bindings/Makefile.am' | |||
2 | --- bindings/Makefile.am 2012-06-10 07:32:04 +0000 | |||
3 | +++ bindings/Makefile.am 2018-11-23 16:58:02 +0000 | |||
4 | @@ -1,10 +1,7 @@ | |||
5 | 1 | SUBDIRS = | ||
6 | 2 | |||
7 | 1 | if USE_GTK3 | 3 | if USE_GTK3 |
14 | 2 | SUBDIRS = \ | 4 | SUBDIRS += vala |
9 | 3 | vala | ||
10 | 4 | else | ||
11 | 5 | SUBDIRS = \ | ||
12 | 6 | python \ | ||
13 | 7 | vala | ||
15 | 8 | endif | 5 | endif |
16 | 9 | 6 | ||
17 | 10 | if HAS_MONO | 7 | if HAS_MONO |
18 | 11 | 8 | ||
19 | === removed directory 'bindings/python' | |||
20 | === removed file 'bindings/python/Makefile.am' | |||
21 | --- bindings/python/Makefile.am 2012-03-07 01:14:42 +0000 | |||
22 | +++ bindings/python/Makefile.am 1970-01-01 00:00:00 +0000 | |||
23 | @@ -1,39 +0,0 @@ | |||
24 | 1 | defsdir = $(datadir)/pygtk/2.0/defs | ||
25 | 2 | defs_DATA = appindicator.defs | ||
26 | 3 | |||
27 | 4 | #CFLAGS = -Wall -Werror | ||
28 | 5 | INCLUDES = \ | ||
29 | 6 | -I$(top_srcdir)/src \ | ||
30 | 7 | -DG_LOG_DOMAIN=\"appindicator-python\" \ | ||
31 | 8 | -DDATADIR=\"$(datadir)\" \ | ||
32 | 9 | -DLIBDIR=\"$(libdir)\" \ | ||
33 | 10 | $(APPINDICATOR_PYTHON_CFLAGS) \ | ||
34 | 11 | $(PYTHON_INCLUDES) | ||
35 | 12 | |||
36 | 13 | pkgpythondir = $(pyexecdir) | ||
37 | 14 | pkgpyexecdir = $(pyexecdir) | ||
38 | 15 | |||
39 | 16 | pkgappindicatordir = $(pkgpythondir)/appindicator | ||
40 | 17 | pkgappindicator_PYTHON = __init__.py | ||
41 | 18 | |||
42 | 19 | appindicatordir = $(pkgpyexecdir)/appindicator | ||
43 | 20 | appindicator_LTLIBRARIES = _appindicator.la | ||
44 | 21 | |||
45 | 22 | _appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_appindicator | ||
46 | 23 | _appindicator_la_LIBADD = $(APPINDICATOR_PYTHON_LIBS) -L$(top_builddir)/src/.libs -lappindicator | ||
47 | 24 | _appindicator_la_SOURCES = appindicatormodule.c | ||
48 | 25 | nodist__appindicator_la_SOURCES = appindicator.c | ||
49 | 26 | |||
50 | 27 | CLEANFILES = appindicator.c | ||
51 | 28 | EXTRA_DIST = appindicator.override.in appindicator-arg-types.py $(defs_DATA) | ||
52 | 29 | appindicator.c: $(defs_DATA) appindicator.override | ||
53 | 30 | |||
54 | 31 | %.c: %.defs | ||
55 | 32 | ($(PYGTK_CODEGEN) \ | ||
56 | 33 | --register $(PYGTK_DEFSDIR)/gtk-types.defs \ | ||
57 | 34 | --register $(PYGTK_DEFSDIR)/gdk-types.defs \ | ||
58 | 35 | --load-types $(srcdir)/appindicator-arg-types.py \ | ||
59 | 36 | --override $*.override \ | ||
60 | 37 | --prefix py$* $(srcdir)/$*.defs) > gen-$*.c \ | ||
61 | 38 | && cp gen-$*.c $*.c \ | ||
62 | 39 | && rm -f gen-$*.c | ||
63 | 40 | 0 | ||
64 | === removed file 'bindings/python/__init__.py' | |||
65 | --- bindings/python/__init__.py 2009-12-12 02:08:27 +0000 | |||
66 | +++ bindings/python/__init__.py 1970-01-01 00:00:00 +0000 | |||
67 | @@ -1,27 +0,0 @@ | |||
68 | 1 | # Python bindings for libappindicator. | ||
69 | 2 | # | ||
70 | 3 | # Copyright 2009 Canonical Ltd. | ||
71 | 4 | # | ||
72 | 5 | # Authors: | ||
73 | 6 | # Eitan Isaacson <eitan@ascender.com> | ||
74 | 7 | # Neil Jagdish Patel <neil.patel@canonical.com> | ||
75 | 8 | # | ||
76 | 9 | # This program is free software: you can redistribute it and/or modify it | ||
77 | 10 | # under the terms of either or both of the following licenses: | ||
78 | 11 | # | ||
79 | 12 | # 1) the GNU Lesser General Public License version 3, as published by the | ||
80 | 13 | # Free Software Foundation; and/or | ||
81 | 14 | # 2) the GNU Lesser General Public License version 2.1, as published by | ||
82 | 15 | # the Free Software Foundation. | ||
83 | 16 | # | ||
84 | 17 | # This program is distributed in the hope that it will be useful, but | ||
85 | 18 | # WITHOUT ANY WARRANTY; without even the implied warranties of | ||
86 | 19 | # MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR | ||
87 | 20 | # PURPOSE. See the applicable version of the GNU Lesser General Public | ||
88 | 21 | # License for more details. | ||
89 | 22 | # | ||
90 | 23 | # You should have received a copy of both the GNU Lesser General Public | ||
91 | 24 | # License version 3 and version 2.1 along with this program. If not, see | ||
92 | 25 | # <http://www.gnu.org/licenses/> | ||
93 | 26 | |||
94 | 27 | from _appindicator import * | ||
95 | 28 | 0 | ||
96 | === removed file 'bindings/python/appindicator-arg-types.py' | |||
97 | --- bindings/python/appindicator-arg-types.py 2009-12-12 02:08:27 +0000 | |||
98 | +++ bindings/python/appindicator-arg-types.py 1970-01-01 00:00:00 +0000 | |||
99 | @@ -1,27 +0,0 @@ | |||
100 | 1 | # Python bindings for libappindicator. | ||
101 | 2 | # | ||
102 | 3 | # Copyright 2009 Canonical Ltd. | ||
103 | 4 | # | ||
104 | 5 | # Authors: | ||
105 | 6 | # Eitan Isaacson <eitan@ascender.com> | ||
106 | 7 | # | ||
107 | 8 | # This program is free software: you can redistribute it and/or modify it | ||
108 | 9 | # under the terms of either or both of the following licenses: | ||
109 | 10 | # | ||
110 | 11 | # 1) the GNU Lesser General Public License version 3, as published by the | ||
111 | 12 | # Free Software Foundation; and/or | ||
112 | 13 | # 2) the GNU Lesser General Public License version 2.1, as published by | ||
113 | 14 | # the Free Software Foundation. | ||
114 | 15 | # | ||
115 | 16 | # This program is distributed in the hope that it will be useful, but | ||
116 | 17 | # WITHOUT ANY WARRANTY; without even the implied warranties of | ||
117 | 18 | # MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR | ||
118 | 19 | # PURPOSE. See the applicable version of the GNU Lesser General Public | ||
119 | 20 | # License for more details. | ||
120 | 21 | # | ||
121 | 22 | # You should have received a copy of both the GNU Lesser General Public | ||
122 | 23 | # License version 3 and version 2.1 along with this program. If not, see | ||
123 | 24 | # <http://www.gnu.org/licenses/> | ||
124 | 25 | |||
125 | 26 | import argtypes | ||
126 | 27 | |||
127 | 28 | 0 | ||
128 | === removed file 'bindings/python/appindicator.defs' | |||
129 | --- bindings/python/appindicator.defs 2011-02-26 13:04:45 +0000 | |||
130 | +++ bindings/python/appindicator.defs 1970-01-01 00:00:00 +0000 | |||
131 | @@ -1,200 +0,0 @@ | |||
132 | 1 | ;; -*- scheme -*- | ||
133 | 2 | ; object definitions ... | ||
134 | 3 | (define-object Indicator | ||
135 | 4 | (in-module "App") | ||
136 | 5 | (parent "GObject") | ||
137 | 6 | (c-name "AppIndicator") | ||
138 | 7 | (gtype-id "APP_TYPE_INDICATOR") | ||
139 | 8 | ) | ||
140 | 9 | |||
141 | 10 | ;; Enumerations and flags ... | ||
142 | 11 | |||
143 | 12 | (define-enum IndicatorCategory | ||
144 | 13 | (in-module "App") | ||
145 | 14 | (c-name "AppIndicatorCategory") | ||
146 | 15 | (gtype-id "APP_INDICATOR_TYPE_INDICATOR_CATEGORY") | ||
147 | 16 | (values | ||
148 | 17 | '("ApplicationStatus" "APP_INDICATOR_CATEGORY_APPLICATION_STATUS") | ||
149 | 18 | '("Communications" "APP_INDICATOR_CATEGORY_COMMUNICATIONS") | ||
150 | 19 | '("SystemServices" "APP_INDICATOR_CATEGORY_SYSTEM_SERVICES") | ||
151 | 20 | '("Hardware" "APP_INDICATOR_CATEGORY_HARDWARE") | ||
152 | 21 | '("Other" "APP_INDICATOR_CATEGORY_OTHER") | ||
153 | 22 | ) | ||
154 | 23 | ) | ||
155 | 24 | |||
156 | 25 | (define-enum IndicatorStatus | ||
157 | 26 | (in-module "App") | ||
158 | 27 | (c-name "AppIndicatorStatus") | ||
159 | 28 | (gtype-id "APP_INDICATOR_TYPE_INDICATOR_STATUS") | ||
160 | 29 | (values | ||
161 | 30 | '("Passive" "APP_INDICATOR_STATUS_PASSIVE") | ||
162 | 31 | '("Active" "APP_INDICATOR_STATUS_ACTIVE") | ||
163 | 32 | '("NeedsAttention" "APP_INDICATOR_STATUS_ATTENTION") | ||
164 | 33 | ) | ||
165 | 34 | ) | ||
166 | 35 | |||
167 | 36 | ;; From app-indicator.h | ||
168 | 37 | |||
169 | 38 | (define-function app_indicator_get_type | ||
170 | 39 | (c-name "app_indicator_get_type") | ||
171 | 40 | (return-type "GType") | ||
172 | 41 | ) | ||
173 | 42 | |||
174 | 43 | (define-function app_indicator_new_with_path | ||
175 | 44 | (c-name "app_indicator_new_with_path") | ||
176 | 45 | (is-constructor-of "AppIndicator") | ||
177 | 46 | (return-type "AppIndicator*") | ||
178 | 47 | (parameters | ||
179 | 48 | '("const-gchar*" "id") | ||
180 | 49 | '("const-gchar*" "icon_name") | ||
181 | 50 | '("AppIndicatorCategory" "category") | ||
182 | 51 | '("const-gchar*" "icon_theme_path" (null-ok) (default "NULL")) | ||
183 | 52 | ) | ||
184 | 53 | ) | ||
185 | 54 | |||
186 | 55 | (define-method set_status | ||
187 | 56 | (of-object "AppIndicator") | ||
188 | 57 | (c-name "app_indicator_set_status") | ||
189 | 58 | (return-type "none") | ||
190 | 59 | (parameters | ||
191 | 60 | '("AppIndicatorStatus" "status") | ||
192 | 61 | ) | ||
193 | 62 | ) | ||
194 | 63 | |||
195 | 64 | (define-method set_attention_icon | ||
196 | 65 | (of-object "AppIndicator") | ||
197 | 66 | (c-name "app_indicator_set_attention_icon_full") | ||
198 | 67 | (return-type "none") | ||
199 | 68 | (parameters | ||
200 | 69 | '("const-gchar*" "icon_name") | ||
201 | 70 | '("const-gchar*" "icon_desc" (null-ok) (default "NULL")) | ||
202 | 71 | ) | ||
203 | 72 | ) | ||
204 | 73 | |||
205 | 74 | (define-method set_menu | ||
206 | 75 | (of-object "AppIndicator") | ||
207 | 76 | (c-name "app_indicator_set_menu") | ||
208 | 77 | (return-type "none") | ||
209 | 78 | (parameters | ||
210 | 79 | '("GtkMenu*" "menu") | ||
211 | 80 | ) | ||
212 | 81 | ) | ||
213 | 82 | |||
214 | 83 | (define-method set_icon | ||
215 | 84 | (of-object "AppIndicator") | ||
216 | 85 | (c-name "app_indicator_set_icon_full") | ||
217 | 86 | (return-type "none") | ||
218 | 87 | (parameters | ||
219 | 88 | '("const-gchar*" "icon_name") | ||
220 | 89 | '("const-gchar*" "icon_desc" (null-ok) (default "NULL")) | ||
221 | 90 | ) | ||
222 | 91 | ) | ||
223 | 92 | |||
224 | 93 | (define-method set_label | ||
225 | 94 | (of-object "AppIndicator") | ||
226 | 95 | (c-name "app_indicator_set_label") | ||
227 | 96 | (return-type "none") | ||
228 | 97 | (parameters | ||
229 | 98 | '("const-gchar*" "label" (null-ok)) | ||
230 | 99 | '("const-gchar*" "guide" (null-ok) (default "NULL")) | ||
231 | 100 | ) | ||
232 | 101 | ) | ||
233 | 102 | |||
234 | 103 | (define-method set_ordering_index | ||
235 | 104 | (of-object "AppIndicator") | ||
236 | 105 | (c-name "app_indicator_set_ordering_index") | ||
237 | 106 | (parameters | ||
238 | 107 | '("guint32" "ordering_index") | ||
239 | 108 | ) | ||
240 | 109 | ) | ||
241 | 110 | |||
242 | 111 | (define-method set_icon_theme_path | ||
243 | 112 | (of-object "AppIndicator") | ||
244 | 113 | (c-name "app_indicator_set_icon_theme_path") | ||
245 | 114 | (return-type "none") | ||
246 | 115 | (parameters | ||
247 | 116 | '("const-gchar*" "icon_theme_path" (null-ok)) | ||
248 | 117 | ) | ||
249 | 118 | ) | ||
250 | 119 | |||
251 | 120 | (define-method get_id | ||
252 | 121 | (of-object "AppIndicator") | ||
253 | 122 | (c-name "app_indicator_get_id") | ||
254 | 123 | (return-type "const-gchar*") | ||
255 | 124 | ) | ||
256 | 125 | |||
257 | 126 | (define-method get_category | ||
258 | 127 | (of-object "AppIndicator") | ||
259 | 128 | (c-name "app_indicator_get_category") | ||
260 | 129 | (return-type "AppIndicatorCategory") | ||
261 | 130 | ) | ||
262 | 131 | |||
263 | 132 | (define-method get_status | ||
264 | 133 | (of-object "AppIndicator") | ||
265 | 134 | (c-name "app_indicator_get_status") | ||
266 | 135 | (return-type "AppIndicatorStatus") | ||
267 | 136 | ) | ||
268 | 137 | |||
269 | 138 | (define-method get_icon | ||
270 | 139 | (of-object "AppIndicator") | ||
271 | 140 | (c-name "app_indicator_get_icon") | ||
272 | 141 | (return-type "const-gchar*") | ||
273 | 142 | ) | ||
274 | 143 | |||
275 | 144 | (define-method get_icon_desc | ||
276 | 145 | (of-object "AppIndicator") | ||
277 | 146 | (c-name "app_indicator_get_icon_desc") | ||
278 | 147 | (return-type "const-gchar*") | ||
279 | 148 | ) | ||
280 | 149 | |||
281 | 150 | (define-method get_icon_theme_path | ||
282 | 151 | (of-object "AppIndicator") | ||
283 | 152 | (c-name "app_indicator_get_icon_theme_path") | ||
284 | 153 | (return-type "const-gchar*") | ||
285 | 154 | ) | ||
286 | 155 | |||
287 | 156 | (define-method get_attention_icon | ||
288 | 157 | (of-object "AppIndicator") | ||
289 | 158 | (c-name "app_indicator_get_attention_icon") | ||
290 | 159 | (return-type "const-gchar*") | ||
291 | 160 | ) | ||
292 | 161 | |||
293 | 162 | (define-method get_attention_icon_desc | ||
294 | 163 | (of-object "AppIndicator") | ||
295 | 164 | (c-name "app_indicator_get_attention_icon_desc") | ||
296 | 165 | (return-type "const-gchar*") | ||
297 | 166 | ) | ||
298 | 167 | |||
299 | 168 | (define-method get_menu | ||
300 | 169 | (of-object "AppIndicator") | ||
301 | 170 | (c-name "app_indicator_get_menu") | ||
302 | 171 | (return-type "GtkMenu*") | ||
303 | 172 | ) | ||
304 | 173 | |||
305 | 174 | (define-method get_label | ||
306 | 175 | (of-object "AppIndicator") | ||
307 | 176 | (c-name "app_indicator_get_label") | ||
308 | 177 | (return-type "const-gchar*") | ||
309 | 178 | ) | ||
310 | 179 | |||
311 | 180 | (define-method get_label_guide | ||
312 | 181 | (of-object "AppIndicator") | ||
313 | 182 | (c-name "app_indicator_get_label_guide") | ||
314 | 183 | (return-type "const-gchar*") | ||
315 | 184 | ) | ||
316 | 185 | |||
317 | 186 | (define-method get_ordering_index | ||
318 | 187 | (of-object "AppIndicator") | ||
319 | 188 | (c-name "app_indicator_get_ordering_index") | ||
320 | 189 | (return-type "guint32") | ||
321 | 190 | ) | ||
322 | 191 | |||
323 | 192 | (define-method build_menu_from_desktop | ||
324 | 193 | (of-object "AppIndicator") | ||
325 | 194 | (c-name "app_indicator_build_menu_from_desktop") | ||
326 | 195 | (return-type "none") | ||
327 | 196 | (parameters | ||
328 | 197 | '("const-gchar*" "desktop_file") | ||
329 | 198 | '("const-gchar*" "desktop_profile") | ||
330 | 199 | ) | ||
331 | 200 | ) | ||
332 | 201 | 0 | ||
333 | === removed file 'bindings/python/appindicator.override.in' | |||
334 | --- bindings/python/appindicator.override.in 2012-03-07 02:47:04 +0000 | |||
335 | +++ bindings/python/appindicator.override.in 1970-01-01 00:00:00 +0000 | |||
336 | @@ -1,65 +0,0 @@ | |||
337 | 1 | /* | ||
338 | 2 | Python bindings for libappindicator. | ||
339 | 3 | |||
340 | 4 | Copyright 2009 Canonical Ltd. | ||
341 | 5 | |||
342 | 6 | Authors: | ||
343 | 7 | Eitan Isaacson <eitan@ascender.com> (original) | ||
344 | 8 | Neil Jagdish Patel <neil.patel@canonical.com> | ||
345 | 9 | |||
346 | 10 | This program is free software: you can redistribute it and/or modify it | ||
347 | 11 | under the terms of either or both of the following licenses: | ||
348 | 12 | |||
349 | 13 | 1) the GNU Lesser General Public License version 3, as published by the | ||
350 | 14 | Free Software Foundation; and/or | ||
351 | 15 | 2) the GNU Lesser General Public License version 2.1, as published by | ||
352 | 16 | the Free Software Foundation. | ||
353 | 17 | |||
354 | 18 | This program is distributed in the hope that it will be useful, but | ||
355 | 19 | WITHOUT ANY WARRANTY; without even the implied warranties of | ||
356 | 20 | MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR | ||
357 | 21 | PURPOSE. See the applicable version of the GNU Lesser General Public | ||
358 | 22 | License for more details. | ||
359 | 23 | |||
360 | 24 | You should have received a copy of both the GNU Lesser General Public | ||
361 | 25 | License version 3 and version 2.1 along with this program. If not, see | ||
362 | 26 | <http://www.gnu.org/licenses/> | ||
363 | 27 | */ | ||
364 | 28 | %% | ||
365 | 29 | headers | ||
366 | 30 | #include <Python.h> | ||
367 | 31 | #include "@top_srcdir@/src/app-indicator.h" | ||
368 | 32 | #include "@top_builddir@/src/app-indicator-enum-types.h" | ||
369 | 33 | #include <glib.h> | ||
370 | 34 | #include "pygobject.h" | ||
371 | 35 | #include "pyglib.h" | ||
372 | 36 | #include <pygtk/pygtk.h> | ||
373 | 37 | |||
374 | 38 | typedef PyObject* (*to_pyobject_func) (gpointer data); | ||
375 | 39 | |||
376 | 40 | #define APP_TYPE_INDICATOR APP_INDICATOR_TYPE | ||
377 | 41 | |||
378 | 42 | void | ||
379 | 43 | _appindicator_add_constants(PyObject *module, const gchar *strip_prefix) | ||
380 | 44 | { | ||
381 | 45 | #ifdef VERSION | ||
382 | 46 | PyModule_AddStringConstant(module, "__version__", VERSION); | ||
383 | 47 | #endif | ||
384 | 48 | pyg_enum_add(module, | ||
385 | 49 | "IndicatorCategory", | ||
386 | 50 | strip_prefix, | ||
387 | 51 | APP_INDICATOR_TYPE_INDICATOR_CATEGORY); | ||
388 | 52 | |||
389 | 53 | pyg_enum_add(module, | ||
390 | 54 | "IndicatorStatus", | ||
391 | 55 | strip_prefix, | ||
392 | 56 | APP_INDICATOR_TYPE_INDICATOR_STATUS); | ||
393 | 57 | |||
394 | 58 | if (PyErr_Occurred()) | ||
395 | 59 | PyErr_Print(); | ||
396 | 60 | } | ||
397 | 61 | %% | ||
398 | 62 | modulename appindicator | ||
399 | 63 | %% | ||
400 | 64 | import gobject.GObject as PyGObject_Type | ||
401 | 65 | import gtk.Menu as PyGtkMenu_Type | ||
402 | 66 | 0 | ||
403 | === removed file 'bindings/python/appindicatormodule.c' | |||
404 | --- bindings/python/appindicatormodule.c 2009-12-12 02:08:27 +0000 | |||
405 | +++ bindings/python/appindicatormodule.c 1970-01-01 00:00:00 +0000 | |||
406 | @@ -1,49 +0,0 @@ | |||
407 | 1 | /* | ||
408 | 2 | Python bindings for libappindicator. | ||
409 | 3 | |||
410 | 4 | Copyright 2009 Canonical Ltd. | ||
411 | 5 | |||
412 | 6 | Authors: | ||
413 | 7 | Eitan Isaacson <eitan@ascender.com> | ||
414 | 8 | Neil Jagdish Patel <neil.patel@canonical.com> | ||
415 | 9 | |||
416 | 10 | This program is free software: you can redistribute it and/or modify it | ||
417 | 11 | under the terms of either or both of the following licenses: | ||
418 | 12 | |||
419 | 13 | 1) the GNU Lesser General Public License version 3, as published by the | ||
420 | 14 | Free Software Foundation; and/or | ||
421 | 15 | 2) the GNU Lesser General Public License version 2.1, as published by | ||
422 | 16 | the Free Software Foundation. | ||
423 | 17 | |||
424 | 18 | This program is distributed in the hope that it will be useful, but | ||
425 | 19 | WITHOUT ANY WARRANTY; without even the implied warranties of | ||
426 | 20 | MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR | ||
427 | 21 | PURPOSE. See the applicable version of the GNU Lesser General Public | ||
428 | 22 | License for more details. | ||
429 | 23 | |||
430 | 24 | You should have received a copy of both the GNU Lesser General Public | ||
431 | 25 | License version 3 and version 2.1 along with this program. If not, see | ||
432 | 26 | <http://www.gnu.org/licenses/> | ||
433 | 27 | */ | ||
434 | 28 | #include <pygobject.h> | ||
435 | 29 | |||
436 | 30 | void pyappindicator_register_classes (PyObject *d); | ||
437 | 31 | extern PyMethodDef pyappindicator_functions[]; | ||
438 | 32 | |||
439 | 33 | DL_EXPORT(void) | ||
440 | 34 | init_appindicator(void) | ||
441 | 35 | { | ||
442 | 36 | PyObject *m, *d; | ||
443 | 37 | |||
444 | 38 | init_pygobject (); | ||
445 | 39 | |||
446 | 40 | m = Py_InitModule ("_appindicator", pyappindicator_functions); | ||
447 | 41 | d = PyModule_GetDict (m); | ||
448 | 42 | |||
449 | 43 | pyappindicator_register_classes (d); | ||
450 | 44 | |||
451 | 45 | _appindicator_add_constants (m, "APP_INDICATOR_"); | ||
452 | 46 | if (PyErr_Occurred ()) { | ||
453 | 47 | Py_FatalError ("can't initialise module appindicator"); | ||
454 | 48 | } | ||
455 | 49 | } | ||
456 | 50 | 0 | ||
457 | === modified file 'configure.ac' | |||
458 | --- configure.ac 2016-11-22 14:42:10 +0000 | |||
459 | +++ configure.ac 2018-11-23 16:58:02 +0000 | |||
460 | @@ -181,33 +181,6 @@ | |||
461 | 181 | with_localinstall="no" | 181 | with_localinstall="no" |
462 | 182 | AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all of the files localy instead of system directories (for distcheck)]), with_localinstall=$enableval, with_localinstall=no) | 182 | AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all of the files localy instead of system directories (for distcheck)]), with_localinstall=$enableval, with_localinstall=no) |
463 | 183 | 183 | ||
464 | 184 | ########################### | ||
465 | 185 | # Python | ||
466 | 186 | ########################### | ||
467 | 187 | |||
468 | 188 | PYGTK_REQUIRED=2.14.0 | ||
469 | 189 | PYGOBJECT_REQUIRED=0.22 | ||
470 | 190 | |||
471 | 191 | AM_PATH_PYTHON(2.3.5) | ||
472 | 192 | AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) | ||
473 | 193 | |||
474 | 194 | PKG_CHECK_MODULES(APPINDICATOR_PYTHON, | ||
475 | 195 | [ | ||
476 | 196 | pygtk-2.0 >= $PYGTK_REQUIRED | ||
477 | 197 | gtk+-2.0 >= $GTK_REQUIRED_VERSION | ||
478 | 198 | pygobject-2.0 >= $PYGOBJECT_REQUIRED | ||
479 | 199 | ]) | ||
480 | 200 | |||
481 | 201 | AC_MSG_CHECKING(for pygtk defs) | ||
482 | 202 | PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0` | ||
483 | 203 | AC_SUBST(PYGTK_DEFSDIR) | ||
484 | 204 | AC_MSG_RESULT($PYGTK_DEFSDIR) | ||
485 | 205 | |||
486 | 206 | AC_MSG_CHECKING(for pygtk codegen) | ||
487 | 207 | PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py" | ||
488 | 208 | AC_SUBST(PYGTK_CODEGEN) | ||
489 | 209 | AC_MSG_RESULT($PYGTK_CODEGEN) | ||
490 | 210 | |||
491 | 211 | ######################### | 184 | ######################### |
492 | 212 | # Check if build tests | 185 | # Check if build tests |
493 | 213 | ######################### | 186 | ######################### |
494 | @@ -239,8 +212,6 @@ | |||
495 | 239 | src/appindicator-0.1.pc | 212 | src/appindicator-0.1.pc |
496 | 240 | src/appindicator3-0.1.pc | 213 | src/appindicator3-0.1.pc |
497 | 241 | bindings/Makefile | 214 | bindings/Makefile |
498 | 242 | bindings/python/Makefile | ||
499 | 243 | bindings/python/appindicator.override | ||
500 | 244 | bindings/vala/Makefile | 215 | bindings/vala/Makefile |
501 | 245 | bindings/vala/examples/Makefile | 216 | bindings/vala/examples/Makefile |
502 | 246 | tests/Makefile | 217 | tests/Makefile |
503 | 247 | 218 | ||
504 | === modified file 'debian/control' | |||
505 | --- debian/control 2018-03-22 00:51:30 +0000 | |||
506 | +++ debian/control 2018-11-23 16:58:02 +0000 | |||
507 | @@ -1,11 +1,9 @@ | |||
508 | 1 | Source: libappindicator | 1 | Source: libappindicator |
509 | 2 | Section: gnome | 2 | Section: gnome |
510 | 3 | Priority: optional | 3 | Priority: optional |
511 | 4 | XS-Python-Version: all | ||
512 | 5 | Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com> | 4 | Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com> |
513 | 6 | Build-Depends: debhelper (>= 9), | 5 | Build-Depends: debhelper (>= 9), |
514 | 7 | dh-autoreconf, | 6 | dh-autoreconf, |
515 | 8 | python-all-dev, | ||
516 | 9 | at-spi2-core, | 7 | at-spi2-core, |
517 | 10 | cli-common-dev (>= 0.5.7) [!arm64 !ppc64el], | 8 | cli-common-dev (>= 0.5.7) [!arm64 !ppc64el], |
518 | 11 | gnome-common, | 9 | gnome-common, |
519 | @@ -21,7 +19,6 @@ | |||
520 | 21 | libglib2.0-dev (>= 2.35.4), | 19 | libglib2.0-dev (>= 2.35.4), |
521 | 22 | libgtk-3-dev (>= 2.91.3), | 20 | libgtk-3-dev (>= 2.91.3), |
522 | 23 | libgtk2.0-dev (>= 2.12.0), | 21 | libgtk2.0-dev (>= 2.12.0), |
523 | 24 | python-gtk2-dev, | ||
524 | 25 | gtk-sharp2-gapi [!arm64 !ppc64el], | 22 | gtk-sharp2-gapi [!arm64 !ppc64el], |
525 | 26 | libgtk2.0-cil-dev [!arm64 !ppc64el], | 23 | libgtk2.0-cil-dev [!arm64 !ppc64el], |
526 | 27 | libdbus-glib-1-dev (>= 0.82), | 24 | libdbus-glib-1-dev (>= 0.82), |
527 | @@ -39,20 +36,6 @@ | |||
528 | 39 | Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libappindicator/trunk.16.10 | 36 | Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libappindicator/trunk.16.10 |
529 | 40 | Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/libappindicator/trunk.16.10/files | 37 | Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/libappindicator/trunk.16.10/files |
530 | 41 | 38 | ||
531 | 42 | Package: python-appindicator | ||
532 | 43 | Section: python | ||
533 | 44 | Architecture: any | ||
534 | 45 | XB-Python-Version: ${python:Versions} | ||
535 | 46 | Depends: ${shlibs:Depends}, | ||
536 | 47 | ${misc:Depends}, | ||
537 | 48 | ${python:Depends}, | ||
538 | 49 | libappindicator1 (= ${binary:Version}), | ||
539 | 50 | python-gobject, | ||
540 | 51 | Provides: ${python:Provides}, | ||
541 | 52 | Description: Python bindings for libappindicator | ||
542 | 53 | This package provides Python bindings so that you can use libappindicator from | ||
543 | 54 | a Python program. | ||
544 | 55 | |||
545 | 56 | Package: libappindicator1 | 39 | Package: libappindicator1 |
546 | 57 | Section: libs | 40 | Section: libs |
547 | 58 | Architecture: any | 41 | Architecture: any |
548 | @@ -66,22 +49,11 @@ | |||
549 | 66 | . | 49 | . |
550 | 67 | This package contains shared libraries to be used by applications. | 50 | This package contains shared libraries to be used by applications. |
551 | 68 | 51 | ||
552 | 69 | Package: gir1.2-appindicator-0.1 | ||
553 | 70 | Section: introspection | ||
554 | 71 | Architecture: any | ||
555 | 72 | Depends: ${misc:Depends}, | ||
556 | 73 | ${gir:Depends}, | ||
557 | 74 | Description: Typelib files for libappindicator1. | ||
558 | 75 | . | ||
559 | 76 | This package can be used by other packages using the GIRepository format | ||
560 | 77 | to generate dynamic bindings. | ||
561 | 78 | |||
562 | 79 | Package: libappindicator-dev | 52 | Package: libappindicator-dev |
563 | 80 | Section: libdevel | 53 | Section: libdevel |
564 | 81 | Architecture: any | 54 | Architecture: any |
565 | 82 | Depends: ${shlibs:Depends}, | 55 | Depends: ${shlibs:Depends}, |
566 | 83 | ${misc:Depends}, | 56 | ${misc:Depends}, |
567 | 84 | gir1.2-appindicator-0.1 (= ${binary:Version}), | ||
568 | 85 | libdbusmenu-glib-dev (>= 0.1.8), | 57 | libdbusmenu-glib-dev (>= 0.1.8), |
569 | 86 | libdbus-glib-1-dev (>= 0.76), | 58 | libdbus-glib-1-dev (>= 0.76), |
570 | 87 | libgtk2.0-dev, | 59 | libgtk2.0-dev, |
571 | 88 | 60 | ||
572 | === removed file 'debian/gir1.2-appindicator-0.1.install' | |||
573 | --- debian/gir1.2-appindicator-0.1.install 2013-02-14 09:46:12 +0000 | |||
574 | +++ debian/gir1.2-appindicator-0.1.install 1970-01-01 00:00:00 +0000 | |||
575 | @@ -1,1 +0,0 @@ | |||
576 | 1 | usr/lib/*/girepository-1.0/AppIndicator-0.1.typelib usr/lib/girepository-1.0 | ||
577 | 2 | 0 | ||
578 | === modified file 'debian/libappindicator-dev.install' | |||
579 | --- debian/libappindicator-dev.install 2012-11-27 02:18:17 +0000 | |||
580 | +++ debian/libappindicator-dev.install 2018-11-23 16:58:02 +0000 | |||
581 | @@ -1,5 +1,3 @@ | |||
582 | 1 | usr/include/libappindicator-0.1/* | 1 | usr/include/libappindicator-0.1/* |
583 | 2 | usr/lib/*/libappindicator.so | 2 | usr/lib/*/libappindicator.so |
584 | 3 | usr/lib/*/pkgconfig/appindicator-0.1.pc | 3 | usr/lib/*/pkgconfig/appindicator-0.1.pc |
585 | 4 | usr/share/gir-1.0/AppIndicator-0.1.gir | ||
586 | 5 | usr/share/vala/vapi/appindicator-0.1.vapi | ||
587 | 6 | 4 | ||
588 | === removed file 'debian/python-appindicator.install' | |||
589 | --- debian/python-appindicator.install 2012-11-27 02:18:17 +0000 | |||
590 | +++ debian/python-appindicator.install 1970-01-01 00:00:00 +0000 | |||
591 | @@ -1,2 +0,0 @@ | |||
592 | 1 | usr/lib/python2.* | ||
593 | 2 | usr/share/pygtk/* | ||
594 | 3 | 0 | ||
595 | === modified file 'debian/rules' | |||
596 | --- debian/rules 2016-11-22 14:42:10 +0000 | |||
597 | +++ debian/rules 2018-11-23 16:58:02 +0000 | |||
598 | @@ -1,7 +1,6 @@ | |||
599 | 1 | #!/usr/bin/make -f | 1 | #!/usr/bin/make -f |
600 | 2 | 2 | ||
601 | 3 | FLAVORS = gtk2 gtk3 | 3 | FLAVORS = gtk2 gtk3 |
602 | 4 | PY_VERSIONS = $(shell pyversions --requested debian/control) | ||
603 | 5 | API_VERSION = 0.1 | 4 | API_VERSION = 0.1 |
604 | 6 | 5 | ||
605 | 7 | DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) | 6 | DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) |
606 | @@ -20,7 +19,7 @@ | |||
607 | 20 | CFLAGS += -fPIC | 19 | CFLAGS += -fPIC |
608 | 21 | 20 | ||
609 | 22 | %: | 21 | %: |
611 | 23 | dh $@ --with autoreconf,python2,gir$(dh_extra_args) | 22 | dh $@ --with autoreconf,gir$(dh_extra_args) |
612 | 24 | 23 | ||
613 | 25 | override_dh_autoreconf: | 24 | override_dh_autoreconf: |
614 | 26 | NOCONFIGURE=1 dh_autoreconf ./autogen.sh | 25 | NOCONFIGURE=1 dh_autoreconf ./autogen.sh |
615 | @@ -30,24 +29,16 @@ | |||
616 | 30 | doconfigure-%: | 29 | doconfigure-%: |
617 | 31 | dh_auto_configure --builddirectory=build/$* -- $(CONFIGURE_FLAGS_$*) $(CONFIGURE_COMMON_FLAGS) | 30 | dh_auto_configure --builddirectory=build/$* -- $(CONFIGURE_FLAGS_$*) $(CONFIGURE_COMMON_FLAGS) |
618 | 32 | 31 | ||
619 | 33 | doconfigure-gtk2: $(PY_VERSIONS:%=doconfiguregtk2-%) | ||
620 | 34 | # GTK2 flavor configure was run on a per-python-version basis. | ||
621 | 35 | |||
622 | 36 | doconfiguregtk2-%: | 32 | doconfiguregtk2-%: |
625 | 37 | PYTHON=`which $*` \ | 33 | dh_auto_configure --builddirectory=build/gtk2 -- $(CONFIGURE_FLAGS_gtk2) $(CONFIGURE_COMMON_FLAGS) |
624 | 38 | dh_auto_configure --builddirectory=build/gtk2 -- $(CONFIGURE_FLAGS_gtk2) $(CONFIGURE_COMMON_FLAGS) | ||
626 | 39 | 34 | ||
627 | 40 | override_dh_auto_build: $(FLAVORS:%=dobuild-%) | 35 | override_dh_auto_build: $(FLAVORS:%=dobuild-%) |
628 | 41 | 36 | ||
629 | 42 | dobuild-%: | 37 | dobuild-%: |
630 | 43 | dh_auto_build --builddirectory=build/$* | 38 | dh_auto_build --builddirectory=build/$* |
631 | 44 | 39 | ||
632 | 45 | dobuild-gtk2: $(PY_VERSIONS:%=dobuildgtk2-%) | ||
633 | 46 | # GTK2 flavor build was run on a per-python-version basis. | ||
634 | 47 | |||
635 | 48 | dobuildgtk2-%: | 40 | dobuildgtk2-%: |
638 | 49 | PYTHON=`which $*` \ | 41 | dh_auto_build --builddirectory=build/gtk2 |
637 | 50 | dh_auto_build --builddirectory=build/gtk2 | ||
639 | 51 | 42 | ||
640 | 52 | override_dh_auto_install: $(FLAVORS:%=doinstall-%) | 43 | override_dh_auto_install: $(FLAVORS:%=doinstall-%) |
641 | 53 | 44 | ||
642 | @@ -59,9 +50,7 @@ | |||
643 | 59 | find debian/tmp -name \*.a -exec rm {} \; | 50 | find debian/tmp -name \*.a -exec rm {} \; |
644 | 60 | rm -rf debian/tmp/*/usr/lib/mono | 51 | rm -rf debian/tmp/*/usr/lib/mono |
645 | 61 | rm -rf debian/tmp/*/usr/share/vala/vapi/appindicator*-0.1.deps | 52 | rm -rf debian/tmp/*/usr/share/vala/vapi/appindicator*-0.1.deps |
646 | 62 | dh_install -ppython-appindicator --fail-missing --sourcedir=debian/tmp/gtk2 | ||
647 | 63 | dh_install -plibappindicator1 --fail-missing --sourcedir=debian/tmp/gtk2 | 53 | dh_install -plibappindicator1 --fail-missing --sourcedir=debian/tmp/gtk2 |
648 | 64 | dh_install -pgir1.2-appindicator-0.1 --fail-missing --sourcedir=debian/tmp/gtk2 | ||
649 | 65 | dh_install -plibappindicator-dev --fail-missing --sourcedir=debian/tmp/gtk2 | 54 | dh_install -plibappindicator-dev --fail-missing --sourcedir=debian/tmp/gtk2 |
650 | 66 | dh_install -plibappindicator-doc --fail-missing --sourcedir=debian/tmp/gtk2 | 55 | dh_install -plibappindicator-doc --fail-missing --sourcedir=debian/tmp/gtk2 |
651 | 67 | dh_install -plibappindicator3-1 --fail-missing --sourcedir=debian/tmp/gtk3 | 56 | dh_install -plibappindicator3-1 --fail-missing --sourcedir=debian/tmp/gtk3 |
652 | @@ -75,15 +64,10 @@ | |||
653 | 75 | dotest-%: | 64 | dotest-%: |
654 | 76 | dh_auto_test --builddirectory=build/$* -- | 65 | dh_auto_test --builddirectory=build/$* -- |
655 | 77 | 66 | ||
656 | 78 | |||
657 | 79 | dotest-gtk2: $(PY_VERSIONS:%=dotestgtk2-%) | ||
658 | 80 | # GTK2 flavor test was run on a per-python-version basis. | ||
659 | 81 | |||
660 | 82 | dotestgtk2-%: | 67 | dotestgtk2-%: |
661 | 83 | ps -ef | 68 | ps -ef |
662 | 84 | env | 69 | env |
665 | 85 | PYTHON=`which $*` \ | 70 | dh_auto_test --builddirectory=build/gtk2 -- |
664 | 86 | dh_auto_test --builddirectory=build/gtk2 -- | ||
666 | 87 | 71 | ||
667 | 88 | override_dh_auto_clean: | 72 | override_dh_auto_clean: |
668 | 89 | dh_auto_clean | 73 | dh_auto_clean |
669 | 90 | 74 | ||
670 | === modified file 'src/Makefile.am' | |||
671 | --- src/Makefile.am 2013-12-19 14:37:54 +0000 | |||
672 | +++ src/Makefile.am 2018-11-23 16:58:02 +0000 | |||
673 | @@ -153,29 +153,23 @@ | |||
674 | 153 | $(addprefix $(srcdir)/,app-indicator.c) \ | 153 | $(addprefix $(srcdir)/,app-indicator.c) \ |
675 | 154 | $(addprefix $(srcdir)/,$(libappindicator_headers)) | 154 | $(addprefix $(srcdir)/,$(libappindicator_headers)) |
676 | 155 | 155 | ||
678 | 156 | AppIndicator$(VER)-0.1.gir: libappindicator$(VER).la | 156 | AppIndicator3-0.1.gir: libappindicator3.la |
679 | 157 | 157 | ||
681 | 158 | AppIndicator_0_1_gir_INCLUDES = \ | 158 | AppIndicator3_0_1_gir_INCLUDES = \ |
682 | 159 | GObject-2.0 \ | 159 | GObject-2.0 \ |
683 | 160 | $(GTKGIR) | 160 | $(GTKGIR) |
693 | 161 | AppIndicator_0_1_gir_CFLAGS = $(LIBRARY_CFLAGS) -I$(srcdir) -I$(top_builddir)/src | 161 | AppIndicator3_0_1_gir_CFLAGS = $(LIBRARY_CFLAGS) -I$(srcdir) -I$(top_builddir)/src |
694 | 162 | AppIndicator_0_1_gir_LIBS = libappindicator$(VER).la | 162 | AppIndicator3_0_1_gir_LIBS = libappindicator3.la |
695 | 163 | AppIndicator_0_1_gir_FILES = $(introspection_sources) | 163 | AppIndicator3_0_1_gir_FILES = $(introspection_sources) |
687 | 164 | # AppIndicator_0_1_gir_NAMESPACE = AppIndicator | ||
688 | 165 | |||
689 | 166 | AppIndicator3_0_1_gir_INCLUDES = $(AppIndicator_0_1_gir_INCLUDES) | ||
690 | 167 | AppIndicator3_0_1_gir_CFLAGS = $(AppIndicator_0_1_gir_CFLAGS) | ||
691 | 168 | AppIndicator3_0_1_gir_LIBS = $(AppIndicator_0_1_gir_LIBS) | ||
692 | 169 | AppIndicator3_0_1_gir_FILES = $(AppIndicator_0_1_gir_FILES) | ||
696 | 170 | # AppIndicator3_0_1_gir_NAMESPACE = AppIndicator | 164 | # AppIndicator3_0_1_gir_NAMESPACE = AppIndicator |
697 | 171 | 165 | ||
699 | 172 | INTROSPECTION_GIRS += AppIndicator$(VER)-0.1.gir | 166 | INTROSPECTION_GIRS += AppIndicator3-0.1.gir |
700 | 173 | 167 | ||
702 | 174 | AppIndicator$(VER)-0.1.metadata: AppIndicator$(VER)-0.1.gir | 168 | AppIndicator3-0.1.metadata: AppIndicator3-0.1.gir |
703 | 175 | cp -f $(srcdir)/$@.in $@ | 169 | cp -f $(srcdir)/$@.in $@ |
704 | 176 | 170 | ||
707 | 177 | BUILT_SOURCES += AppIndicator$(VER)-0.1.metadata | 171 | BUILT_SOURCES += AppIndicator3-0.1.metadata |
708 | 178 | CLEANFILES += AppIndicator$(VER)-0.1.metadata | 172 | CLEANFILES += AppIndicator3-0.1.metadata |
709 | 179 | 173 | ||
710 | 180 | girdir = $(datadir)/gir-1.0 | 174 | girdir = $(datadir)/gir-1.0 |
711 | 181 | gir_DATA = $(INTROSPECTION_GIRS) | 175 | gir_DATA = $(INTROSPECTION_GIRS) |
Looks fine to me to drop those old packages at this point