Merge branch 'release/debian/0.7.1-2'debian/0.7.1-2

8 files changed, 772 insertions, 10 deletions

diff --git a/debian/changelog b/debian/changelog
index 8a41795..ffa8524 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+gnome-pie (0.7.1-2) unstable; urgency=high
+
+  * New debian/patches/0100-fix-ftbfs_vala_0_42.patch to fix FTBFS
+    with vala 0.42 (Closes: #907943).
+  * Switch to Ayatana AppIndicator (Closes: #907551):
+    - New debian/patches/0700-ayatana-appindicator.patch.
+    - debian/control:
+      + Switch build depends from libappindicator3-dev to 
+        libayatana-appindicator3-dev.
+    Thanks to Mike Gabriel <mike.gabriel@das-netzwerkteam.de>.
+  * Change to my new email address.
+  * Migrate to debhelper 11:
+    - Change debian/compat to 11.
+    - debian/control:
+      + Bump minimum debhelper version to >= 11.
+  * Declare compliance with Debian Policy 4.2.1 (No changes needed).
+  * New debian/patches/0105-spelling_errors.patch to fix spelling errors.
+  * debian/control:
+    - Change Vcs-* to point to the new repository.
+    - Remove trailing whitespace.
+  * debian/copyright:
+    - Use secure URI for copyright format.
+    - Refresh years for debian/*.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Fri, 07 Sep 2018 08:52:14 +0200
+
 gnome-pie (0.7.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/compat b/debian/compat
index f599e28..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
diff --git a/debian/control b/debian/control
index 45f25a1..db9684f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,11 @@
 Source: gnome-pie
 Section: gnome
 Priority: optional
-Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 11),
  cmake,
- libappindicator3-dev,
+ libayatana-appindicator3-dev,
  libarchive-dev,
  libcairo2-dev,
  libgee-0.8-dev (>= 0.10),
@@ -16,17 +16,17 @@ Build-Depends:
  libxml2-dev,
  libxtst-dev,
  valac (>= 0.24)
-Standards-Version: 4.0.0
+Standards-Version: 4.2.1
 Homepage: https://gnome-pie.simonschneegans.de/
-Vcs-Git: git://anonscm.debian.org/collab-maint/gnome-pie.git
-Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/gnome-pie.git
+Vcs-Git: git://jff.email/opt/git/gnome-pie.git
+Vcs-Browser: https://jff.email/cgit/gnome-pie.git
 
 Package: gnome-pie
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: visual application launcher for GNOME
  gnome-pie is a radial visual application launcher for GNOME. It allows the
- user to bind groups of frequently used applications to a ring that appears 
+ user to bind groups of frequently used applications to a ring that appears
  when a hot key / mouse binding is triggered.
  .
  It was inspired by the OPie addon written for the game World of Warcraft.
diff --git a/debian/copyright b/debian/copyright
index 5686c4c..5304208 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: gnome-pie
 Source: https://github.com/Simmesimme/Gnome-Pie
 
@@ -14,7 +14,7 @@ License: BSD-2-Clause
 
 Files: debian/*
 Copyright: 2011      Alessandro Ghedini <ghedo@debian.org>
-           2014-2017 Jörg Frings-Fürst <debian@jff-webhosting.net>
+           2014-2018 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-3.0+
 
 License: GPL-3.0+
diff --git a/debian/patches/0100-fix-ftbfs_vala_0_42.patch b/debian/patches/0100-fix-ftbfs_vala_0_42.patch
new file mode 100644
index 0000000..f60fbed
--- /dev/null
+++ b/debian/patches/0100-fix-ftbfs_vala_0_42.patch
@@ -0,0 +1,66 @@
+Description: Fix FTBFS with vala 0.42
+Origin: upstream, https://github.com/Simmesimme/Gnome-Pie/commit/86412ee09b7f8bc11f163bc8b6c3a061be279c43
+Bug: https://github.com/Simmesimme/Gnome-Pie/issues/164
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=907943
+Forwarded: not-needed
+Last-Update: 2018-09-07
+--
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/src/utilities/archiveReader.vala
+===================================================================
+--- trunk.orig/src/utilities/archiveReader.vala
++++ trunk/src/utilities/archiveReader.vala
+@@ -84,9 +84,13 @@ public class ArchiveReader : GLib.Object
+             if (entry.size() > 0) {
+                 while (true) {
+                     size_t offset, size;
+-                    void *buff;
++                    uint8[] buff;
+ 
++#if VALA_0_42
++                    r = this.archive.read_data_block(out buff, out offset);
++#else
+                     r = this.archive.read_data_block(out buff, out size, out offset);
++#endif
+                     if (r == Archive.Result.EOF) {
+                         break;
+                     }
+@@ -96,7 +100,11 @@ public class ArchiveReader : GLib.Object
+                         return false;
+                     }
+ 
++#if VALA_0_42
++                    this.writer.write_data_block(buff, offset);
++#else
+                     this.writer.write_data_block(buff, size, offset);
++#endif
+                 }
+             }
+ 
+Index: trunk/src/utilities/archiveWriter.vala
+===================================================================
+--- trunk.orig/src/utilities/archiveWriter.vala
++++ trunk/src/utilities/archiveWriter.vala
+@@ -112,13 +112,17 @@ public class ArchiveWriter : GLib.Object
+         if (this.archive.write_header(entry) == Archive.Result.OK) {
+             try {
+                 var reader = File.new_for_path(path).read();
+-                uint8 buffer[4096];
++                uint8[] buffer = new uint8[4096];
+ 
+-                var len = reader.read(buffer);
++                buffer.length = (int) reader.read(buffer);
+ 
+-                while(len > 0) {
+-                    this.archive.write_data(buffer, len);
+-                    len = reader.read(buffer);
++                while(buffer.length > 0) {
++#if VALA_0_42
++                    this.archive.write_data(buffer);
++#else
++                    this.archive.write_data(buffer, buffer.length);
++#endif
++                    buffer.length = (int) reader.read(buffer);
+                 }
+ 
+                 this.archive.finish_entry();
diff --git a/debian/patches/0105-spelling_errors.patch b/debian/patches/0105-spelling_errors.patch
new file mode 100644
index 0000000..3fefbb5
--- /dev/null
+++ b/debian/patches/0105-spelling_errors.patch
@@ -0,0 +1,590 @@
+Description: Fix spelling errors
+Author: Jörg Frings-Fürst <debian@jff.email>
+Forwarded: https://github.com/Simmesimme/Gnome-Pie/issues/165
+Last-Update: 2018-09-07
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/resources/locale/bg/LC_MESSAGES/bg.po
+===================================================================
+--- trunk.orig/resources/locale/bg/LC_MESSAGES/bg.po
++++ trunk/resources/locale/bg/LC_MESSAGES/bg.po
+@@ -377,28 +377,28 @@ msgid ""
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:401
+-msgid "Sucessfully imported new theme!"
++msgid "Successfully imported new theme!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:415
+-msgid "An error occured while importing the theme: Failed to extract theme!"
++msgid "An error occurred while importing the theme: Failed to extract theme!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:419
+ msgid ""
+-"An error occured while importing the theme: A theme with this name does "
++"An error occurred while importing the theme: A theme with this name does "
+ "already exist!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:423
+ msgid ""
+-"An error occured while importing the theme: Theme archive does not contain a "
++"An error occurred while importing the theme: Theme archive does not contain a "
+ "valid theme!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:427
+ msgid ""
+-"An error occured while importing the theme: Failed to open theme archive!"
++"An error occurred while importing the theme: Failed to open theme archive!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:451
+@@ -584,7 +584,7 @@ msgstr ""
+ 
+ #: ../../src/themes/theme.vala:176
+ msgid ""
+-"An error occured while exporting the theme \"%s\"! Please check the console "
++"An error occurred while exporting the theme \"%s\"! Please check the console "
+ "output."
+ msgstr ""
+ 
+Index: trunk/resources/locale/de/LC_MESSAGES/de.po
+===================================================================
+--- trunk.orig/resources/locale/de/LC_MESSAGES/de.po
++++ trunk/resources/locale/de/LC_MESSAGES/de.po
+@@ -416,18 +416,18 @@ msgstr ""
+ "oder in dein Dock ziehen, um einen Starter zu erstellen!"
+ 
+ #: ../../src/gui/preferencesWindow.vala:401
+-msgid "Sucessfully imported new theme!"
++msgid "Successfully imported new theme!"
+ msgstr "Das neue Design wurde erfolgreich imprtiert!"
+ 
+ #: ../../src/gui/preferencesWindow.vala:415
+-msgid "An error occured while importing the theme: Failed to extract theme!"
++msgid "An error occurred while importing the theme: Failed to extract theme!"
+ msgstr ""
+ "Beim Importieren ist ein Fehler aufgetreten: Das Design konnte nicht "
+ "entpackt werden!"
+ 
+ #: ../../src/gui/preferencesWindow.vala:419
+ msgid ""
+-"An error occured while importing the theme: A theme with this name does "
++"An error occurred while importing the theme: A theme with this name does "
+ "already exist!"
+ msgstr ""
+ "Beim Importieren ist ein Fehler aufgetreten: Es existiert bereits ein Design "
+@@ -435,7 +435,7 @@ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:423
+ msgid ""
+-"An error occured while importing the theme: Theme archive does not contain a "
++"An error occurred while importing the theme: Theme archive does not contain a "
+ "valid theme!"
+ msgstr ""
+ "Beim Importieren ist ein Fehler aufgetreten: Das gwählte Archiv enthält kein "
+@@ -443,7 +443,7 @@ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:427
+ msgid ""
+-"An error occured while importing the theme: Failed to open theme archive!"
++"An error occurred while importing the theme: Failed to open theme archive!"
+ msgstr ""
+ "Beim Importieren ist ein Fehler aufgetreten: Das Archive konnte nicht "
+ "gelesen werden!"
+@@ -629,7 +629,7 @@ msgstr "Das Design \"%s\" wurde erfolgre
+ 
+ #: ../../src/themes/theme.vala:176
+ msgid ""
+-"An error occured while exporting the theme \"%s\"! Please check the console "
++"An error occurred while exporting the theme \"%s\"! Please check the console "
+ "output."
+ msgstr ""
+ "Beim Exportieren des Designs \"%s\" ist ein Fehler aufgetreten! Weitere "
+Index: trunk/resources/locale/es/LC_MESSAGES/es.po
+===================================================================
+--- trunk.orig/resources/locale/es/LC_MESSAGES/es.po
++++ trunk/resources/locale/es/LC_MESSAGES/es.po
+@@ -410,23 +410,23 @@ msgstr ""
+ "Pastel."
+ 
+ #: ../../src/gui/preferencesWindow.vala:401
+-msgid "Sucessfully imported new theme!"
++msgid "Successfully imported new theme!"
+ msgstr "El nuevo tema fue correctamente importado!"
+ 
+ #: ../../src/gui/preferencesWindow.vala:415
+-msgid "An error occured while importing the theme: Failed to extract theme!"
++msgid "An error occurred while importing the theme: Failed to extract theme!"
+ msgstr "Ocurrió un error al importar el tema: Falló la extracción del tema!"
+ 
+ #: ../../src/gui/preferencesWindow.vala:419
+ msgid ""
+-"An error occured while importing the theme: A theme with this name does "
++"An error occurred while importing the theme: A theme with this name does "
+ "already exist!"
+ msgstr ""
+ "Ocurrió un error al importar el tema: Ya existe un tema con ese nombre!"
+ 
+ #: ../../src/gui/preferencesWindow.vala:423
+ msgid ""
+-"An error occured while importing the theme: Theme archive does not contain a "
++"An error occurred while importing the theme: Theme archive does not contain a "
+ "valid theme!"
+ msgstr ""
+ "Ocurrió un error al importar el tema:  El archivo no contiene un tema "
+@@ -434,7 +434,7 @@ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:427
+ msgid ""
+-"An error occured while importing the theme: Failed to open theme archive!"
++"An error occurred while importing the theme: Failed to open theme archive!"
+ msgstr ""
+ "Ocurrió un error al importar el tema: El archivo del tema no pudo ser "
+ "abierto!"
+@@ -622,7 +622,7 @@ msgstr "El tema %s fue exportado correct
+ 
+ #: ../../src/themes/theme.vala:176
+ msgid ""
+-"An error occured while exporting the theme \"%s\"! Please check the console "
++"An error occurred while exporting the theme \"%s\"! Please check the console "
+ "output."
+ msgstr ""
+ "Ocurrió un error al exportar el tema %s! Por favor verifique la consola."
+Index: trunk/resources/locale/fr/LC_MESSAGES/fr.po
+===================================================================
+--- trunk.orig/resources/locale/fr/LC_MESSAGES/fr.po
++++ trunk/resources/locale/fr/LC_MESSAGES/fr.po
+@@ -416,18 +416,18 @@ msgstr ""
+ "bureau ou votre dock pour créer un lanceur."
+ 
+ #: ../../src/gui/preferencesWindow.vala:401
+-msgid "Sucessfully imported new theme!"
++msgid "Successfully imported new theme!"
+ msgstr "Nouveau thème importé avec succès !"
+ 
+ #: ../../src/gui/preferencesWindow.vala:415
+-msgid "An error occured while importing the theme: Failed to extract theme!"
++msgid "An error occurred while importing the theme: Failed to extract theme!"
+ msgstr ""
+ "Une erreur est survenue pendant l'importation du thème : impossible "
+ "d'extraire le thème !"
+ 
+ #: ../../src/gui/preferencesWindow.vala:419
+ msgid ""
+-"An error occured while importing the theme: A theme with this name does "
++"An error occurred while importing the theme: A theme with this name does "
+ "already exist!"
+ msgstr ""
+ "Une erreur est survenue pendant l'importation du thème : Un thème avec ce "
+@@ -435,7 +435,7 @@ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:423
+ msgid ""
+-"An error occured while importing the theme: Theme archive does not contain a "
++"An error occurred while importing the theme: Theme archive does not contain a "
+ "valid theme!"
+ msgstr ""
+ "Une erreur est survenue pendant l'importation du thème : L'archive ne "
+@@ -443,7 +443,7 @@ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:427
+ msgid ""
+-"An error occured while importing the theme: Failed to open theme archive!"
++"An error occurred while importing the theme: Failed to open theme archive!"
+ msgstr ""
+ "Une erreur est survenue pendant l'importation du thème : Impossible d'ouvrir "
+ "l'archive !"
+@@ -632,7 +632,7 @@ msgstr "Thème \"%s\" exporté avec succ
+ 
+ #: ../../src/themes/theme.vala:176
+ msgid ""
+-"An error occured while exporting the theme \"%s\"! Please check the console "
++"An error occurred while exporting the theme \"%s\"! Please check the console "
+ "output."
+ msgstr ""
+ "Une erreur est survenue pendant l'importation du thème \"%s\" : Plus "
+Index: trunk/resources/locale/it/LC_MESSAGES/it.po
+===================================================================
+--- trunk.orig/resources/locale/it/LC_MESSAGES/it.po
++++ trunk/resources/locale/it/LC_MESSAGES/it.po
+@@ -378,28 +378,28 @@ msgid ""
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:401
+-msgid "Sucessfully imported new theme!"
++msgid "Successfully imported new theme!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:415
+-msgid "An error occured while importing the theme: Failed to extract theme!"
++msgid "An error occurred while importing the theme: Failed to extract theme!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:419
+ msgid ""
+-"An error occured while importing the theme: A theme with this name does "
++"An error occurred while importing the theme: A theme with this name does "
+ "already exist!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:423
+ msgid ""
+-"An error occured while importing the theme: Theme archive does not contain a "
++"An error occurred while importing the theme: Theme archive does not contain a "
+ "valid theme!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:427
+ msgid ""
+-"An error occured while importing the theme: Failed to open theme archive!"
++"An error occurred while importing the theme: Failed to open theme archive!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:451
+@@ -589,7 +589,7 @@ msgstr ""
+ 
+ #: ../../src/themes/theme.vala:176
+ msgid ""
+-"An error occured while exporting the theme \"%s\"! Please check the console "
++"An error occurred while exporting the theme \"%s\"! Please check the console "
+ "output."
+ msgstr ""
+ 
+Index: trunk/resources/locale/ko/LC_MESSAGES/ko.po
+===================================================================
+--- trunk.orig/resources/locale/ko/LC_MESSAGES/ko.po
++++ trunk/resources/locale/ko/LC_MESSAGES/ko.po
+@@ -367,28 +367,28 @@ msgid ""
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:401
+-msgid "Sucessfully imported new theme!"
++msgid "Successfully imported new theme!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:415
+-msgid "An error occured while importing the theme: Failed to extract theme!"
++msgid "An error occurred while importing the theme: Failed to extract theme!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:419
+ msgid ""
+-"An error occured while importing the theme: A theme with this name does "
++"An error occurred while importing the theme: A theme with this name does "
+ "already exist!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:423
+ msgid ""
+-"An error occured while importing the theme: Theme archive does not contain a "
++"An error occurred while importing the theme: Theme archive does not contain a "
+ "valid theme!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:427
+ msgid ""
+-"An error occured while importing the theme: Failed to open theme archive!"
++"An error occurred while importing the theme: Failed to open theme archive!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:451
+@@ -571,7 +571,7 @@ msgstr ""
+ 
+ #: ../../src/themes/theme.vala:176
+ msgid ""
+-"An error occured while exporting the theme \"%s\"! Please check the console "
++"An error occurred while exporting the theme \"%s\"! Please check the console "
+ "output."
+ msgstr ""
+ 
+Index: trunk/resources/locale/lt/LC_MESSAGES/lt.po
+===================================================================
+--- trunk.orig/resources/locale/lt/LC_MESSAGES/lt.po
++++ trunk/resources/locale/lt/LC_MESSAGES/lt.po
+@@ -417,29 +417,29 @@ msgstr ""
+ "sukurtumėte šio pyrago leistuką."
+ 
+ #: ../../src/gui/preferencesWindow.vala:401
+-msgid "Sucessfully imported new theme!"
++msgid "Successfully imported new theme!"
+ msgstr "Nauja tema buvo sėkmingai importuota!"
+ 
+ #: ../../src/gui/preferencesWindow.vala:415
+-msgid "An error occured while importing the theme: Failed to extract theme!"
++msgid "An error occurred while importing the theme: Failed to extract theme!"
+ msgstr "Importuojant temą, įvyko klaida: Nepavyko išskleisti temos!"
+ 
+ #: ../../src/gui/preferencesWindow.vala:419
+ msgid ""
+-"An error occured while importing the theme: A theme with this name does "
++"An error occurred while importing the theme: A theme with this name does "
+ "already exist!"
+ msgstr "Importuojant temą, įvyko klaida: Tema tokiu pavadinimu jau yra!"
+ 
+ #: ../../src/gui/preferencesWindow.vala:423
+ msgid ""
+-"An error occured while importing the theme: Theme archive does not contain a "
++"An error occurred while importing the theme: Theme archive does not contain a "
+ "valid theme!"
+ msgstr ""
+ "Importuojant temą, įvyko klaida: Temos archyve nėra taisyklingos temos!"
+ 
+ #: ../../src/gui/preferencesWindow.vala:427
+ msgid ""
+-"An error occured while importing the theme: Failed to open theme archive!"
++"An error occurred while importing the theme: Failed to open theme archive!"
+ msgstr "Importuojant temą, įvyko klaida: Nepavyko atverti temos archyvo!"
+ 
+ #: ../../src/gui/preferencesWindow.vala:451
+@@ -624,7 +624,7 @@ msgstr "\"%s\" tema buvo sėkmingai eksp
+ 
+ #: ../../src/themes/theme.vala:176
+ msgid ""
+-"An error occured while exporting the theme \"%s\"! Please check the console "
++"An error occurred while exporting the theme \"%s\"! Please check the console "
+ "output."
+ msgstr "Eksportuojant \"%s\" temą, įvyko klaida! Prašome žiūrėti pulto išvestį."
+ 
+Index: trunk/resources/locale/pl/LC_MESSAGES/pl.po
+===================================================================
+--- trunk.orig/resources/locale/pl/LC_MESSAGES/pl.po
++++ trunk/resources/locale/pl/LC_MESSAGES/pl.po
+@@ -386,28 +386,28 @@ msgid ""
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:401
+-msgid "Sucessfully imported new theme!"
++msgid "Successfully imported new theme!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:415
+-msgid "An error occured while importing the theme: Failed to extract theme!"
++msgid "An error occurred while importing the theme: Failed to extract theme!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:419
+ msgid ""
+-"An error occured while importing the theme: A theme with this name does "
++"An error occurred while importing the theme: A theme with this name does "
+ "already exist!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:423
+ msgid ""
+-"An error occured while importing the theme: Theme archive does not contain a "
++"An error occurred while importing the theme: Theme archive does not contain a "
+ "valid theme!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:427
+ msgid ""
+-"An error occured while importing the theme: Failed to open theme archive!"
++"An error occurred while importing the theme: Failed to open theme archive!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:451
+@@ -588,7 +588,7 @@ msgstr ""
+ 
+ #: ../../src/themes/theme.vala:176
+ msgid ""
+-"An error occured while exporting the theme \"%s\"! Please check the console "
++"An error occurred while exporting the theme \"%s\"! Please check the console "
+ "output."
+ msgstr ""
+ 
+Index: trunk/resources/locale/pt_BR/LC_MESSAGES/pt_BR.po
+===================================================================
+--- trunk.orig/resources/locale/pt_BR/LC_MESSAGES/pt_BR.po
++++ trunk/resources/locale/pt_BR/LC_MESSAGES/pt_BR.po
+@@ -376,28 +376,28 @@ msgid ""
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:401
+-msgid "Sucessfully imported new theme!"
++msgid "Successfully imported new theme!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:415
+-msgid "An error occured while importing the theme: Failed to extract theme!"
++msgid "An error occurred while importing the theme: Failed to extract theme!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:419
+ msgid ""
+-"An error occured while importing the theme: A theme with this name does "
++"An error occurred while importing the theme: A theme with this name does "
+ "already exist!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:423
+ msgid ""
+-"An error occured while importing the theme: Theme archive does not contain a "
++"An error occurred while importing the theme: Theme archive does not contain a "
+ "valid theme!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:427
+ msgid ""
+-"An error occured while importing the theme: Failed to open theme archive!"
++"An error occurred while importing the theme: Failed to open theme archive!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:451
+@@ -582,7 +582,7 @@ msgstr ""
+ 
+ #: ../../src/themes/theme.vala:176
+ msgid ""
+-"An error occured while exporting the theme \"%s\"! Please check the console "
++"An error occurred while exporting the theme \"%s\"! Please check the console "
+ "output."
+ msgstr ""
+ 
+Index: trunk/resources/locale/ru/LC_MESSAGES/ru.po
+===================================================================
+--- trunk.orig/resources/locale/ru/LC_MESSAGES/ru.po
++++ trunk/resources/locale/ru/LC_MESSAGES/ru.po
+@@ -408,29 +408,29 @@ msgstr ""
+ "чтобы создать ярлык запуска для этого Пая."
+ 
+ #: ../../src/gui/preferencesWindow.vala:401
+-msgid "Sucessfully imported new theme!"
++msgid "Successfully imported new theme!"
+ msgstr "Успешно импортирована новая тема!"
+ 
+ #: ../../src/gui/preferencesWindow.vala:415
+-msgid "An error occured while importing the theme: Failed to extract theme!"
++msgid "An error occurred while importing the theme: Failed to extract theme!"
+ msgstr "При импорте темы произошла ошибка: Не удалось извлечь тему!"
+ 
+ #: ../../src/gui/preferencesWindow.vala:419
+ msgid ""
+-"An error occured while importing the theme: A theme with this name does "
++"An error occurred while importing the theme: A theme with this name does "
+ "already exist!"
+ msgstr "При импорте темы произошла ошибка: тема с этим именем уже существует!"
+ 
+ #: ../../src/gui/preferencesWindow.vala:423
+ msgid ""
+-"An error occured while importing the theme: Theme archive does not contain a "
++"An error occurred while importing the theme: Theme archive does not contain a "
+ "valid theme!"
+ msgstr ""
+ "При импорте темы произошла ошибка: в архиве темы нет действительной темы!"
+ 
+ #: ../../src/gui/preferencesWindow.vala:427
+ msgid ""
+-"An error occured while importing the theme: Failed to open theme archive!"
++"An error occurred while importing the theme: Failed to open theme archive!"
+ msgstr "При импорте темы произошла ошибка: Не удалось открыть тему!"
+ 
+ #: ../../src/gui/preferencesWindow.vala:451
+@@ -616,7 +616,7 @@ msgstr "Тема экспортиров�
+ 
+ #: ../../src/themes/theme.vala:176
+ msgid ""
+-"An error occured while exporting the theme \"%s\"! Please check the console "
++"An error occurred while exporting the theme \"%s\"! Please check the console "
+ "output."
+ msgstr "При экспорте темы произошла ошибка \"%s\"! Проверьте вывод консоли."
+ 
+Index: trunk/resources/locale/zh_CN/LC_MESSAGES/zh_CN.po
+===================================================================
+--- trunk.orig/resources/locale/zh_CN/LC_MESSAGES/zh_CN.po
++++ trunk/resources/locale/zh_CN/LC_MESSAGES/zh_CN.po
+@@ -367,28 +367,28 @@ msgid ""
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:401
+-msgid "Sucessfully imported new theme!"
++msgid "Successfully imported new theme!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:415
+-msgid "An error occured while importing the theme: Failed to extract theme!"
++msgid "An error occurred while importing the theme: Failed to extract theme!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:419
+ msgid ""
+-"An error occured while importing the theme: A theme with this name does "
++"An error occurred while importing the theme: A theme with this name does "
+ "already exist!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:423
+ msgid ""
+-"An error occured while importing the theme: Theme archive does not contain a "
++"An error occurred while importing the theme: Theme archive does not contain a "
+ "valid theme!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:427
+ msgid ""
+-"An error occured while importing the theme: Failed to open theme archive!"
++"An error occurred while importing the theme: Failed to open theme archive!"
+ msgstr ""
+ 
+ #: ../../src/gui/preferencesWindow.vala:451
+@@ -571,7 +571,7 @@ msgstr ""
+ 
+ #: ../../src/themes/theme.vala:176
+ msgid ""
+-"An error occured while exporting the theme \"%s\"! Please check the console "
++"An error occurred while exporting the theme \"%s\"! Please check the console "
+ "output."
+ msgstr ""
+ 
+Index: trunk/src/gui/preferencesWindow.vala
+===================================================================
+--- trunk.orig/src/gui/preferencesWindow.vala
++++ trunk/src/gui/preferencesWindow.vala
+@@ -398,7 +398,7 @@ public class PreferencesWindow : GLib.Ob
+         dialog.filter.add_pattern ("*.tar.gz");
+ 
+         var result = Gtk.MessageType.INFO;
+-        var message = _("Sucessfully imported new theme!");
++        var message = _("Successfully imported new theme!");
+ 
+         dialog.response.connect((d, r) => {
+             if (r == Gtk.ResponseType.ACCEPT) {
+@@ -412,19 +412,19 @@ public class PreferencesWindow : GLib.Ob
+                                 Config.global.load_themes(a.theme_name);
+                                 this.theme_list.reload();
+                             } else {
+-                                message = _("An error occured while importing the theme: Failed to extract theme!");
++                                message = _("An error occurred while importing the theme: Failed to extract theme!");
+                                 result = Gtk.MessageType.ERROR;
+                             }
+                         } else {
+-                            message = _("An error occured while importing the theme: A theme with this name does already exist!");
++                            message = _("An error occurred while importing the theme: A theme with this name does already exist!");
+                             result = Gtk.MessageType.ERROR;
+                         }
+                     } else {
+-                        message = _("An error occured while importing the theme: Theme archive does not contain a valid theme!");
++                        message = _("An error occurred while importing the theme: Theme archive does not contain a valid theme!");
+                         result = Gtk.MessageType.ERROR;
+                     }
+                 } else {
+-                    message = _("An error occured while importing the theme: Failed to open theme archive!");
++                    message = _("An error occurred while importing the theme: Failed to open theme archive!");
+                     result = Gtk.MessageType.ERROR;
+                 }
+                 a.close();
+Index: trunk/src/themes/theme.vala
+===================================================================
+--- trunk.orig/src/themes/theme.vala
++++ trunk/src/themes/theme.vala
+@@ -173,7 +173,7 @@ public class Theme : GLib.Object {
+             dialog.destroy();
+ 
+         } else {
+-            var message = _("An error occured while exporting the theme \"%s\"! Please check the console output.").printf(this.name);
++            var message = _("An error occurred while exporting the theme \"%s\"! Please check the console output.").printf(this.name);
+             var dialog = new Gtk.MessageDialog(null, Gtk.DialogFlags.MODAL,
+                                                Gtk.MessageType.ERROR, Gtk.ButtonsType.CLOSE, message);
+             dialog.run();
diff --git a/debian/patches/0700-ayatana-appindicator.patch b/debian/patches/0700-ayatana-appindicator.patch
new file mode 100644
index 0000000..d8a9905
--- /dev/null
+++ b/debian/patches/0700-ayatana-appindicator.patch
@@ -0,0 +1,77 @@
+Description: Switch to Ayatana AppIndicator
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=907551
+Forwarded: not-needed
+Last-Update: 2018-09-07
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,7 +26,7 @@
+ find_package(PkgConfig)
+ 
+ pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
+-pkg_check_modules(INDICATOR3 appindicator3-0.1)
++pkg_check_modules(INDICATOR3 ayatana-appindicator3-0.1)
+ pkg_check_modules(WNCK REQUIRED libwnck-3.0)
+ pkg_check_modules(BAMF libbamf3)
+ pkg_check_modules(GIO REQUIRED gio-unix-2.0)
+@@ -75,11 +75,7 @@
+     pkg_check_modules(GMENU REQUIRED libgnome-menu)
+ endif (${GMENU3_FOUND})
+ 
+-# notify application of presence of libappindicator
+-if (${INDICATOR_FOUND})
+-    LIST(APPEND CFLAGS -DHAVE_APPINDICATOR)
+-    LIST(APPEND VALA_DEFINES --define HAVE_APPINDICATOR)
+-endif (${INDICATOR_FOUND})
++# notify application of presence of libayatana-appindicator
+ if (${INDICATOR3_FOUND})
+     LIST(APPEND CFLAGS -DHAVE_APPINDICATOR)
+     LIST(APPEND VALA_DEFINES --define HAVE_APPINDICATOR)
+@@ -97,7 +93,6 @@
+     ${GTK3_LIBRARIES}
+     ${CAIRO_LIBRARIES}
+     ${GEE_LIBRARIES}
+-    ${INDICATOR_LIBRARIES}
+     ${INDICATOR3_LIBRARIES}
+     ${XML_LIBRARIES}
+     ${XTST_LIBRARIES}
+@@ -117,7 +112,6 @@
+     ${GTK3_LIBRARY_DIRS}
+     ${CAIRO_LIBRARY_DIRS}
+     ${GEE_LIBRARY_DIRS}
+-    ${INDICATOR_LIBRARY_DIRS}
+     ${INDICATOR3_LIBRARY_DIRS}
+     ${XML_LIBRARY_DIRS}
+     ${XTST_LIBRARY_DIRS}
+@@ -134,7 +128,6 @@
+     ${GTK3_INCLUDE_DIRS}
+     ${CAIRO_INCLUDE_DIRS}
+     ${GEE_INCLUDE_DIRS}
+-    ${INDICATOR_INCLUDE_DIRS}
+     ${INDICATOR3_INCLUDE_DIRS}
+     ${XML_INCLUDE_DIRS}
+     ${XTST_INCLUDE_DIRS}
+@@ -166,12 +159,8 @@
+     libarchive
+ )
+ 
+-if (${INDICATOR_FOUND})
+-    LIST(APPEND VALA_PKGS appindicator-0.1)
+-endif (${INDICATOR_FOUND})
+-
+ if (${INDICATOR3_FOUND})
+-    LIST(APPEND VALA_PKGS appindicator3-0.1)
++    LIST(APPEND VALA_PKGS ayatana-appindicator3-0.1)
+ endif (${INDICATOR3_FOUND})
+ 
+ if (${GMENU3_FOUND})
+@@ -210,7 +199,6 @@
+ message( "  GTK3_LIBRARIES = ${GTK3_LIBRARIES}" )
+ message( "  CAIRO_LIBRARIES = ${CAIRO_LIBRARIES}" )
+ message( "  GEE_LIBRARIES = ${GEE_LIBRARIES}" )
+-message( "  INDICATOR_LIBRARIES = ${INDICATOR_LIBRARIES}" )
+ message( "  INDICATOR3_LIBRARIES = ${INDICATOR3_LIBRARIES}" )
+ message( "  XML_LIBRARIES = ${XML_LIBRARIES}" )
+ message( "  XTST_LIBRARIES = ${XTST_LIBRARIES}" )
diff --git a/debian/patches/series b/debian/patches/series
index 23920e0..5d085d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,4 @@
 #0500_bamf3-vapi.patch
+0700-ayatana-appindicator.patch
+0105-spelling_errors.patch
+0100-fix-ftbfs_vala_0_42.patch