summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrej Shadura <andrewsh@debian.org>2019-01-29 16:06:00 +0100
committerAndrej Shadura <andrewsh@debian.org>2019-01-29 16:06:00 +0100
commit5921c2d4b705f4cd301f1f621a8bd41e322c74d8 (patch)
treeae3a238bd9f83e6faddf8ffb881c0255121d47cf
parentaa49b2604ad28daf1306780c296dfc9f5933197d (diff)
Use Ayatana indicators
-rwxr-xr-xcaffeine-indicator4
-rw-r--r--debian/control4
-rw-r--r--debian/patches/ayatana.patch16
-rw-r--r--debian/patches/series1
4 files changed, 21 insertions, 4 deletions
diff --git a/caffeine-indicator b/caffeine-indicator
index 95b6b91..1babf31 100755
--- a/caffeine-indicator
+++ b/caffeine-indicator
@@ -29,8 +29,8 @@ from subprocess import call
import pkg_resources
import gi
gi.require_version('Gtk', '3.0')
-gi.require_version('AppIndicator3', '0.1')
-from gi.repository import GLib, Gtk, GObject, AppIndicator3
+gi.require_version('AyatanaAppIndicator3', '0.1')
+from gi.repository import GLib, Gtk, GObject, AyatanaAppIndicator3 as AppIndicator3
from Xlib import display
PROGRAM_NAME = "caffeine-indicator"
diff --git a/debian/control b/debian/control
index fab1108..eda9cb2 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
debhelper (>= 9),
dh-python,
gettext,
- python-setuptools,
+ python3-setuptools,
python3-all
Standards-Version: 4.0.0
Homepage: https://launchpad.net/caffeine
@@ -15,7 +15,7 @@ Homepage: https://launchpad.net/caffeine
Package: caffeine
Architecture: all
Depends:
- gir1.2-appindicator3-0.1,
+ gir1.2-ayatanaappindicator3-0.1,
gir1.2-gtk-3.0,
python3-ewmh,
python3-gi,
diff --git a/debian/patches/ayatana.patch b/debian/patches/ayatana.patch
new file mode 100644
index 0000000..887cc66
--- /dev/null
+++ b/debian/patches/ayatana.patch
@@ -0,0 +1,16 @@
+From: Andrej Shadura <andrewsh@debian.org>
+Subject: Use Ayatana indicators
+
+--- a/caffeine-indicator
++++ b/caffeine-indicator
+@@ -29,8 +29,8 @@
+ import pkg_resources
+ import gi
+ gi.require_version('Gtk', '3.0')
+-gi.require_version('AppIndicator3', '0.1')
+-from gi.repository import GLib, Gtk, GObject, AppIndicator3
++gi.require_version('AyatanaAppIndicator3', '0.1')
++from gi.repository import GLib, Gtk, GObject, AyatanaAppIndicator3 as AppIndicator3
+ from Xlib import display
+
+ PROGRAM_NAME = "caffeine-indicator"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..41f1798
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+ayatana.patch