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

[av-guest at users.alioth.debian.org]

Author: av-guest
Date: Thu Oct  1 21:25:31 2009
New Revision: 21741

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21741
Log:
* 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.

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

Modified: desktop/unstable/hamster-applet/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/hamster-applet/debian/changelog?rev=21741&op=diff
==============================================================================
--- desktop/unstable/hamster-applet/debian/changelog [utf-8] (original)
+++ desktop/unstable/hamster-applet/debian/changelog [utf-8] Thu Oct  1 21:25:31 2009
@@ -6,6 +6,11 @@
     - 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 <andrea.veri89 at gmail.com>  Mon, 28 Sep 2009 17:06:17 +0200
 

Added: 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=21741&op=file
==============================================================================
--- desktop/unstable/hamster-applet/debian/patches/01_startup-fix.patch (added)
+++ desktop/unstable/hamster-applet/debian/patches/01_startup-fix.patch [utf-8] Thu Oct  1 21:25:31 2009
@@ -1,0 +1,17 @@
+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,9 @@
+         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'))
++        os.path.realpath(__file__).startswith(defs.PYTHONDIR)
++        data_dir = os.path.join(defs.DATA_DIR, "hamster-applet")
++
+         self.data_dir = data_dir
+         self.dispatcher = Dispatcher()
+         self.storage = Storage(self.dispatcher)

Modified: desktop/unstable/hamster-applet/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/hamster-applet/debian/rules?rev=21741&op=diff
==============================================================================
--- desktop/unstable/hamster-applet/debian/rules [utf-8] (original)
+++ desktop/unstable/hamster-applet/debian/rules [utf-8] Thu Oct  1 21:25:31 2009
@@ -3,6 +3,7 @@
 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/simple-patchsys.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk