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