r24591 - in /desktop/unstable/hamster-applet/debian: changelog patches/02_absolute-imports.patch patches/series rules source/ source/format

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sat Jun 26 06:46:40 UTC 2010 

Author: joss
Date: Sat Jun 26 06:46:33 2010
New Revision: 24591

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24591
Log:
* New upstream release.
* Move to 3.0 source format and to quilt.
* 02_absolute-imports.patch: patch from Stefano Rivera. Fix incorrect 
  use of relative imports. Closes: #586464.

Added:
    desktop/unstable/hamster-applet/debian/patches/02_absolute-imports.patch
    desktop/unstable/hamster-applet/debian/patches/series
    desktop/unstable/hamster-applet/debian/source/
    desktop/unstable/hamster-applet/debian/source/format
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=24591&op=diff
==============================================================================
--- desktop/unstable/hamster-applet/debian/changelog [utf-8] (original)
+++ desktop/unstable/hamster-applet/debian/changelog [utf-8] Sat Jun 26 06:46:33 2010
@@ -1,3 +1,12 @@
+hamster-applet (2.30.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Move to 3.0 source format and to quilt.
+  * 02_absolute-imports.patch: patch from Stefano Rivera. Fix incorrect 
+    use of relative imports. Closes: #586464.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 26 Jun 2010 08:46:21 +0200
+
 hamster-applet (2.30.1-1) unstable; urgency=low
 
   * New upstream bugfix release.

Added: desktop/unstable/hamster-applet/debian/patches/02_absolute-imports.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/hamster-applet/debian/patches/02_absolute-imports.patch?rev=24591&op=file
==============================================================================
--- desktop/unstable/hamster-applet/debian/patches/02_absolute-imports.patch (added)
+++ desktop/unstable/hamster-applet/debian/patches/02_absolute-imports.patch [utf-8] Sat Jun 26 06:46:33 2010
@@ -1,0 +1,108 @@
+Description: Remove incorrect relative import syntax and replace with absolute
+ imports.
+Author: Stefano Rivera <stefano at rivera.za.net>
+Last-Update: 2010-06-23
+Bug-Debian: http://bugs.debian.org/586464
+Index: hamster-applet-2.30.2/src/hamster/widgets/activityentry.py
+===================================================================
+--- hamster-applet-2.30.2.orig/src/hamster/widgets/activityentry.py	2010-06-22 11:59:09.000000000 +0200
++++ hamster-applet-2.30.2/src/hamster/widgets/activityentry.py	2010-06-26 08:44:53.107536014 +0200
+@@ -20,10 +20,10 @@
+ import gtk, gobject
+ import datetime as dt
+ 
+-from .hamster.configuration import runtime
++from hamster.configuration import runtime
+ 
+-from .hamster import stuff
+-from .hamster.stuff import format_duration
++from hamster import stuff
++from hamster.stuff import format_duration
+ 
+ class ActivityEntry(gtk.Entry):
+     __gsignals__ = {
+Index: hamster-applet-2.30.2/src/hamster/widgets/dateinput.py
+===================================================================
+--- hamster-applet-2.30.2.orig/src/hamster/widgets/dateinput.py	2010-06-04 18:53:24.000000000 +0200
++++ hamster-applet-2.30.2/src/hamster/widgets/dateinput.py	2010-06-26 08:44:53.107536014 +0200
+@@ -17,7 +17,7 @@
+ # You should have received a copy of the GNU General Public License
+ # along with Project Hamster.  If not, see <http://www.gnu.org/licenses/>.
+ 
+-from .hamster.stuff import format_duration
++from hamster.stuff import format_duration
+ import gtk
+ import datetime as dt
+ import calendar
+Index: hamster-applet-2.30.2/src/hamster/widgets/dayline.py
+===================================================================
+--- hamster-applet-2.30.2.orig/src/hamster/widgets/dayline.py	2010-06-22 11:59:09.000000000 +0200
++++ hamster-applet-2.30.2/src/hamster/widgets/dayline.py	2010-06-26 08:44:53.107536014 +0200
+@@ -20,8 +20,8 @@
+ import gtk
+ import gobject
+ 
+-from .hamster import stuff
+-from .hamster import graphics
++from hamster import stuff
++from hamster import graphics
+ 
+ import time
+ import datetime as dt
+Index: hamster-applet-2.30.2/src/hamster/widgets/facttree.py
+===================================================================
+--- hamster-applet-2.30.2.orig/src/hamster/widgets/facttree.py	2010-06-22 11:59:09.000000000 +0200
++++ hamster-applet-2.30.2/src/hamster/widgets/facttree.py	2010-06-26 08:44:53.111536593 +0200
+@@ -20,8 +20,8 @@
+ import gtk, gobject
+ import datetime as dt
+ 
+-from .hamster import stuff
+-from .hamster.stuff import format_duration, format_activity
++from hamster import stuff
++from hamster.stuff import format_duration, format_activity
+ from tags import Tag
+ 
+ import pango
+Index: hamster-applet-2.30.2/src/hamster/widgets/tags.py
+===================================================================
+--- hamster-applet-2.30.2.orig/src/hamster/widgets/tags.py	2010-06-22 11:59:09.000000000 +0200
++++ hamster-applet-2.30.2/src/hamster/widgets/tags.py	2010-06-26 08:44:53.111536593 +0200
+@@ -21,9 +21,9 @@ import gtk, gobject
+ import pango, cairo
+ from math import pi
+ 
+-from .hamster import graphics
++from hamster import graphics
+ 
+-from .hamster.configuration import runtime
++from hamster.configuration import runtime
+ 
+ class TagsEntry(gtk.Entry):
+     __gsignals__ = {
+Index: hamster-applet-2.30.2/src/hamster/widgets/timechart.py
+===================================================================
+--- hamster-applet-2.30.2.orig/src/hamster/widgets/timechart.py	2010-06-22 11:59:09.000000000 +0200
++++ hamster-applet-2.30.2/src/hamster/widgets/timechart.py	2010-06-26 08:44:53.111536593 +0200
+@@ -20,7 +20,7 @@
+ import os  # for locale
+ import gtk, pango
+ 
+-from .hamster import graphics
++from hamster import graphics
+ 
+ import time, datetime as dt
+ import calendar
+Index: hamster-applet-2.30.2/src/hamster/widgets/timeinput.py
+===================================================================
+--- hamster-applet-2.30.2.orig/src/hamster/widgets/timeinput.py	2010-06-04 18:53:24.000000000 +0200
++++ hamster-applet-2.30.2/src/hamster/widgets/timeinput.py	2010-06-26 08:44:53.111536593 +0200
+@@ -17,7 +17,7 @@
+ # You should have received a copy of the GNU General Public License
+ # along with Project Hamster.  If not, see <http://www.gnu.org/licenses/>.
+ 
+-from .hamster.stuff import format_duration
++from hamster.stuff import format_duration
+ import gtk
+ from gtk import keysyms
+ import datetime as dt

Added: desktop/unstable/hamster-applet/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/hamster-applet/debian/patches/series?rev=24591&op=file
==============================================================================
--- desktop/unstable/hamster-applet/debian/patches/series (added)
+++ desktop/unstable/hamster-applet/debian/patches/series [utf-8] Sat Jun 26 06:46:33 2010
@@ -1,0 +1,2 @@
+01_startup-fix.patch
+02_absolute-imports.patch

Modified: desktop/unstable/hamster-applet/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/hamster-applet/debian/rules?rev=24591&op=diff
==============================================================================
--- desktop/unstable/hamster-applet/debian/rules [utf-8] (original)
+++ desktop/unstable/hamster-applet/debian/rules [utf-8] Sat Jun 26 06:46:33 2010
@@ -3,7 +3,6 @@
 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
 

Added: desktop/unstable/hamster-applet/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/hamster-applet/debian/source/format?rev=24591&op=file
==============================================================================
--- desktop/unstable/hamster-applet/debian/source/format (added)
+++ desktop/unstable/hamster-applet/debian/source/format [utf-8] Sat Jun 26 06:46:33 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)

More information about the pkg-gnome-commits mailing list