r23836 - in /desktop/unstable/hamster-applet/debian: changelog control control.in patches/01_startup-fix.patch

slomo at users.alioth.debian.org slomo at users.alioth.debian.org
Fri Apr 16 08:46:09 UTC 2010 

Author: slomo
Date: Fri Apr 16 08:46:05 2010
New Revision: 23836

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23836
Log:
* New upstream stable release:
  + debian/patches/01_startup-fix.patch:
    - Updated to apply cleanly again.
  + debian/control.in:
    - Update build dependencies and dependencies.

Modified:
    desktop/unstable/hamster-applet/debian/changelog
    desktop/unstable/hamster-applet/debian/control
    desktop/unstable/hamster-applet/debian/control.in
    desktop/unstable/hamster-applet/debian/patches/01_startup-fix.patch

Modified: desktop/unstable/hamster-applet/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/hamster-applet/debian/changelog?rev=23836&op=diff
==============================================================================
--- desktop/unstable/hamster-applet/debian/changelog [utf-8] (original)
+++ desktop/unstable/hamster-applet/debian/changelog [utf-8] Fri Apr 16 08:46:05 2010
@@ -1,3 +1,13 @@
+hamster-applet (2.30.0.1-1) unstable; urgency=low
+
+  * New upstream stable release:
+    + debian/patches/01_startup-fix.patch:
+      - Updated to apply cleanly again.
+    + debian/control.in:
+      - Update build dependencies and dependencies.
+
+ -- Sebastian Dröge <slomo at debian.org>  Fri, 16 Apr 2010 10:37:59 +0200
+
 hamster-applet (2.28.2-1) unstable; urgency=low
 
   * New upstream bugfix release.

Modified: desktop/unstable/hamster-applet/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/hamster-applet/debian/control?rev=23836&op=diff
==============================================================================
--- desktop/unstable/hamster-applet/debian/control [utf-8] (original)
+++ desktop/unstable/hamster-applet/debian/control [utf-8] Fri Apr 16 08:46:05 2010
@@ -7,7 +7,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Pedro Fragoso <ember at ubuntu.com>
-Uploaders: Andrea Veri <andrea.veri89 at gmail.com>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: cdbs,
                debhelper (>= 5.0.38),
                gnome-pkg-tools,
@@ -15,11 +15,13 @@
                python-dev (>= 2.5),
                pkg-config,
                intltool (>= 0.37.1),
+               gnome-doc-utils (>= 0.17.3),
                libgtk2.0-dev (>= 2.12.0),
                python-gtk2-dev (>= 2.12.0),
+               python-gnome2-dev (>= 2.10.0),
                python-gnome2-desktop-dev (>= 2.10.0),
                python-gobject-dev (>= 2.14.0)
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://live.gnome.org/ProjectHamster
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/hamster-applet
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/hamster-applet
@@ -39,7 +41,9 @@
          python-evolution (>= 2.10.0),
          python-dbus,
          python-gobject (>= 2.14.0),
-         python-gnome2
+         python-wnck,
+         python-gnome2,
+         python-notify
 Recommends: python-notify
 Description: time tracking applet for GNOME
  Project Hamster helps you to keep track of how much time you spend on various

Modified: desktop/unstable/hamster-applet/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/hamster-applet/debian/control.in?rev=23836&op=diff
==============================================================================
--- desktop/unstable/hamster-applet/debian/control.in [utf-8] (original)
+++ desktop/unstable/hamster-applet/debian/control.in [utf-8] Fri Apr 16 08:46:05 2010
@@ -10,11 +10,13 @@
                python-dev (>= 2.5),
                pkg-config,
                intltool (>= 0.37.1),
+               gnome-doc-utils (>= 0.17.3),
                libgtk2.0-dev (>= 2.12.0),
                python-gtk2-dev (>= 2.12.0),
+               python-gnome2-dev (>= 2.10.0),
                python-gnome2-desktop-dev (>= 2.10.0),
                python-gobject-dev (>= 2.14.0)
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://live.gnome.org/ProjectHamster
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/hamster-applet
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/hamster-applet
@@ -34,7 +36,9 @@
          python-evolution (>= 2.10.0),
          python-dbus,
          python-gobject (>= 2.14.0),
-         python-gnome2
+         python-wnck,
+         python-gnome2,
+         python-notify
 Recommends: python-notify
 Description: time tracking applet for GNOME
  Project Hamster helps you to keep track of how much time you spend on various

Modified: desktop/unstable/hamster-applet/debian/patches/01_startup-fix.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/hamster-applet/debian/patches/01_startup-fix.patch?rev=23836&op=diff
==============================================================================
--- desktop/unstable/hamster-applet/debian/patches/01_startup-fix.patch [utf-8] (original)
+++ desktop/unstable/hamster-applet/debian/patches/01_startup-fix.patch [utf-8] Fri Apr 16 08:46:05 2010
@@ -1,18 +1,16 @@
 Remove path checks, they prevent applet from starting
 
-diff -Nur -x '*.orig' -x '*~' hamster-applet-2.28.0/hamster/configuration.py hamster-applet-2.28.0.new/hamster/configuration.py
---- hamster-applet-2.28.0/hamster/configuration.py	2009-09-01 11:32:49.000000000 +0200
-+++ hamster-applet-2.28.0.new/hamster/configuration.py	2009-10-01 22:47:50.000000000 +0200
-@@ -44,10 +44,8 @@
+--- a/src/hamster/configuration.py	2010-03-29 13:45:01.000000000 +0200
++++ b/src/hamster/configuration.py	2010-04-16 10:40:23.463035368 +0200
+@@ -59,10 +59,7 @@
          gettext.install("hamster-applet", unicode = True)
  
          # Typically shared data dir is /usr/share/hamster-applet
 -        if os.path.realpath(__file__).startswith(defs.PYTHONDIR):
 -            data_dir = os.path.join(defs.DATA_DIR, "hamster-applet")
 -        else:
--            data_dir = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', 'data'))
+-            data_dir = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', '..', 'data'))
 +        data_dir = os.path.join(defs.DATA_DIR, "hamster-applet")
-+
          self.data_dir = data_dir
          self.dispatcher = Dispatcher()
          self.storage = Storage(self.dispatcher)

More information about the pkg-gnome-commits mailing list