--- hamster-applet-2.32.1.orig/debian/compat +++ hamster-applet-2.32.1/debian/compat @@ -0,0 +1 @@ +5 --- hamster-applet-2.32.1.orig/debian/docs +++ hamster-applet-2.32.1/debian/docs @@ -0,0 +1 @@ +NEWS --- hamster-applet-2.32.1.orig/debian/preinst +++ hamster-applet-2.32.1/debian/preinst @@ -0,0 +1,8 @@ +#! /bin/sh +set -e + +if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt 2.26; then + pycentral pkgremove hamster-applet +fi + +#DEBHELPER# --- hamster-applet-2.32.1.orig/debian/watch +++ hamster-applet-2.32.1/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://ftp.gnome.org/pub/GNOME/sources/hamster-applet/([\d\.]+)/ \ + hamster-applet-(.*)\.tar\.gz --- hamster-applet-2.32.1.orig/debian/control +++ hamster-applet-2.32.1/debian/control @@ -0,0 +1,52 @@ +# This file is autogenerated. DO NOT EDIT! +# +# Modifications should be made to debian/control.in instead. +# This file is regenerated automatically in the clean target. + +Source: hamster-applet +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Pedro Fragoso +Uploaders: Debian GNOME Maintainers +Build-Depends: cdbs, + debhelper (>= 5.0.51~), + gnome-pkg-tools, + python-support (>= 0.7.1), + python-dev (>= 2.5), + pkg-config, + intltool (>= 0.37.1), + libgtk2.0-dev (>= 2.12.0), + python-gtk2-dev (>= 2.12.0), + python-gnome2-desktop-dev (>= 2.10.0), + python-gobject-dev (>= 2.14.0), + gnome-doc-utils (>= 0.17.3), + gnome-control-center-dev, + quilt +Standards-Version: 3.9.1 +Homepage: http://projecthamster.wordpress.com +XS-Python-Version: >= 2.5 + +Package: hamster-applet +Architecture: any +XB-Python-Version: ${python:Versions} +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends}, + python (>= 2.5), + python-cairo, + python-gtk2 (>= 2.12.0), + python-gconf, + python-evolution (>= 2.10.0), + python-dbus, + python-gobject (>= 2.14.0), + python-gnome2, + python-wnck +Recommends: python-notify +Description: time tracking application for GNOME + Project Hamster helps you to keep track of how much time you spend on various + activities during the day. Whenever you move from one task to another, you + change your current activity in the Hamster application. + . + It can present graphical statistics of how long you have spent on each task, + and may be useful for project management or keeping employee timesheets. --- hamster-applet-2.32.1.orig/debian/changelog +++ hamster-applet-2.32.1/debian/changelog @@ -0,0 +1,393 @@ +hamster-applet (2.32.1-0ubuntu5) oneiric; urgency=low + + * debian/patches/06-lp799809.patch: fix traceback when editing categories + and activity['category'] is defined (LP: #799809) + + -- Jamie Strandboge Tue, 23 Aug 2011 06:37:38 -0500 + +hamster-applet (2.32.1-0ubuntu4) oneiric; urgency=low + + * 05-dont-traceback-on-quit.patch: don't traceback if saving to gconf fails, + but instead indicate to the caller that there was an error (LP: #816460) + + -- Jamie Strandboge Thu, 28 Jul 2011 09:15:07 -0500 + +hamster-applet (2.32.1-0ubuntu3) oneiric; urgency=low + + * 04-dont-fail-on-applet-import.patch: if import of gnomeapplet fails, + default to upper panel orientation. Inspired by work by Alberto Milone in + preparation for indicator work. + + -- Jamie Strandboge Thu, 28 Jul 2011 08:10:15 -0500 + +hamster-applet (2.32.1-0ubuntu2) oneiric; urgency=low + + * make hamster-applet installable again. It works fine in standalone mode. + This should all be undone once upstream has a version that works with + gnome3. + - debian/control*: + + remove Depends on python-gnomeapplet + + update to describe hamster as an application, not an applet. Of + course, there is still the name... + - debian/patches/03-dont-install-applet.patch: don't install + src/hamster-applet, bonobo files, or its desktop file + - LP: #801477 + + -- Jamie Strandboge Fri, 22 Jul 2011 16:14:31 -0500 + +hamster-applet (2.32.1-0ubuntu1) natty; urgency=low + + * New upstream release. + * debian/control: + - Drop Vcs-Bzr link (use lp:ubuntu/hamster-applet) + - Use standards-version 3.9.1 + * debian/patches/01_label_blank_mode.patch: + * debian/patches/03_lp690647.patch: + - Applied upstream + + -- Robert Ancell Tue, 08 Feb 2011 12:36:25 +1100 + +hamster-applet (2.31.92-0ubuntu4) natty; urgency=low + + * debian/patches/03_lp690647.patch: fix stop tracking button by setting + self.__cur after ending the transaction (LP: #690647) + + -- Jamie Strandboge Tue, 25 Jan 2011 08:03:14 -0600 + +hamster-applet (2.31.92-0ubuntu3) natty; urgency=low + + * debian/patches/02_lp705482.patch: use cell-background-gdk instead of + cell-background when setting the background color (LP: #705482) + + -- Jamie Strandboge Tue, 25 Jan 2011 07:32:57 -0600 + +hamster-applet (2.31.92-0ubuntu2) maverick; urgency=low + + * LP: #646696 - Add patch from GIT to fix an issue with old, incorrect and + random descriptions being presented in the UI + - add debian/patches/01_label_blank_mode.patch + - add debian/patches/series + - update debian/control{.in} + - update debian/rules + + -- Chris Coulson Fri, 24 Sep 2010 10:51:09 +0100 + +hamster-applet (2.31.92-0ubuntu1) maverick; urgency=low + + * New upstream release. (LP: #629495) Fixes bugs: + - Hamster is always using 1% of the CPU (LP: #620113) + * removed 01_startup-fix.patch and 02_fix_imports.patch + * debian/rules: + - upstream has switched to waf, modified debian/rules accordingly. + * debian/control.in: + - bump debhelper dependency to 5.0.51~ for dh_icons + - bump Standards-Version to 3.9.1, no changes we required + - add Build-Dependency on gnome-control-center-dev + - add Dependency on python-wnck + - changed Homepage + * debian/copyright: + - Removed licenses for files that were removed from archive + - Refreshed Copyright Holders list + + -- Krzysztof Klimonda Sun, 19 Sep 2010 08:51:59 +0200 + +hamster-applet (2.30.1-0ubuntu2) maverick; urgency=low + + * Change strange "from .hamster import" statements occurring inside the + hamster python module, causing ImportErrors. (LP: #600857) + Patch from Martin Pool. Thanks! + + -- Christopher James Halse Rogers Fri, 02 Jul 2010 12:27:54 +1000 + +hamster-applet (2.30.1-0ubuntu1) maverick; urgency=low + + * New upstream release. (LP: #580522) + * Fixes Bugs: + - Can't drag tags between categories (LP: #574499) + + -- Krzysztof Klimonda Fri, 14 May 2010 16:29:15 +0200 + +hamster-applet (2.30.0.1-0ubuntu1) lucid; urgency=low + + * New upstream release. + + -- Andrew Starr-Bochicchio Thu, 15 Apr 2010 23:51:52 -0400 + +hamster-applet (2.29.90-0ubuntu1) lucid; urgency=low + + * New upstream version + - workspace tracking - switch activity, when switching desktops + - chart improvements - theme friendly and less noisier + - for those without GNOME panel there is now a standalone version, + accessible via Applications -> Accessories -> Time Tracker + - overview window remembers position + - maintaining cursor on the selected row after edits / refreshes + - descriptions once again in the main input field, delimited by comma + - activity suggestion box now sorts items by recency (Patryk Zawadzki) + - searching + - simplified save report dialog, thanks to the what you see is what you + report revamp + - overview/stats replaced with activities / totals and stats accessible + from totals + - interactive graphs to drill down in totals + - miscellaneous performance improvements + - pixel-perfect graphs + * Updated 01_startup-fix.patch to apply to new source layout + * debian/control: + - Add build-depend on gnome-doc-utils + + -- Chris Coulson Wed, 10 Feb 2010 02:52:31 +0000 + +hamster-applet (2.29.4-0ubuntu1) lucid; urgency=low + + [ Robert Ancell ] + * debian/control.in: + - Remove old debian VCS links + + [ Andrew Starr-Bochicchio ] + * New upstream release. (LP: #488783) + - Fixed problems with hamster interfering with + screensaver hibernation code. (LP: #448438) + - Fixes to the dropdown in compiz (not spanning + over virtual desktops anymore). (LP: #303572) + + * Merge with Debian testing, remaining Ubuntu changes: + - Adapt debian/watch to take unstable version. + - Point Vcs field at lp:~ubuntu-desktop/hamster-applet/ubuntu + + -- Andrew Starr-Bochicchio Tue, 22 Dec 2009 17:52:52 -0500 + +hamster-applet (2.28.1-1) unstable; urgency=low + + * New upstream release. + + -- Emilio Pozuelo Monfort Thu, 22 Oct 2009 22:01:54 +0200 + +hamster-applet (2.28.0-1) unstable; urgency=low + + * New upstream release. + - Fixes to idle detection (Closes: #538790). + * debian/control.in: + - added a depends on python-gnome2 needed at runtime. + - removed python-glade2 depends, it's no more needed. + * debian/copyright: + - added missing copyright holders. + * debian/patches/01_startup-fix.patch: + - this patch removes the __file__ test at startup preventing + hamster to fail when loading needed modules. + * debian/rules: + - added simple-patchsys.mk include. + + -- Andrea Veri Mon, 28 Sep 2009 17:06:17 +0200 + +hamster-applet (2.28.0-0ubuntu1) karmic; urgency=low + + * New upstream release: + - Updated translations. + + -- Chris Coulson Wed, 23 Sep 2009 22:29:40 +0100 + +hamster-applet (2.27.90-0ubuntu1) karmic; urgency=low + + * New upstream release (LP: #411662) + - Fixes to idle detection (now works with gnome screensaver 2.27+) + - return of the day view + - UI layout fixes to match HIG + - now it is possible to add more than one applet to panel without crashing + - Updated translations + * Closes Launchpad bugs: + - hamster-applet crashed with GError in load_ui_file() (LP: #387939) + - hamster-applet crashed with KeyError in add_to_connection() (LP: #323468) + + -- Krzysztof Klimonda Fri, 07 Aug 2009 08:46:48 +0200 + +hamster-applet (2.27.5-0ubuntu1) karmic; urgency=low + + * New upstream release (LP: #407898) + - Better autocomplete + - More skeptic on parsing time + - Legend in overview is sized proportionally to screen size, + allowing larger labels + - Now it is possible to copy/paste activities in the overview + - mostly polishing and bug fixing the new stuff brought in in 2.27 cycle + + -- Krzysztof Klimonda Sun, 02 Aug 2009 09:30:27 +0200 + +hamster-applet (2.27.3-0ubuntu1) karmic; urgency=low + + * New upstream release: + - A much better DBUS support (Felix Ontanon) + - Switch days at 5am because humans tend to work late. Overlapping + activities fall in day where the largest part of it is (Patryk Zawadski) + - Now you can enter negatives minutes to start an activity in past. + Example "-30 cookies" will start activity "cookies" 30 minutes before now + - TSV, XML and iCal export + - Ability to filter task by date and category + - Overview has been improved by adding some nifty statistics for your + pleasure + - Now a reminder is displayed every configured amount of time also when no + activity is being tracked. (Can be disabled in preferences) + - Allow to switch to same task if description differs + - Activity edit icon in dropdown is now keyboard accessible + - Start time and end time can be specified when typing in task. + Example: 00:04 Hamster + - slightly smarter autocomplete with category suggestions when after @ + symbol + - fixes to edit activity dialog's end time field + - Overview window graphs have been redone and now are less noisy + - Tasks now can span over midnight, showing correct per-day totals in + overview + - Add earlier activity / edit activity has been overhauled and now is much + easier to use. An experimental preview has been added + - In preferences UI buttons have been added for editing and deletion + - Glade files have been migrated to gtkbuilder format + - now it is possible to start overview and other windows straight from + command line using "-s [stats|edit|prefs]" switch + - Updated translations + * debian/control.in: + - Add Vcs-Bzr tag + * Adapt debian/watch to take unstable version + * Remove debian/patches/01_use_ubuntu_notifications.patch as in current + version now + + -- Didier Roche Tue, 16 Jun 2009 11:59:52 +0200 + +hamster-applet (2.26.3-1) unstable; urgency=low + + [ Josselin Mouette ] + * Add missing dependencies on python-dbus and python-gconf. + * Replace the python-gnome2-desktop dependency by python-evolution and + python-gnomeapplet. Closes: #542324. + + [ Emilio Pozuelo Monfort ] + * New upstream bugfix release. + * Add missing dependency on python-cairo. + * Standards-Version is 3.8.3, no chanes needed. + * Point Vcs-* to the unstable branch. + * Add "Copyright" to the packaging copyright statement. + + -- Emilio Pozuelo Monfort Sat, 29 Aug 2009 00:00:12 +0200 + +hamster-applet (2.26.2-1) unstable; urgency=low + + [ Pedro Fragoso ] + * New upstream version + * Bump Standards to 3.8.1 (no changes) + + [ Josselin Mouette ] + * Switch to python-support. + * Add a preinst snippet to cleanup for broken pycentral versions. + + -- Josselin Mouette Sat, 27 Jun 2009 16:11:57 +0200 + +hamster-applet (2.26.0-0ubuntu2) jaunty; urgency=low + + * debian/rules, debian/patches/01_use_ubuntu_notifications.patch: + - cherry-picked from upstream to honor jaunty notifications system + (LP: #362393) + + -- Pedro Fragoso Thu, 16 Apr 2009 20:52:38 +0100 + +hamster-applet (2.26.0-0ubuntu1) jaunty; urgency=low + + * New upstream release (LP: #344003) + - Final fixes to utf-8 and Python 2.6 sqlite + + -- Pedro Fragoso Tue, 17 Mar 2009 00:47:05 +0000 + +hamster-applet (2.25.92-0ubuntu1) jaunty; urgency=low + + * New upstream release (LP: #337058) + - Fixed problems with utf-8 and Python 2.6 sqlite + - Escaping user input so they don't break UI where pango is used + - Stop tracking on shutdown was ignoring user preference + + -- Pedro Fragoso Tue, 03 Mar 2009 03:46:38 +0000 + +hamster-applet (2.25.91-0ubuntu2) jaunty; urgency=low + + * No change rebuild for python2.6 (LP: #336378) + + -- Pedro Fragoso Sun, 01 Mar 2009 20:18:48 +0000 + +hamster-applet (2.25.91-0ubuntu1) jaunty; urgency=low + + * New upstream release (LP: #330371) + - Show day totals in statistics (patch by Daniel Watkins) + - Better keyboard support (Enter / Escape, patch by Daniel Watkins) + - Fixes to detect alternative pygtk (Frederic Peters) + - Fixes to support Japanese better (Takao Fujiwara) + - Python 2.6 support (Patryk Zawadzki) + - Better duplicate entry checks in activities / categories + + -- Pedro Fragoso Tue, 17 Feb 2009 02:18:21 +0000 + +hamster-applet (2.25.90-0ubuntu1) jaunty; urgency=low + + * Sync with Debian experimental + * New upstream release (LP: #324878) + * Maintainer is Desktop Team + * Set watch file to development releases + + -- Pedro Fragoso Tue, 03 Feb 2009 14:29:10 +0000 + +hamster-applet (2.24.3-1) unstable; urgency=low + + * New upstream bugfix and translation release. + + -- Josselin Mouette Thu, 05 Mar 2009 18:19:45 +0100 + +hamster-applet (2.24.2-1) experimental; urgency=low + + [ Emilio Pozuelo Monfort ] + * New upstream release. + * Adapt the package to pkg-gnome. + * Require Python >= 2.5 for the sqlite bindings. + + [ Pedro Fragoso ] + * Initial upload to Debian (Closes: #477972) + - Thanks Tim Retout for the initial ITP and permission + + [ Loic Minier ] + * Cleanup whitespaces. + * Use /experimental instead of /unstable in Vcs-* fields. + * Drop libxss-dev build-dep. + + -- Pedro Fragoso Thu, 04 Dec 2008 17:47:03 +0000 + +hamster-applet (2.24.1-0ubuntu1) intrepid; urgency=low + + * New upstream release (lp: #286459) + - Properly handle first day of week for all locale values. + Fixes #554256. (lp: #275709) + + -- Pedro Fragoso Mon, 20 Oct 2008 11:46:39 +0100 + +hamster-applet (2.24.0-0ubuntu1) intrepid; urgency=low + + * New upstream release (LP: #273327) + - some more strings available for translation, but the main changes + are the updated translations + + -- Pedro Fragoso Mon, 22 Sep 2008 21:57:33 +0100 + +hamster-applet (2.23.92-0ubuntu1) intrepid; urgency=low + + * New upstream release (LP: #262744) + - fixed code so that it works also with Python 2.4 + - Fixed bug with tasks falling into unsorted category (bug #548914) + - Fixed error when switching tasks with doubleclick + - Bump up pygtk and libgtk to 2.12, pyobject to 2.14 + intltool to 0.37.1 + - Downgrade XS-python and python b-d and depends to 2.4 + * debian/control: + - Change Homepage field to GNOME url + + -- Pedro Fragoso Mon, 08 Sep 2008 17:37:05 +0100 + +hamster-applet (2.23.90-0ubuntu1) intrepid; urgency=low + + * Initial release (LP: #255179) + + -- Pedro Fragoso Wed, 06 Aug 2008 01:04:12 +0100 + --- hamster-applet-2.32.1.orig/debian/control.in +++ hamster-applet-2.32.1/debian/control.in @@ -0,0 +1,47 @@ +Source: hamster-applet +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Pedro Fragoso +Uploaders: @GNOME_TEAM@ +Build-Depends: cdbs, + debhelper (>= 5.0.51~), + gnome-pkg-tools, + python-support (>= 0.7.1), + python-dev (>= 2.5), + pkg-config, + intltool (>= 0.37.1), + libgtk2.0-dev (>= 2.12.0), + python-gtk2-dev (>= 2.12.0), + python-gnome2-desktop-dev (>= 2.10.0), + python-gobject-dev (>= 2.14.0), + gnome-doc-utils (>= 0.17.3), + gnome-control-center-dev, + quilt +Standards-Version: 3.9.1 +Homepage: http://projecthamster.wordpress.com +XS-Python-Version: >= 2.5 + +Package: hamster-applet +Architecture: any +XB-Python-Version: ${python:Versions} +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends}, + python (>= 2.5), + python-cairo, + python-gtk2 (>= 2.12.0), + python-gconf, + python-evolution (>= 2.10.0), + python-dbus, + python-gobject (>= 2.14.0), + python-gnome2, + python-wnck +Recommends: python-notify +Description: time tracking application for GNOME + Project Hamster helps you to keep track of how much time you spend on various + activities during the day. Whenever you move from one task to another, you + change your current activity in the Hamster application. + . + It can present graphical statistics of how long you have spent on each task, + and may be useful for project management or keeping employee timesheets. --- hamster-applet-2.32.1.orig/debian/rules +++ hamster-applet-2.32.1/debian/rules @@ -0,0 +1,47 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/utils.mk +#include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +waf-configure-options = --prefix=/usr + +DEB_MAKE_CLEAN_TARGET = clean +DEB_MAKE_CONFIGURE_TARGET = configure +DEB_MAKE_INSTALL_TARGET = install +DEB_MAKE_INVOKE = ./waf -v --destdir=$(CURDIR)/debian/hamster-applet/ + +clean:: + rm -f .lock-wscript + rm -rf .waf* + rm -rf build/ + +common-configure-arch common-configure-indep:: common-configure-impl +common-configure-impl:: debian/stamp-waf-configure +debian/stamp-waf-configure: + ./waf $(waf-configure-options) $(DEB_MAKE_CONFIGURE_TARGET) + touch $@ +clean:: + rm -f debian/stamp-waf-configure + +build/hamster-applet:: debian/stamp-waf-build +debian/stamp-waf-build: + $(DEB_MAKE_INVOKE) + touch $@ +clean:: + rm -f debian/stamp-waf-build + +install/hamster-applet:: debian/stamp-waf-install +debian/stamp-waf-install: + $(DEB_MAKE_INVOKE) $(DEB_MAKE_INSTALL_TARGET) + touch $@ +clean:: + rm -f debian/stamp-waf-install + +binary-install/hamster-applet:: + dh_pysupport -phamster-applet + dh_gconf -phamster-applet + dh_icons -phamster-applet --- hamster-applet-2.32.1.orig/debian/copyright +++ hamster-applet-2.32.1/debian/copyright @@ -0,0 +1,38 @@ +This package was debianized by Pedro Fragoso on +Wed, 06 Aug 2008 01:04:12 +0100. + +It was downloaded from ftp://ftp.gnome.org/pub/GNOME/sources/hamster-applet/ + +Upstream Authors: + + Patryk Zawadzki + Toms Bauģis + +Copyright Holders: + + Copyright (C) 2007-2009 Patryk Zawadzki + Copyright (C) 2008-2010 Toms Bauģis + Copyright (C) 2008 Pēteris Caune + Copyright (C) 2008, J. Fèlix Ontañón + Copyright (C) 2008 Pēteris Caune + Copyright (C) 2008 Nathan Samson + Copyright (C) 2008 Giorgos Logiotatidis + Copyright (C) 1996, 2008 Free Software Foundation, Inc + Copyright (C) 2009-2010 Rico Tzschichholz + Copyright (C) 2009-2010 Jason Smith + +License: + + Project Hamster is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Project Hamster is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Project Hamster. If not, see . + Or see `/usr/share/common-licenses/GPL-3`. --- hamster-applet-2.32.1.orig/debian/patches/03-dont-install-applet.patch +++ hamster-applet-2.32.1/debian/patches/03-dont-install-applet.patch @@ -0,0 +1,79 @@ +Author: Jamie Strandboge +Description: don't install src/hamster-applet, which won't work without + python-gnomeapplet. Also don't install the bonobo or desktop file. +Forwarded: not-needed (upstream is porting to gnome3) + +Index: hamster-applet-2.32.1/wscript +=================================================================== +--- hamster-applet-2.32.1.orig/wscript 2011-07-22 17:01:09.000000000 -0500 ++++ hamster-applet-2.32.1/wscript 2011-07-22 17:17:57.000000000 -0500 +@@ -42,7 +42,8 @@ + + + def build(bld): +- bld.install_files('${LIBDIR}/hamster-applet', 'src/hamster-applet', chmod = 0755) ++ # no point installing something that doesn't work (LP: #801477) ++ #bld.install_files('${LIBDIR}/hamster-applet', 'src/hamster-applet', chmod = 0755) + bld.install_files('${BINDIR}', + """src/hamster-time-tracker + src/hamster-cli +Index: hamster-applet-2.32.1/data/wscript_build +=================================================================== +--- hamster-applet-2.32.1.orig/data/wscript_build 2011-07-22 17:01:09.000000000 -0500 ++++ hamster-applet-2.32.1/data/wscript_build 2011-07-22 17:18:39.000000000 -0500 +@@ -13,11 +13,11 @@ + bld.install_files('${DATADIR}/icons/hicolor/scalable/apps','art/scalable/hamster-applet.svg') + + +-bld(features = "subst", +- source= "hamster-applet.desktop.in.in", +- target= "hamster-applet.desktop.in", +- dict = bld.env +- ) ++#bld(features = "subst", ++# source= "hamster-applet.desktop.in.in", ++# target= "hamster-applet.desktop.in", ++# dict = bld.env ++# ) + + bld(features = "subst", + source= "hamster-time-tracker.desktop.in.in", +@@ -25,11 +25,11 @@ + dict = bld.env + ) + +-bld(features = "subst", +- source= "Hamster_Applet.server.in.in", +- target= "Hamster_Applet.server.in", +- dict = bld.env +- ) ++#bld(features = "subst", ++# source= "Hamster_Applet.server.in.in", ++# target= "Hamster_Applet.server.in", ++# dict = bld.env ++# ) + + bld.add_group() + +@@ -47,14 +47,14 @@ + flags = ['-s', '-u', '-c']) + + bld(features = 'intltool_in', +- source = """hamster-time-tracker.desktop.in +- hamster-applet.desktop.in""", ++ source = """hamster-time-tracker.desktop.in""", ++ #hamster-applet.desktop.in""", + install_path = '${DATADIR}/applications', + podir = '../po', + flags = ['-d', '-q', '-u', '-c']) + +-bld(features = 'intltool_in', +- source = 'Hamster_Applet.server.in', +- install_path = '${LIBDIR}/bonobo/servers', +- podir = '../po', +- flags = ['-o', '-u', '-c']) ++#bld(features = 'intltool_in', ++# source = 'Hamster_Applet.server.in', ++# install_path = '${LIBDIR}/bonobo/servers', ++# podir = '../po', ++# flags = ['-o', '-u', '-c']) --- hamster-applet-2.32.1.orig/debian/patches/05-dont-traceback-on-quit.patch +++ hamster-applet-2.32.1/debian/patches/05-dont-traceback-on-quit.patch @@ -0,0 +1,41 @@ +Author: Jamie Strandboge +Description: don't traceback if saving to gconf fails, but instead indicate + to the caller that there was an error +Forwarded: no +Bug-Ubuntu: https://bugs.launchpad.net/bugs/816460 + +Index: hamster-applet-2.32.1/src/hamster/configuration.py +=================================================================== +--- hamster-applet-2.32.1.orig/src/hamster/configuration.py 2011-07-28 08:55:41.000000000 -0500 ++++ hamster-applet-2.32.1/src/hamster/configuration.py 2011-07-28 09:13:24.000000000 -0500 +@@ -282,16 +282,20 @@ + #for gconf refer to the full key path + key = self._fix_key(key) + +- if vtype is bool: +- self._client.set_bool(key, value) +- elif vtype is str: +- self._client.set_string(key, value) +- elif vtype is int: +- self._client.set_int(key, value) +- elif vtype in (list, tuple): +- #Save every value as a string +- strvalues = [str(i) for i in value] +- self._client.set_list(key, gconf.VALUE_STRING, strvalues) ++ try: ++ if vtype is bool: ++ self._client.set_bool(key, value) ++ elif vtype is str: ++ self._client.set_string(key, value) ++ elif vtype is int: ++ self._client.set_int(key, value) ++ elif vtype in (list, tuple): ++ #Save every value as a string ++ strvalues = [str(i) for i in value] ++ self._client.set_list(key, gconf.VALUE_STRING, strvalues) ++ except: ++ log.warn("Could not save '%s' to gconf database" % str(key)) ++ return False + + return True + --- hamster-applet-2.32.1.orig/debian/patches/06-lp799809.patch +++ hamster-applet-2.32.1/debian/patches/06-lp799809.patch @@ -0,0 +1,20 @@ +Origin: http://bugzilla-attachments.gnome.org/attachment.cgi?id=181030 +Description: fix TypeError in hamster/widgets/activityentry.py when + activity['category'] is set. +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=642488 +Bug-Ubuntu: https://launchpad.net/bugs/799809 +Forwarded: no (already committed) + +Index: hamster-applet-2.32.1/src/hamster/widgets/activityentry.py +=================================================================== +--- hamster-applet-2.32.1.orig/src/hamster/widgets/activityentry.py 2011-08-23 06:21:03.000000000 -0500 ++++ hamster-applet-2.32.1/src/hamster/widgets/activityentry.py 2011-08-23 06:24:14.000000000 -0500 +@@ -114,7 +114,7 @@ + for activity in self.external_activities: + name = activity['name'] + if activity['category']: +- name = "%s@%s" % name, activity['category'] ++ name = "%s@%s" % (name, activity['category']) + external_names.add(name.lower()) + + return activity_name, activity_name in external_names --- hamster-applet-2.32.1.orig/debian/patches/04-dont-fail-on-applet-import.patch +++ hamster-applet-2.32.1/debian/patches/04-dont-fail-on-applet-import.patch @@ -0,0 +1,62 @@ +Author: Jamie Strandboge +Description: if import of gnomeapplet fails, default to upper panel + orientation. Inspired by work by Alberto Milone in preparation for + indicator work. +Forwarded: not-needed (upstream is porting to gnome3) + +Index: hamster-applet-2.32.1/src/hamster/applet.py +=================================================================== +--- hamster-applet-2.32.1.orig/src/hamster/applet.py 2011-07-28 07:46:09.000000000 -0500 ++++ hamster-applet-2.32.1/src/hamster/applet.py 2011-07-28 08:06:39.000000000 -0500 +@@ -26,7 +26,12 @@ + pygtk.require("2.0") + import gtk + +-import gnomeapplet ++try: ++ import gnomeapplet ++except ImportError: ++ logging.warning("Could not import gnomeapplet. Defaulting to upper panel") ++ gnomeapplet = None ++ + import gobject + import dbus, dbus.service, dbus.mainloop.glib + import locale +@@ -114,9 +119,10 @@ + + popup_dir = self.get_parent().get_orient() + +- orient_vertical = popup_dir in [gnomeapplet.ORIENT_LEFT] or \ +- popup_dir in [gnomeapplet.ORIENT_RIGHT] +- ++ orient_vertical = False ++ if gnomeapplet != None: ++ orient_vertical = popup_dir in [gnomeapplet.ORIENT_LEFT] or \ ++ popup_dir in [gnomeapplet.ORIENT_RIGHT] + + context = self.label.get_pango_context() + metrics = context.get_metrics(self.label.style.font_desc, +@@ -152,9 +158,9 @@ + + orient_vertical = True + new_size = allocation.width +- if self.popup_dir in [gnomeapplet.ORIENT_LEFT]: ++ if gnomeapplet != None and self.popup_dir in [gnomeapplet.ORIENT_LEFT]: + new_angle = 270 +- elif self.popup_dir in [gnomeapplet.ORIENT_RIGHT]: ++ elif gnomeapplet != None and self.popup_dir in [gnomeapplet.ORIENT_RIGHT]: + new_angle = 90 + else: + new_angle = 0 +@@ -450,7 +456,10 @@ + + self.popup_dir = self.applet.get_orient() + +- if self.popup_dir in (gnomeapplet.ORIENT_DOWN, gnomeapplet.ORIENT_UP): ++ if gnomeapplet == None: ++ # Default to upper panel (ORIENT_DOWN) ++ y = y + label.height ++ elif self.popup_dir in (gnomeapplet.ORIENT_DOWN, gnomeapplet.ORIENT_UP): + if self.popup_dir == gnomeapplet.ORIENT_DOWN: + y = y + label.height + else: --- hamster-applet-2.32.1.orig/debian/patches/02_lp705482.patch +++ hamster-applet-2.32.1/debian/patches/02_lp705482.patch @@ -0,0 +1,25 @@ +Author: Jamie Strandboge +Description: Use correct type when setting self.time_icon_cell.set_property() + and self.time_cell.set_property(). self.get_style().bg[gtk.STATE_NORMAL] + is a GdkColor (get_style().bg is an array of gtk,gdk.Colors), so we must use + cell-background-gdk instead of cell-background, since cell-background is + used with strings. +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=640541 +Bug-Ubuntu: https://launchpad.net/bugs/705482 +Forwarded: yes + +Index: hamster-applet-2.31.92/src/hamster/widgets/activityentry.py +=================================================================== +--- hamster-applet-2.31.92.orig/src/hamster/widgets/activityentry.py 2011-01-25 07:15:33.000000000 -0600 ++++ hamster-applet-2.31.92/src/hamster/widgets/activityentry.py 2011-01-25 07:22:28.000000000 -0600 +@@ -150,8 +150,8 @@ + + #set proper background color (we can do that only on a realised widget) + bgcolor = self.get_style().bg[gtk.STATE_NORMAL] +- self.time_icon_cell.set_property("cell-background", bgcolor) +- self.time_cell.set_property("cell-background", bgcolor) ++ self.time_icon_cell.set_property("cell-background-gdk", bgcolor) ++ self.time_cell.set_property("cell-background-gdk", bgcolor) + + text_color = self.get_style().text[gtk.STATE_NORMAL] + category_color = graphics.Colors.contrast(text_color, 100) --- hamster-applet-2.32.1.orig/debian/patches/series +++ hamster-applet-2.32.1/debian/patches/series @@ -0,0 +1,5 @@ +02_lp705482.patch +03-dont-install-applet.patch +04-dont-fail-on-applet-import.patch +05-dont-traceback-on-quit.patch +06-lp799809.patch