Merge lp:~jbicha/libappindicator/drop-python-appindicator into lp:libappindicator/16.10

[Jeremy Bícha]

Drop python-appindicator and gir1.2-appindicator-0.1 packages

See LP: #1740637 for more details

[lp:~jbicha/libappindicator/drop-python-appindicator]

285. By Olivier Tilloy on 2018-03-20

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 on 2018-03-20

Releasing 12.10.1+18.04.20180320-0ubuntu1

287. By Unit 193 on 2018-03-22

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 on 2018-03-22

Releasing 12.10.1+18.04.20180322.1-0ubuntu1

289. By Jeremy Bícha on 2018-11-23

Drop python-appindicator and gir1.2-appindicator-0.1 packages (LP: #1740637)

[Sebastien Bacher (seb128)]

Looks fine to me to drop those old packages at this point

review: Approve

=== modified file 'bindings/Makefile.am'
--- bindings/Makefile.am	2012-06-10 07:32:04 +0000
+++ bindings/Makefile.am	2018-11-23 16:58:02 +0000
@@ -1,10 +1,7 @@
+SUBDIRS =
+
 if USE_GTK3
-SUBDIRS =	\
-	vala
-else
-SUBDIRS =		\
-	python		\
-	vala
+SUBDIRS += vala
 endif
 
 if HAS_MONO
 
=== removed directory 'bindings/python'
=== removed file 'bindings/python/Makefile.am'
--- bindings/python/Makefile.am	2012-03-07 01:14:42 +0000
+++ bindings/python/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-defsdir = $(datadir)/pygtk/2.0/defs
-defs_DATA = appindicator.defs
-
-#CFLAGS = -Wall -Werror
-INCLUDES = \
-		-I$(top_srcdir)/src \
-        -DG_LOG_DOMAIN=\"appindicator-python\" \
-        -DDATADIR=\"$(datadir)\" \
-        -DLIBDIR=\"$(libdir)\" \
-        $(APPINDICATOR_PYTHON_CFLAGS) \
-        $(PYTHON_INCLUDES)
-
-pkgpythondir = $(pyexecdir)
-pkgpyexecdir = $(pyexecdir)
-
-pkgappindicatordir = $(pkgpythondir)/appindicator
-pkgappindicator_PYTHON = __init__.py
-
-appindicatordir = $(pkgpyexecdir)/appindicator
-appindicator_LTLIBRARIES = _appindicator.la
-
-_appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_appindicator
-_appindicator_la_LIBADD = $(APPINDICATOR_PYTHON_LIBS) -L$(top_builddir)/src/.libs -lappindicator
-_appindicator_la_SOURCES = appindicatormodule.c
-nodist__appindicator_la_SOURCES = appindicator.c
-
-CLEANFILES = appindicator.c
-EXTRA_DIST = appindicator.override.in appindicator-arg-types.py $(defs_DATA)
-appindicator.c: $(defs_DATA) appindicator.override
-
-%.c: %.defs
-	($(PYGTK_CODEGEN) \
-		--register $(PYGTK_DEFSDIR)/gtk-types.defs \
-		--register $(PYGTK_DEFSDIR)/gdk-types.defs \
-		--load-types $(srcdir)/appindicator-arg-types.py \
-	    --override $*.override \
-	    --prefix py$* $(srcdir)/$*.defs) > gen-$*.c \
-	 && cp gen-$*.c $*.c \
-	 && rm -f gen-$*.c
 
=== removed file 'bindings/python/__init__.py'
--- bindings/python/__init__.py	2009-12-12 02:08:27 +0000
+++ bindings/python/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-# Python bindings for libappindicator.
-# 
-# Copyright 2009 Canonical Ltd.
-# 
-# Authors:
-#     Eitan Isaacson <[e-mail]>
-#     Neil Jagdish Patel <[e-mail]>
-# 
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of either or both of the following licenses:
-# 
-# 1) the GNU Lesser General Public License version 3, as published by the 
-# Free Software Foundation; and/or
-# 2) the GNU Lesser General Public License version 2.1, as published by 
-# the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR 
-# PURPOSE.  See the applicable version of the GNU Lesser General Public 
-# License for more details.
-# 
-# You should have received a copy of both the GNU Lesser General Public 
-# License version 3 and version 2.1 along with this program.  If not, see 
-# <http://www.gnu.org/licenses/>
-
-from _appindicator import *
 
=== removed file 'bindings/python/appindicator-arg-types.py'
--- bindings/python/appindicator-arg-types.py	2009-12-12 02:08:27 +0000
+++ bindings/python/appindicator-arg-types.py	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-# Python bindings for libappindicator.
-# 
-# Copyright 2009 Canonical Ltd.
-# 
-# Authors:
-#     Eitan Isaacson <[e-mail]>
-# 
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of either or both of the following licenses:
-# 
-# 1) the GNU Lesser General Public License version 3, as published by the 
-# Free Software Foundation; and/or
-# 2) the GNU Lesser General Public License version 2.1, as published by 
-# the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR 
-# PURPOSE.  See the applicable version of the GNU Lesser General Public 
-# License for more details.
-# 
-# You should have received a copy of both the GNU Lesser General Public 
-# License version 3 and version 2.1 along with this program.  If not, see 
-# <http://www.gnu.org/licenses/>
-
-import argtypes
-
 
=== removed file 'bindings/python/appindicator.defs'
--- bindings/python/appindicator.defs	2011-02-26 13:04:45 +0000
+++ bindings/python/appindicator.defs	1970-01-01 00:00:00 +0000
@@ -1,200 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object Indicator
-  (in-module "App")
-  (parent "GObject")
-  (c-name "AppIndicator")
-  (gtype-id "APP_TYPE_INDICATOR")
-)
-
-;; Enumerations and flags ...
-
-(define-enum IndicatorCategory
-  (in-module "App")
-  (c-name "AppIndicatorCategory")
-  (gtype-id "APP_INDICATOR_TYPE_INDICATOR_CATEGORY")
-  (values
-    '("ApplicationStatus" "APP_INDICATOR_CATEGORY_APPLICATION_STATUS")
-    '("Communications" "APP_INDICATOR_CATEGORY_COMMUNICATIONS")
-    '("SystemServices" "APP_INDICATOR_CATEGORY_SYSTEM_SERVICES")
-    '("Hardware" "APP_INDICATOR_CATEGORY_HARDWARE")
-    '("Other" "APP_INDICATOR_CATEGORY_OTHER")
-  )
-)
-
-(define-enum IndicatorStatus
-  (in-module "App")
-  (c-name "AppIndicatorStatus")
-  (gtype-id "APP_INDICATOR_TYPE_INDICATOR_STATUS")
-  (values
-    '("Passive" "APP_INDICATOR_STATUS_PASSIVE")
-    '("Active" "APP_INDICATOR_STATUS_ACTIVE")
-    '("NeedsAttention" "APP_INDICATOR_STATUS_ATTENTION")
-  )
-)
-
-;; From app-indicator.h
-
-(define-function app_indicator_get_type
-  (c-name "app_indicator_get_type")
-  (return-type "GType")
-)
-
-(define-function app_indicator_new_with_path
-  (c-name "app_indicator_new_with_path")
-  (is-constructor-of "AppIndicator")
-  (return-type "AppIndicator*")
-  (parameters
-    '("const-gchar*" "id")
-    '("const-gchar*" "icon_name")
-    '("AppIndicatorCategory" "category")
-    '("const-gchar*" "icon_theme_path" (null-ok) (default "NULL"))
-  )
-)
-
-(define-method set_status
-  (of-object "AppIndicator")
-  (c-name "app_indicator_set_status")
-  (return-type "none")
-  (parameters
-    '("AppIndicatorStatus" "status")
-  )
-)
-
-(define-method set_attention_icon
-  (of-object "AppIndicator")
-  (c-name "app_indicator_set_attention_icon_full")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "icon_name")
-    '("const-gchar*" "icon_desc" (null-ok) (default "NULL"))
-  )
-)
-
-(define-method set_menu
-  (of-object "AppIndicator")
-  (c-name "app_indicator_set_menu")
-  (return-type "none")
-  (parameters
-    '("GtkMenu*" "menu")
-  )
-)
-
-(define-method set_icon
-  (of-object "AppIndicator")
-  (c-name "app_indicator_set_icon_full")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "icon_name")
-    '("const-gchar*" "icon_desc" (null-ok) (default "NULL"))
-  )
-)
-
-(define-method set_label
-  (of-object "AppIndicator")
-  (c-name "app_indicator_set_label")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "label" (null-ok))
-    '("const-gchar*" "guide" (null-ok) (default "NULL"))
-  )
-)
-
-(define-method set_ordering_index
-  (of-object "AppIndicator")
-  (c-name "app_indicator_set_ordering_index")
-  (parameters
-    '("guint32" "ordering_index")
-  )
-)
-
-(define-method set_icon_theme_path
-  (of-object "AppIndicator")
-  (c-name "app_indicator_set_icon_theme_path")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "icon_theme_path" (null-ok))
-  )
-)
-
-(define-method get_id
-  (of-object "AppIndicator")
-  (c-name "app_indicator_get_id")
-  (return-type "const-gchar*")
-)
-
-(define-method get_category
-  (of-object "AppIndicator")
-  (c-name "app_indicator_get_category")
-  (return-type "AppIndicatorCategory")
-)
-
-(define-method get_status
-  (of-object "AppIndicator")
-  (c-name "app_indicator_get_status")
-  (return-type "AppIndicatorStatus")
-)
-
-(define-method get_icon
-  (of-object "AppIndicator")
-  (c-name "app_indicator_get_icon")
-  (return-type "const-gchar*")
-)
-
-(define-method get_icon_desc
-  (of-object "AppIndicator")
-  (c-name "app_indicator_get_icon_desc")
-  (return-type "const-gchar*")
-)
-
-(define-method get_icon_theme_path
-  (of-object "AppIndicator")
-  (c-name "app_indicator_get_icon_theme_path")
-  (return-type "const-gchar*")
-)
-
-(define-method get_attention_icon
-  (of-object "AppIndicator")
-  (c-name "app_indicator_get_attention_icon")
-  (return-type "const-gchar*")
-)
-
-(define-method get_attention_icon_desc
-  (of-object "AppIndicator")
-  (c-name "app_indicator_get_attention_icon_desc")
-  (return-type "const-gchar*")
-)
-
-(define-method get_menu
-  (of-object "AppIndicator")
-  (c-name "app_indicator_get_menu")
-  (return-type "GtkMenu*")
-)
-
-(define-method get_label
-  (of-object "AppIndicator")
-  (c-name "app_indicator_get_label")
-  (return-type "const-gchar*")
-)
-
-(define-method get_label_guide
-  (of-object "AppIndicator")
-  (c-name "app_indicator_get_label_guide")
-  (return-type "const-gchar*")
-)
-
-(define-method get_ordering_index
-  (of-object "AppIndicator")
-  (c-name "app_indicator_get_ordering_index")
-  (return-type "guint32")
-)
-
-(define-method build_menu_from_desktop
-  (of-object "AppIndicator")
-  (c-name "app_indicator_build_menu_from_desktop")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "desktop_file")
-    '("const-gchar*" "desktop_profile")
-  )
-)
 
=== removed file 'bindings/python/appindicator.override.in'
--- bindings/python/appindicator.override.in	2012-03-07 02:47:04 +0000
+++ bindings/python/appindicator.override.in	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-/*
-Python bindings for libappindicator.
-
-Copyright 2009 Canonical Ltd.
-
-Authors:
-    Eitan Isaacson <[e-mail]> (original)
-    Neil Jagdish Patel <[e-mail]>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of either or both of the following licenses:
-
-1) the GNU Lesser General Public License version 3, as published by the 
-Free Software Foundation; and/or
-2) the GNU Lesser General Public License version 2.1, as published by 
-the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the applicable version of the GNU Lesser General Public 
-License for more details.
-
-You should have received a copy of both the GNU Lesser General Public 
-License version 3 and version 2.1 along with this program.  If not, see 
-<http://www.gnu.org/licenses/>
-*/
-%%
-headers
-#include <Python.h>
-#include "@top_srcdir@/src/app-indicator.h"
-#include "@top_builddir@/src/app-indicator-enum-types.h"
-#include <glib.h>
-#include "pygobject.h"
-#include "pyglib.h"
-#include <pygtk/pygtk.h>
-
-typedef PyObject* (*to_pyobject_func) (gpointer data);
-
-#define APP_TYPE_INDICATOR APP_INDICATOR_TYPE
-
-void
-_appindicator_add_constants(PyObject *module, const gchar *strip_prefix)
-{
-#ifdef VERSION
-        PyModule_AddStringConstant(module, "__version__", VERSION);
-#endif
-        pyg_enum_add(module,
-                     "IndicatorCategory", 
-                     strip_prefix,
-                     APP_INDICATOR_TYPE_INDICATOR_CATEGORY);
-
-        pyg_enum_add(module,
-                     "IndicatorStatus", 
-                     strip_prefix,
-                     APP_INDICATOR_TYPE_INDICATOR_STATUS);
-
-        if (PyErr_Occurred())
-                PyErr_Print();
-}
-%%
-modulename appindicator
-%%
-import gobject.GObject as PyGObject_Type
-import gtk.Menu as PyGtkMenu_Type
 
=== removed file 'bindings/python/appindicatormodule.c'
--- bindings/python/appindicatormodule.c	2009-12-12 02:08:27 +0000
+++ bindings/python/appindicatormodule.c	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-/*
-Python bindings for libappindicator.
-
-Copyright 2009 Canonical Ltd.
-
-Authors:
-    Eitan Isaacson <[e-mail]>
-    Neil Jagdish Patel <[e-mail]>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of either or both of the following licenses:
-
-1) the GNU Lesser General Public License version 3, as published by the 
-Free Software Foundation; and/or
-2) the GNU Lesser General Public License version 2.1, as published by 
-the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the applicable version of the GNU Lesser General Public 
-License for more details.
-
-You should have received a copy of both the GNU Lesser General Public 
-License version 3 and version 2.1 along with this program.  If not, see 
-<http://www.gnu.org/licenses/>
-*/
-#include <pygobject.h>
- 
-void pyappindicator_register_classes (PyObject *d); 
-extern PyMethodDef pyappindicator_functions[];
-
-DL_EXPORT(void)
-init_appindicator(void)
-{
-		PyObject *m, *d;
-		
-		init_pygobject ();
-		
-		m = Py_InitModule ("_appindicator", pyappindicator_functions);
-		d = PyModule_GetDict (m);
-		
-		pyappindicator_register_classes (d);
-
-		_appindicator_add_constants (m, "APP_INDICATOR_");
-		if (PyErr_Occurred ()) {
-				Py_FatalError ("can't initialise module appindicator");
-		}
-}
 
=== modified file 'configure.ac'
--- configure.ac	2016-11-22 14:42:10 +0000
+++ configure.ac	2018-11-23 16:58:02 +0000
@@ -181,33 +181,6 @@
 with_localinstall="no"
 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)
 
-###########################
-# Python
-###########################
-
-PYGTK_REQUIRED=2.14.0
-PYGOBJECT_REQUIRED=0.22
-
-AM_PATH_PYTHON(2.3.5)
-AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
-
-PKG_CHECK_MODULES(APPINDICATOR_PYTHON,
-                  [
-					pygtk-2.0 >= $PYGTK_REQUIRED
-					gtk+-2.0 >= $GTK_REQUIRED_VERSION
-					pygobject-2.0 >= $PYGOBJECT_REQUIRED
-                  ])
-
-AC_MSG_CHECKING(for pygtk defs)
-PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
-AC_SUBST(PYGTK_DEFSDIR)
-AC_MSG_RESULT($PYGTK_DEFSDIR)
-
-AC_MSG_CHECKING(for pygtk codegen)
-PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
-AC_SUBST(PYGTK_CODEGEN)
-AC_MSG_RESULT($PYGTK_CODEGEN)
-
 #########################
 # Check if build tests
 #########################
@@ -239,8 +212,6 @@
 src/appindicator-0.1.pc
 src/appindicator3-0.1.pc
 bindings/Makefile
-bindings/python/Makefile
-bindings/python/appindicator.override
 bindings/vala/Makefile
 bindings/vala/examples/Makefile
 tests/Makefile
 
=== modified file 'debian/control'
--- debian/control	2018-03-22 00:51:30 +0000
+++ debian/control	2018-11-23 16:58:02 +0000
@@ -1,11 +1,9 @@
 Source: libappindicator
 Section: gnome
 Priority: optional
-XS-Python-Version: all
 Maintainer: Ubuntu Desktop Team <[e-mail]>
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
-               python-all-dev,
                at-spi2-core,
                cli-common-dev (>= 0.5.7) [!arm64 !ppc64el],
                gnome-common,
@@ -21,7 +19,6 @@
                libglib2.0-dev (>= 2.35.4),
                libgtk-3-dev (>= 2.91.3),
                libgtk2.0-dev (>= 2.12.0),
-               python-gtk2-dev,
                gtk-sharp2-gapi [!arm64 !ppc64el],
                libgtk2.0-cil-dev [!arm64 !ppc64el],
                libdbus-glib-1-dev (>= 0.82),
@@ -39,20 +36,6 @@
 Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libappindicator/trunk.16.10
 Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/libappindicator/trunk.16.10/files
 
-Package: python-appindicator
-Section: python
-Architecture: any
-XB-Python-Version: ${python:Versions}
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         ${python:Depends},
-         libappindicator1 (= ${binary:Version}),
-         python-gobject,
-Provides: ${python:Provides},
-Description: Python bindings for libappindicator
- This package provides Python bindings so that you can use libappindicator from 
- a Python program.
-
 Package: libappindicator1
 Section: libs
 Architecture: any
@@ -66,22 +49,11 @@
  .
  This package contains shared libraries to be used by applications.
 
-Package: gir1.2-appindicator-0.1
-Section: introspection
-Architecture: any
-Depends: ${misc:Depends},
-         ${gir:Depends},
-Description: Typelib files for libappindicator1.
- .
- This package can be used by other packages using the GIRepository format
- to generate dynamic bindings.
-
 Package: libappindicator-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         gir1.2-appindicator-0.1 (= ${binary:Version}),
          libdbusmenu-glib-dev (>= 0.1.8),
          libdbus-glib-1-dev (>= 0.76),
          libgtk2.0-dev,
 
=== removed file 'debian/gir1.2-appindicator-0.1.install'
--- debian/gir1.2-appindicator-0.1.install	2013-02-14 09:46:12 +0000
+++ debian/gir1.2-appindicator-0.1.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/*/girepository-1.0/AppIndicator-0.1.typelib usr/lib/girepository-1.0
 
=== modified file 'debian/libappindicator-dev.install'
--- debian/libappindicator-dev.install	2012-11-27 02:18:17 +0000
+++ debian/libappindicator-dev.install	2018-11-23 16:58:02 +0000
@@ -1,5 +1,3 @@
 usr/include/libappindicator-0.1/*
 usr/lib/*/libappindicator.so
 usr/lib/*/pkgconfig/appindicator-0.1.pc
-usr/share/gir-1.0/AppIndicator-0.1.gir
-usr/share/vala/vapi/appindicator-0.1.vapi
 
=== removed file 'debian/python-appindicator.install'
--- debian/python-appindicator.install	2012-11-27 02:18:17 +0000
+++ debian/python-appindicator.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/lib/python2.*
-usr/share/pygtk/*
 
=== modified file 'debian/rules'
--- debian/rules	2016-11-22 14:42:10 +0000
+++ debian/rules	2018-11-23 16:58:02 +0000
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 FLAVORS = gtk2 gtk3
-PY_VERSIONS = $(shell pyversions --requested debian/control)
 API_VERSION = 0.1
 
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -20,7 +19,7 @@
 CFLAGS += -fPIC
 
 %:
-	dh $@ --with autoreconf,python2,gir$(dh_extra_args)
+	dh $@ --with autoreconf,gir$(dh_extra_args)
 
 override_dh_autoreconf:
 	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
@@ -30,24 +29,16 @@
 doconfigure-%:
 	dh_auto_configure --builddirectory=build/$* -- $(CONFIGURE_FLAGS_$*) $(CONFIGURE_COMMON_FLAGS)
 
-doconfigure-gtk2: $(PY_VERSIONS:%=doconfiguregtk2-%)
-	# GTK2 flavor configure was run on a per-python-version basis.
-
 doconfiguregtk2-%:
-	PYTHON=`which $*` \
-		dh_auto_configure --builddirectory=build/gtk2 -- $(CONFIGURE_FLAGS_gtk2) $(CONFIGURE_COMMON_FLAGS)
+	dh_auto_configure --builddirectory=build/gtk2 -- $(CONFIGURE_FLAGS_gtk2) $(CONFIGURE_COMMON_FLAGS)
 
 override_dh_auto_build: $(FLAVORS:%=dobuild-%)
 
 dobuild-%:
 	dh_auto_build --builddirectory=build/$*
 
-dobuild-gtk2: $(PY_VERSIONS:%=dobuildgtk2-%)
-	# GTK2 flavor build was run on a per-python-version basis.
-
 dobuildgtk2-%:
-	PYTHON=`which $*` \
-		dh_auto_build --builddirectory=build/gtk2
+	dh_auto_build --builddirectory=build/gtk2
 
 override_dh_auto_install: $(FLAVORS:%=doinstall-%)
 
@@ -59,9 +50,7 @@
 	find debian/tmp -name \*.a -exec rm {} \;
 	rm -rf debian/tmp/*/usr/lib/mono
 	rm -rf debian/tmp/*/usr/share/vala/vapi/appindicator*-0.1.deps
-	dh_install -ppython-appindicator --fail-missing --sourcedir=debian/tmp/gtk2
 	dh_install -plibappindicator1 --fail-missing --sourcedir=debian/tmp/gtk2
-	dh_install -pgir1.2-appindicator-0.1 --fail-missing --sourcedir=debian/tmp/gtk2
 	dh_install -plibappindicator-dev --fail-missing --sourcedir=debian/tmp/gtk2
 	dh_install -plibappindicator-doc --fail-missing --sourcedir=debian/tmp/gtk2
 	dh_install -plibappindicator3-1 --fail-missing --sourcedir=debian/tmp/gtk3
@@ -75,15 +64,10 @@
 dotest-%:
 	dh_auto_test --builddirectory=build/$* --
 
-
-dotest-gtk2: $(PY_VERSIONS:%=dotestgtk2-%)
-	# GTK2 flavor test was run on a per-python-version basis.
-
 dotestgtk2-%:
 	ps -ef
 	env
-	PYTHON=`which $*` \
-		dh_auto_test --builddirectory=build/gtk2 --
+	dh_auto_test --builddirectory=build/gtk2 --
 
 override_dh_auto_clean:
 	dh_auto_clean
 
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-12-19 14:37:54 +0000
+++ src/Makefile.am	2018-11-23 16:58:02 +0000
@@ -153,29 +153,23 @@
 	$(addprefix $(srcdir)/,app-indicator.c) \
 	$(addprefix $(srcdir)/,$(libappindicator_headers))
 
-AppIndicator$(VER)-0.1.gir: libappindicator$(VER).la
+AppIndicator3-0.1.gir: libappindicator3.la
 
-AppIndicator_0_1_gir_INCLUDES = \
+AppIndicator3_0_1_gir_INCLUDES = \
     GObject-2.0 \
     $(GTKGIR)
-AppIndicator_0_1_gir_CFLAGS = $(LIBRARY_CFLAGS) -I$(srcdir) -I$(top_builddir)/src
-AppIndicator_0_1_gir_LIBS = libappindicator$(VER).la
-AppIndicator_0_1_gir_FILES = $(introspection_sources)
-# AppIndicator_0_1_gir_NAMESPACE = AppIndicator
-
-AppIndicator3_0_1_gir_INCLUDES = $(AppIndicator_0_1_gir_INCLUDES)
-AppIndicator3_0_1_gir_CFLAGS = $(AppIndicator_0_1_gir_CFLAGS)
-AppIndicator3_0_1_gir_LIBS = $(AppIndicator_0_1_gir_LIBS)
-AppIndicator3_0_1_gir_FILES = $(AppIndicator_0_1_gir_FILES)
+AppIndicator3_0_1_gir_CFLAGS = $(LIBRARY_CFLAGS) -I$(srcdir) -I$(top_builddir)/src
+AppIndicator3_0_1_gir_LIBS = libappindicator3.la
+AppIndicator3_0_1_gir_FILES = $(introspection_sources)
 # AppIndicator3_0_1_gir_NAMESPACE = AppIndicator
 
-INTROSPECTION_GIRS += AppIndicator$(VER)-0.1.gir
+INTROSPECTION_GIRS += AppIndicator3-0.1.gir
 
-AppIndicator$(VER)-0.1.metadata: AppIndicator$(VER)-0.1.gir
+AppIndicator3-0.1.metadata: AppIndicator3-0.1.gir
 	cp -f $(srcdir)/$@.in $@
 
-BUILT_SOURCES += AppIndicator$(VER)-0.1.metadata
-CLEANFILES += AppIndicator$(VER)-0.1.metadata
+BUILT_SOURCES += AppIndicator3-0.1.metadata
+CLEANFILES += AppIndicator3-0.1.metadata
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)