diff -Nru teatime-unity-14.11+git77~ubuntu15.04.1/debian/changelog teatime-unity-16.07+git201608252357~ubuntu15.04.1/debian/changelog --- teatime-unity-14.11+git77~ubuntu15.04.1/debian/changelog 2016-05-24 22:24:36.000000000 +0000 +++ teatime-unity-16.07+git201608252357~ubuntu15.04.1/debian/changelog 2016-08-26 00:11:46.000000000 +0000 @@ -1,8 +1,15 @@ -teatime-unity (14.11+git77~ubuntu15.04.1) vivid; urgency=low +teatime-unity (16.07+git201608252357~ubuntu15.04.1) vivid; urgency=low * Auto build. - -- Pavel Rojtberg Tue, 24 May 2016 22:24:36 +0000 + -- Pavel Rojtberg Fri, 26 Aug 2016 00:11:46 +0000 + +teatime-unity (16.07-1) xenial; urgency=low + + * allow to run as as snap package + * fix GIR versioning warnings + + -- Pavel Rojtberg Thu, 21 Jul 2016 00:55:25 +0200 teatime-unity (14.11-1) trusty; urgency=low diff -Nru teatime-unity-14.11+git77~ubuntu15.04.1/debian/git-build-recipe.manifest teatime-unity-16.07+git201608252357~ubuntu15.04.1/debian/git-build-recipe.manifest --- teatime-unity-14.11+git77~ubuntu15.04.1/debian/git-build-recipe.manifest 2016-05-24 22:24:36.000000000 +0000 +++ teatime-unity-16.07+git201608252357~ubuntu15.04.1/debian/git-build-recipe.manifest 2016-08-26 00:11:46.000000000 +0000 @@ -1,2 +1,2 @@ -# git-build-recipe format 0.4 deb-version {debupstream}+git77 -lp:teatime git-commit:82fad9e4ba40c1c2dcaf73759babe112cf08a213 +# git-build-recipe format 0.4 deb-version {debupstream}+git201608252357 +lp:teatime git-commit:2d6920768e6020857f2679d4b9ccb838e75fe851 diff -Nru teatime-unity-14.11+git77~ubuntu15.04.1/setup/gui/icon.svg teatime-unity-16.07+git201608252357~ubuntu15.04.1/setup/gui/icon.svg --- teatime-unity-14.11+git77~ubuntu15.04.1/setup/gui/icon.svg 1970-01-01 00:00:00.000000000 +0000 +++ teatime-unity-16.07+git201608252357~ubuntu15.04.1/setup/gui/icon.svg 2016-08-26 00:11:46.000000000 +0000 @@ -0,0 +1,244 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru teatime-unity-14.11+git77~ubuntu15.04.1/setup/gui/teatime.desktop teatime-unity-16.07+git201608252357~ubuntu15.04.1/setup/gui/teatime.desktop --- teatime-unity-14.11+git77~ubuntu15.04.1/setup/gui/teatime.desktop 1970-01-01 00:00:00.000000000 +0000 +++ teatime-unity-16.07+git201608252357~ubuntu15.04.1/setup/gui/teatime.desktop 2016-08-26 00:11:46.000000000 +0000 @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Name=Tea Time +GenericName=Timer +Keywords=egg; +Exec=${SNAP}/usr/share/teatime/teatime.py +Path=${SNAP}/usr/share/teatime/ +Icon=${SNAP}/meta/gui/icon.svg +Terminal=false +Categories=Utility;GTK; diff -Nru teatime-unity-14.11+git77~ubuntu15.04.1/setup.py teatime-unity-16.07+git201608252357~ubuntu15.04.1/setup.py --- teatime-unity-14.11+git77~ubuntu15.04.1/setup.py 2016-05-24 22:24:36.000000000 +0000 +++ teatime-unity-16.07+git201608252357~ubuntu15.04.1/setup.py 2016-08-26 00:11:46.000000000 +0000 @@ -18,7 +18,7 @@ cmdclass = {"build": build_extra.build_extra, "build_i18n": my_build_i18n}, name = "teatime", - version = "14.11", + version = "16.07", description = "A simple egg timer application for the Unity Desktop", author = "Pavel Rojtberg", author_email = "pavel@rojtberg.net", diff -Nru teatime-unity-14.11+git77~ubuntu15.04.1/snapcraft.yaml teatime-unity-16.07+git201608252357~ubuntu15.04.1/snapcraft.yaml --- teatime-unity-14.11+git77~ubuntu15.04.1/snapcraft.yaml 1970-01-01 00:00:00.000000000 +0000 +++ teatime-unity-16.07+git201608252357~ubuntu15.04.1/snapcraft.yaml 2016-08-26 00:11:46.000000000 +0000 @@ -0,0 +1,29 @@ +name: teatime +version: 16.07 +#confinement: strict # fails automatic build on launchpad +summary: Simple egg timer application for the Unity Desktop +description: A simple egg-timer type application to time your teas. + Rings an alarm and displays an desktop notification, when the tea is ready. + Supports saving several pre-set timers. + +apps: + teatime: + command: desktop-launch $SNAP/usr/share/teatime/teatime.py + plugs: [unity7, home, pulseaudio] + +parts: + teatime: + plugin: python3 + source: git://git.launchpad.net/teatime + stage-packages: + - python3-distutils-extra + - sound-theme-freedesktop + - pulseaudio-utils + - python3-gi + - gir1.2-unity-5.0 + - gir1.2-notify-0.7 + - gir1.2-gtk-3.0 + - gir1.2-pango-1.0 + after: [desktop/gtk3] + stage: + - -usr/share/pkgconfig # also in desktop/gtk3 diff -Nru teatime-unity-14.11+git77~ubuntu15.04.1/teatime.py teatime-unity-16.07+git201608252357~ubuntu15.04.1/teatime.py --- teatime-unity-14.11+git77~ubuntu15.04.1/teatime.py 2016-05-24 22:24:36.000000000 +0000 +++ teatime-unity-16.07+git201608252357~ubuntu15.04.1/teatime.py 2016-08-26 00:11:46.000000000 +0000 @@ -4,7 +4,12 @@ import json import locale import subprocess +import os +import gi +gi.require_version("Unity", "7.0") +gi.require_version("Gtk", "3.0") +gi.require_version("Notify", "0.7") from gi.repository import Unity, GObject, Gtk, Notify, Gdk, Pango, GLib GETTEXT_DOMAIN = "teatime" @@ -17,6 +22,10 @@ #DATA = os.path.expanduser("~/workspace/teatime/") DATA = "/usr/share/teatime/" +if "SNAP" in os.environ: + DATA = os.environ["SNAP"] + DATA + SOUND_ALERT_FILE = os.environ["SNAP"] + SOUND_ALERT_FILE + # use locale instead of gettext, so GTK gets the change locale.bindtextdomain(GETTEXT_DOMAIN, DATA+"locale/") locale.textdomain(GETTEXT_DOMAIN) @@ -315,7 +324,11 @@ self.le.set_property("urgent", True) # if true gets called again - return p < 1.0 + if p < 1.0: + return True + else: + self.tick_src = None + return False def end(self, *a): self.stop()