lp:~ubuntu-branches/ubuntu/natty/gtimelog/natty-201102031616

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/natty/gtimelog at revision 15

Ubuntu branches: Pending requested 2011-02-03

Diff: 198 lines (+137/-0) (has conflicts)

6 files modified

debian/gtimelog.install (+2/-0)
debian/gtimelog.manpages (+1/-0)
debian/patches/fix-appindicator (+33/-0)
debian/patches/force-gi (+12/-0)
debian/patches/series (+2/-0)
src/gtimelog/main.py (+87/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

15. By Martin Pitt on 2011-02-03

releasing version 0.5.0+bzr185-0ubuntu1

14. By Martin Pitt on 2011-02-02

debian/control: Bump python-gobject dependency to ensure that we have
working PyGI.

13. By Martin Pitt on 2011-02-02

Add debian/patches/fix-appindicator: Fix startup with appindicator.

12. By Martin Pitt on 2011-02-02

* Add debian/patches/force-gi: We want to use GI now, not gtk2.
* debian/control: Update dependencies for pygtk → pygi transition, and drop
  obsolete python-glade2 dependency. Also add gir1.2-appindicator-0.1
  dependency to ensure working AppIndicator for Ubuntu.

11. By Martin Pitt on 2011-02-02

Drop debian/patches/glade-icon, obsolete now.

10. By Martin Pitt on 2011-02-02

debian/control, debian/rules: Change from pysupport to dh_python2.

9. By Martin Pitt on 2011-02-02

Drop debian/patches/setup-datafiles, it doesn't apply any more. Replace it
with debian/gtimelog.install and debian/gtimelog.manpages.

8. By Martin Pitt on 2011-02-01

* New upstream release 0.5.0:
  - Switched from Glade to GtkBuilder.
  - Support Ubuntu's application indicators.
  - Try to detect your theme color and make the tray icon dark or
    bright, for good contrast. (LP: #700428)
  - Made GTimeLog a single instance application. Requires python-dbus.
    (LP: #356495)
  - New option: start_in_tray. Defaults to false. (LP: #356495)
  - New command-line option: --tray.
  - Daily reports include totals by category.
  - The tasks pane can be toggled by pressing F9 and has a close button.
  - Alternative weekly and monthly report style.
  - Always preserve the order of entries, even when they have the same
    timestamp (LP: #708825)
* New upstream snapshot:
  - Ported from PyGTK to GI. This supports GTK 2 and GTK 3 with GI now, but
    still works with PyGTK.

7. By Martin Pitt on 2011-02-01

unapply patches

6. By Matthias Klose on 2010-12-08

Rebuild with python 2.7 as the python default.