[Python-apps-commits] r7442 - in packages/gtg/tags (20 files)

dktrkranz at users.alioth.debian.org dktrkranz at users.alioth.debian.org
Thu Aug 11 19:32:17 UTC 2011


    Date: Thursday, August 11, 2011 @ 19:32:16
  Author: dktrkranz
Revision: 7442

[svn-buildpackage] Tagging gtg 0.2.4-6

Added:
  packages/gtg/tags/0.2.4-6/
  packages/gtg/tags/0.2.4-6/debian/changelog
    (from rev 7441, packages/gtg/trunk/debian/changelog)
  packages/gtg/tags/0.2.4-6/debian/control
    (from rev 7440, packages/gtg/trunk/debian/control)
  packages/gtg/tags/0.2.4-6/debian/patches/gnome2.patch
    (from rev 7437, packages/gtg/trunk/debian/patches/gnome2.patch)
  packages/gtg/tags/0.2.4-6/debian/patches/locale.patch
    (from rev 7437, packages/gtg/trunk/debian/patches/locale.patch)
  packages/gtg/tags/0.2.4-6/debian/patches/reaper_hang.patch
    (from rev 7437, packages/gtg/trunk/debian/patches/reaper_hang.patch)
  packages/gtg/tags/0.2.4-6/debian/patches/select_right_clicked_tasks.patch
    (from rev 7439, packages/gtg/trunk/debian/patches/select_right_clicked_tasks.patch)
  packages/gtg/tags/0.2.4-6/debian/patches/series
    (from rev 7439, packages/gtg/trunk/debian/patches/series)
  packages/gtg/tags/0.2.4-6/debian/patches/test_executable.patch
    (from rev 7437, packages/gtg/trunk/debian/patches/test_executable.patch)
  packages/gtg/tags/0.2.4-6/debian/patches/x_is_running.patch
    (from rev 7437, packages/gtg/trunk/debian/patches/x_is_running.patch)
  packages/gtg/tags/0.2.4-6/debian/patches/xml_temp_file.patch
    (from rev 7437, packages/gtg/trunk/debian/patches/xml_temp_file.patch)
Deleted:
  packages/gtg/tags/0.2.4-6/debian/changelog
  packages/gtg/tags/0.2.4-6/debian/control
  packages/gtg/tags/0.2.4-6/debian/patches/gnome2.patch
  packages/gtg/tags/0.2.4-6/debian/patches/locale.patch
  packages/gtg/tags/0.2.4-6/debian/patches/reaper_hang.patch
  packages/gtg/tags/0.2.4-6/debian/patches/series
  packages/gtg/tags/0.2.4-6/debian/patches/test_executable.patch
  packages/gtg/tags/0.2.4-6/debian/patches/x_is_running.patch
  packages/gtg/tags/0.2.4-6/debian/patches/xml_temp_file.patch

Deleted: packages/gtg/tags/0.2.4-6/debian/changelog
===================================================================
--- packages/gtg/trunk/debian/changelog	2011-08-10 21:25:22 UTC (rev 7436)
+++ packages/gtg/tags/0.2.4-6/debian/changelog	2011-08-11 19:32:16 UTC (rev 7442)
@@ -1,132 +0,0 @@
-gtg (0.2.4-5) unstable; urgency=low
-
-  * Switch to dh_python2.
-  * debian/patches/gnome2.patch:
-    - Drop obsolete python-gnome2 methods.
-  * debian/control:
-    - Depend on python-simplejson | python (>= 2.6).
-    - Drop python-gnome2 dependency (Closes: #611097).
-  * debian/copyright:
-    - Update copyright years.
-  * debian/rules:
-    - Delete unused .egg-info file.
-
- -- Luca Falavigna <dktrkranz at debian.org>  Sun, 06 Feb 2011 18:53:44 +0100
-
-gtg (0.2.4-4) unstable; urgency=low
-
-  * debian/patches/x_is_running.patch:
-    - Check if a display is available instead of relying on xset being
-      installed and functional (Closes: #595430).
-  * debian/patches/locale.patch:
-    - Use bindtextdomain to simplify locale handling (Closes: #595436, #595440).
-
- -- Luca Falavigna <dktrkranz at debian.org>  Sun, 05 Sep 2010 15:03:35 +0200
-
-gtg (0.2.4-3) unstable; urgency=low
-
-  * debian/patches/xml_temp_file.patch:
-    - Use temp files to temporarily store GTG status, to avoid
-      generating empty XML files (Closes: #590043).
-  * debian/control:
-    - Bump Standards-Version to 3.9.1, no changes required.
-
- -- Luca Falavigna <dktrkranz at debian.org>  Wed, 11 Aug 2010 09:08:39 +0200
-
-gtg (0.2.4-2) unstable; urgency=low
-
-  * debian/patches/test_executable.patch:
-    - Do not launch program to see if it is available, check if it is
-      installed and has executable bit enabled instead.
-  * debian/patches/reaper_hang.patch:
-    - Do not hang on quit due to "completed tasks remover" plugin.
-
- -- Luca Falavigna <dktrkranz at debian.org>  Thu, 24 Jun 2010 20:22:12 +0200
-
-gtg (0.2.4-1) unstable; urgency=low
-
-  * New upstream bugfix release.
-    - Restore export_templates directory (Closes: #574454).
-    - Provide Serbian localization support (LP: #459610).
-    - Restore hello_world plugin glade file (LP: #530256).
-    - Export plugin doesn't hang if no templates are found (LP: #531909).
-    - Fix variable reference in taskbrowser (LP: #544233).
-    - Fix "Schedule for" feature (LP: #522470, #549539).
-
- -- Luca Falavigna <dktrkranz at debian.org>  Sat, 10 Apr 2010 13:48:37 +0200
-
-gtg (0.2.3-1) unstable; urgency=low
-
-  * New upstream bugfix release.
-  * debian/patches/py2.5_compat.patch:
-    - Removed, fixed upstream.
-  * debian/control:
-    - Add Bryce Harrington and Luca Invernizzi to Uploaders.
-
- -- Luca Falavigna <dktrkranz at debian.org>  Tue, 02 Mar 2010 21:18:46 +0100
-
-gtg (0.2.2-1) unstable; urgency=low
-
-  * New upstream release.
-  * debian/patches/py2.5_compat.patch:
-    - Refresh with new compatibility fixes.
-  * debian/copyright:
-    - Add new copyright holders and adjust copyright years.
-
- -- Luca Falavigna <dktrkranz at debian.org>  Mon, 01 Mar 2010 21:02:06 +0100
-
-gtg (0.2.1-1) unstable; urgency=low
-
-  * New upstream release.
-  * debian/patches/distutils_missing_files.patch:
-    - Removed, fixed upstream.
-  * debian/patches/py2.5_compat.patch:
-    - with is a reserved word in Python 2.6, import with_statement to
-      handle it correctly and avoid issues during byte-compilation.
-  * debian/control:
-    - Bump Standard-Version to 3.8.4, no changes needed.
-
- -- Luca Falavigna <dktrkranz at debian.org>  Mon, 01 Feb 2010 20:21:38 +0100
-
-gtg (0.2-2) unstable; urgency=low
-
-  * debian/patches/distutils_missing_files.patch:
-    - Add missing files to setup.py.
-  * Switch to format 3.0 (quilt).
-
- -- Luca Falavigna <dktrkranz at debian.org>  Wed, 06 Jan 2010 15:20:15 +0100
-
-gtg (0.2-1) unstable; urgency=low
-
-  * New upstream release.
-    - xdg module is no longer required at build time (Closes: #560566).
-  * Remove unneeded build-dependencies.
-  * Add python-dbus to Depends.
-  * Bump dependency on python-gtk2 to be at least 2.14 (Closes: #559498).
-
- -- Luca Falavigna <dktrkranz at debian.org>  Sat, 12 Dec 2009 16:04:44 +0100
-
-gtg (0.1.9-1) unstable; urgency=low
-
-  * New upstream beta release.
-    - Update translation templates (Closes: #542939).
-    - Make some GTK icons translatable (LP: #398904).
-    - Fix grammar error (LP: #403168).
-  * Update my e-mail address.
-  * Bump Standards-Version to 3.8.3, no changes required.
-
- -- Luca Falavigna <dktrkranz at debian.org>  Wed, 02 Dec 2009 23:52:41 +0100
-
-gtg (0.1.2-1) unstable; urgency=low
-
-  * New upstream release.
-  * Install binary and module in a private directory.
-  * Bump Standards-Version to 3.8.2, no changes required.
-
- -- Luca Falavigna <dktrkranz at ubuntu.com>  Thu, 09 Jul 2009 00:20:03 +0200
-
-gtg (0.1.1-1) unstable; urgency=low
-
-  * Initial release (Closes: #520609).
-
- -- Luca Falavigna <dktrkranz at ubuntu.com>  Fri, 03 Apr 2009 21:48:06 +0200

Copied: packages/gtg/tags/0.2.4-6/debian/changelog (from rev 7441, packages/gtg/trunk/debian/changelog)
===================================================================
--- packages/gtg/tags/0.2.4-6/debian/changelog	                        (rev 0)
+++ packages/gtg/tags/0.2.4-6/debian/changelog	2011-08-11 19:32:16 UTC (rev 7442)
@@ -0,0 +1,145 @@
+gtg (0.2.4-6) unstable; urgency=low
+
+  * debian/patches/*.patch:
+    - Use DEP3 headers in patches.
+  * debian/patches/select_right_clicked_tasks.patch:
+    - Change selection when right-clicking on a different task,
+      patch cherry-picked by Jérôme Guelfucci (Closes: #624225).
+  * debian/control:
+    - Add python-simplejson to Recommends (Closes: #585629).
+    - Bump Standards-Version to 3.9.2.
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Thu, 11 Aug 2011 21:20:24 +0200
+
+gtg (0.2.4-5) unstable; urgency=low
+
+  * Switch to dh_python2.
+  * debian/patches/gnome2.patch:
+    - Drop obsolete python-gnome2 methods.
+  * debian/control:
+    - Depend on python-simplejson | python (>= 2.6).
+    - Drop python-gnome2 dependency (Closes: #611097).
+  * debian/copyright:
+    - Update copyright years.
+  * debian/rules:
+    - Delete unused .egg-info file.
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Sun, 06 Feb 2011 18:53:44 +0100
+
+gtg (0.2.4-4) unstable; urgency=low
+
+  * debian/patches/x_is_running.patch:
+    - Check if a display is available instead of relying on xset being
+      installed and functional (Closes: #595430).
+  * debian/patches/locale.patch:
+    - Use bindtextdomain to simplify locale handling (Closes: #595436, #595440).
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Sun, 05 Sep 2010 15:03:35 +0200
+
+gtg (0.2.4-3) unstable; urgency=low
+
+  * debian/patches/xml_temp_file.patch:
+    - Use temp files to temporarily store GTG status, to avoid
+      generating empty XML files (Closes: #590043).
+  * debian/control:
+    - Bump Standards-Version to 3.9.1, no changes required.
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Wed, 11 Aug 2010 09:08:39 +0200
+
+gtg (0.2.4-2) unstable; urgency=low
+
+  * debian/patches/test_executable.patch:
+    - Do not launch program to see if it is available, check if it is
+      installed and has executable bit enabled instead.
+  * debian/patches/reaper_hang.patch:
+    - Do not hang on quit due to "completed tasks remover" plugin.
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Thu, 24 Jun 2010 20:22:12 +0200
+
+gtg (0.2.4-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+    - Restore export_templates directory (Closes: #574454).
+    - Provide Serbian localization support (LP: #459610).
+    - Restore hello_world plugin glade file (LP: #530256).
+    - Export plugin doesn't hang if no templates are found (LP: #531909).
+    - Fix variable reference in taskbrowser (LP: #544233).
+    - Fix "Schedule for" feature (LP: #522470, #549539).
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Sat, 10 Apr 2010 13:48:37 +0200
+
+gtg (0.2.3-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * debian/patches/py2.5_compat.patch:
+    - Removed, fixed upstream.
+  * debian/control:
+    - Add Bryce Harrington and Luca Invernizzi to Uploaders.
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Tue, 02 Mar 2010 21:18:46 +0100
+
+gtg (0.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/py2.5_compat.patch:
+    - Refresh with new compatibility fixes.
+  * debian/copyright:
+    - Add new copyright holders and adjust copyright years.
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Mon, 01 Mar 2010 21:02:06 +0100
+
+gtg (0.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/distutils_missing_files.patch:
+    - Removed, fixed upstream.
+  * debian/patches/py2.5_compat.patch:
+    - with is a reserved word in Python 2.6, import with_statement to
+      handle it correctly and avoid issues during byte-compilation.
+  * debian/control:
+    - Bump Standard-Version to 3.8.4, no changes needed.
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Mon, 01 Feb 2010 20:21:38 +0100
+
+gtg (0.2-2) unstable; urgency=low
+
+  * debian/patches/distutils_missing_files.patch:
+    - Add missing files to setup.py.
+  * Switch to format 3.0 (quilt).
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Wed, 06 Jan 2010 15:20:15 +0100
+
+gtg (0.2-1) unstable; urgency=low
+
+  * New upstream release.
+    - xdg module is no longer required at build time (Closes: #560566).
+  * Remove unneeded build-dependencies.
+  * Add python-dbus to Depends.
+  * Bump dependency on python-gtk2 to be at least 2.14 (Closes: #559498).
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Sat, 12 Dec 2009 16:04:44 +0100
+
+gtg (0.1.9-1) unstable; urgency=low
+
+  * New upstream beta release.
+    - Update translation templates (Closes: #542939).
+    - Make some GTK icons translatable (LP: #398904).
+    - Fix grammar error (LP: #403168).
+  * Update my e-mail address.
+  * Bump Standards-Version to 3.8.3, no changes required.
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Wed, 02 Dec 2009 23:52:41 +0100
+
+gtg (0.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Install binary and module in a private directory.
+  * Bump Standards-Version to 3.8.2, no changes required.
+
+ -- Luca Falavigna <dktrkranz at ubuntu.com>  Thu, 09 Jul 2009 00:20:03 +0200
+
+gtg (0.1.1-1) unstable; urgency=low
+
+  * Initial release (Closes: #520609).
+
+ -- Luca Falavigna <dktrkranz at ubuntu.com>  Fri, 03 Apr 2009 21:48:06 +0200

Deleted: packages/gtg/tags/0.2.4-6/debian/control
===================================================================
--- packages/gtg/trunk/debian/control	2011-08-10 21:25:22 UTC (rev 7436)
+++ packages/gtg/tags/0.2.4-6/debian/control	2011-08-11 19:32:16 UTC (rev 7442)
@@ -1,20 +0,0 @@
-Source: gtg
-Section: gnome
-Priority: optional
-Maintainer: Luca Falavigna <dktrkranz at debian.org>
-Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.50~)
-Build-Depends-Indep: python (>= 2.6.6-3~)
-Standards-Version: 3.9.1
-X-Python-Version: >= 2.5
-Homepage: http://gtg.fritalk.com/
-Vcs-Svn: svn://svn.debian.org/python-apps/packages/gtg/trunk/
-Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/gtg/trunk/
-
-Package: gtg
-Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-simplejson | python (>= 2.6), python-gtk2 (>= 2.14), python-glade2, python-dbus, python-xdg, python-configobj
-Description: organizer for the GNOME desktop environment
- Getting Things GNOME! is an organizer for the GNOME desktop environment.
- GTG focuses on usability and ease of use. Its main objective is to
- provide a simple and yet flexible organization tool for life and work.

Copied: packages/gtg/tags/0.2.4-6/debian/control (from rev 7440, packages/gtg/trunk/debian/control)
===================================================================
--- packages/gtg/tags/0.2.4-6/debian/control	                        (rev 0)
+++ packages/gtg/tags/0.2.4-6/debian/control	2011-08-11 19:32:16 UTC (rev 7442)
@@ -0,0 +1,21 @@
+Source: gtg
+Section: gnome
+Priority: optional
+Maintainer: Luca Falavigna <dktrkranz at debian.org>
+Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
+Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends-Indep: python (>= 2.6.6-3~)
+Standards-Version: 3.9.2
+X-Python-Version: >= 2.5
+Homepage: http://gtg.fritalk.com/
+Vcs-Svn: svn://svn.debian.org/python-apps/packages/gtg/trunk/
+Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/gtg/trunk/
+
+Package: gtg
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 2.14), python-glade2, python-dbus, python-xdg, python-configobj
+Recommends: python-simplejson
+Description: organizer for the GNOME desktop environment
+ Getting Things GNOME! is an organizer for the GNOME desktop environment.
+ GTG focuses on usability and ease of use. Its main objective is to
+ provide a simple and yet flexible organization tool for life and work.

Deleted: packages/gtg/tags/0.2.4-6/debian/patches/gnome2.patch
===================================================================
--- packages/gtg/trunk/debian/patches/gnome2.patch	2011-08-10 21:25:22 UTC (rev 7436)
+++ packages/gtg/tags/0.2.4-6/debian/patches/gnome2.patch	2011-08-11 19:32:16 UTC (rev 7442)
@@ -1,31 +0,0 @@
-Drop obsolete python-gnome2 methods.
-
-Index: gtg-0.2.4/GTG/tools/openurl.py
-===================================================================
---- gtg-0.2.4.orig/GTG/tools/openurl.py	2011-01-28 22:14:09.837602575 +0100
-+++ gtg-0.2.4/GTG/tools/openurl.py	2011-01-28 22:15:01.348606020 +0100
-@@ -25,10 +25,10 @@
- import sys as _sys
- 
- try:
--    import gnome as _gnome
--    _has_gnome = True
-+    import gtk as _gtk
-+    _has_gtk = True
- except ImportError:
--    _has_gnome = False
-+    _has_gtk = False
- 
- def _spawn_executable(close_stdout = False, close_stderr = False, *args):
-     pid = _os.fork()
-@@ -62,8 +62,8 @@
- def openurl(url):
-     if _has_xdg: # freedesktop is the best choice :p
-         return _spawn_quiet('xdg-open', url)
--    elif _has_gnome: # shouldn't also check for gnome-open ?
--        return _gnome.url_show(url)
-+    elif _has_gtk:
-+        return _gtk.show_uri(None, url, _gtk.gdk.CURRENT_TIME)
-     elif _has_exo: # for xfce
-         return _spawn_quiet('exo-open', url)
-     # add your favorite desktop here ;)

Copied: packages/gtg/tags/0.2.4-6/debian/patches/gnome2.patch (from rev 7437, packages/gtg/trunk/debian/patches/gnome2.patch)
===================================================================
--- packages/gtg/tags/0.2.4-6/debian/patches/gnome2.patch	                        (rev 0)
+++ packages/gtg/tags/0.2.4-6/debian/patches/gnome2.patch	2011-08-11 19:32:16 UTC (rev 7442)
@@ -0,0 +1,32 @@
+Description: Drop obsolete python-gnome2 methods
+Origin: http://bazaar.launchpad.net/~gtg/gtg/trunk/revision/927
+
+Index: gtg-0.2.4/GTG/tools/openurl.py
+===================================================================
+--- gtg-0.2.4.orig/GTG/tools/openurl.py	2011-01-28 22:14:09.837602575 +0100
++++ gtg-0.2.4/GTG/tools/openurl.py	2011-01-28 22:15:01.348606020 +0100
+@@ -25,10 +25,10 @@
+ import sys as _sys
+ 
+ try:
+-    import gnome as _gnome
+-    _has_gnome = True
++    import gtk as _gtk
++    _has_gtk = True
+ except ImportError:
+-    _has_gnome = False
++    _has_gtk = False
+ 
+ def _spawn_executable(close_stdout = False, close_stderr = False, *args):
+     pid = _os.fork()
+@@ -62,8 +62,8 @@
+ def openurl(url):
+     if _has_xdg: # freedesktop is the best choice :p
+         return _spawn_quiet('xdg-open', url)
+-    elif _has_gnome: # shouldn't also check for gnome-open ?
+-        return _gnome.url_show(url)
++    elif _has_gtk:
++        return _gtk.show_uri(None, url, _gtk.gdk.CURRENT_TIME)
+     elif _has_exo: # for xfce
+         return _spawn_quiet('exo-open', url)
+     # add your favorite desktop here ;)

Deleted: packages/gtg/tags/0.2.4-6/debian/patches/locale.patch
===================================================================
--- packages/gtg/trunk/debian/patches/locale.patch	2011-08-10 21:25:22 UTC (rev 7436)
+++ packages/gtg/tags/0.2.4-6/debian/patches/locale.patch	2011-08-11 19:32:16 UTC (rev 7442)
@@ -1,38 +0,0 @@
-Use bindtextdomain to simplify locale handling
-
-Index: gtg-0.2.4/GTG/__init__.py
-===================================================================
---- gtg-0.2.4.orig/GTG/__init__.py	2010-09-05 01:56:48.621395656 +0200
-+++ gtg-0.2.4/GTG/__init__.py	2010-09-05 02:08:23.560415693 +0200
-@@ -51,19 +51,7 @@
- 
- #Translation setup (from pyroom)
- GETTEXT_DOMAIN = 'gtg'
--LOCALE_PATH = abspath(join(dirname(__file__), pardir, 'locales'))
--if not os.path.isdir(LOCALE_PATH):
--    if os.path.isdir('/usr/local/share/locale') and os.uname()[0] != 'Linux':
--        LOCALE_PATH = '/usr/local/share/locale'
--    else:
--        LOCALE_PATH = '/usr/share/locale'
--languages_used = []
--lc, encoding = locale.getdefaultlocale()
--if lc:
--    languages_used = [lc]
--lang_in_env = os.environ.get('LANGUAGE', None)
--if lang_in_env:
--    languages_used.extend(lang_in_env.split(':'))
-+LOCALE_PATH = gettext.bindtextdomain(GETTEXT_DOMAIN)
- 
- for module in gettext, loaded_glade:
-     #check if glade is well loaded to avoid error in Fedora build farm
-@@ -71,9 +59,7 @@
-         module.bindtextdomain(GETTEXT_DOMAIN, LOCALE_PATH)
-         module.textdomain(GETTEXT_DOMAIN)
- 
--translation = gettext.translation(GETTEXT_DOMAIN, LOCALE_PATH,
--                                  languages=languages_used,
--                                  fallback=True)
-+translation = gettext.translation(GETTEXT_DOMAIN, LOCALE_PATH, fallback=True)
- 
- _ = translation.gettext
- #ngettext underscore when a phrase can be singular or plural. Usage:

Copied: packages/gtg/tags/0.2.4-6/debian/patches/locale.patch (from rev 7437, packages/gtg/trunk/debian/patches/locale.patch)
===================================================================
--- packages/gtg/tags/0.2.4-6/debian/patches/locale.patch	                        (rev 0)
+++ packages/gtg/tags/0.2.4-6/debian/patches/locale.patch	2011-08-11 19:32:16 UTC (rev 7442)
@@ -0,0 +1,39 @@
+Description: Use bindtextdomain to simplify locale handling
+Origin: http://bazaar.launchpad.net/~gtg/gtg/trunk/revision/878
+
+Index: gtg-0.2.4/GTG/__init__.py
+===================================================================
+--- gtg-0.2.4.orig/GTG/__init__.py	2010-09-05 01:56:48.621395656 +0200
++++ gtg-0.2.4/GTG/__init__.py	2010-09-05 02:08:23.560415693 +0200
+@@ -51,19 +51,7 @@
+ 
+ #Translation setup (from pyroom)
+ GETTEXT_DOMAIN = 'gtg'
+-LOCALE_PATH = abspath(join(dirname(__file__), pardir, 'locales'))
+-if not os.path.isdir(LOCALE_PATH):
+-    if os.path.isdir('/usr/local/share/locale') and os.uname()[0] != 'Linux':
+-        LOCALE_PATH = '/usr/local/share/locale'
+-    else:
+-        LOCALE_PATH = '/usr/share/locale'
+-languages_used = []
+-lc, encoding = locale.getdefaultlocale()
+-if lc:
+-    languages_used = [lc]
+-lang_in_env = os.environ.get('LANGUAGE', None)
+-if lang_in_env:
+-    languages_used.extend(lang_in_env.split(':'))
++LOCALE_PATH = gettext.bindtextdomain(GETTEXT_DOMAIN)
+ 
+ for module in gettext, loaded_glade:
+     #check if glade is well loaded to avoid error in Fedora build farm
+@@ -71,9 +59,7 @@
+         module.bindtextdomain(GETTEXT_DOMAIN, LOCALE_PATH)
+         module.textdomain(GETTEXT_DOMAIN)
+ 
+-translation = gettext.translation(GETTEXT_DOMAIN, LOCALE_PATH,
+-                                  languages=languages_used,
+-                                  fallback=True)
++translation = gettext.translation(GETTEXT_DOMAIN, LOCALE_PATH, fallback=True)
+ 
+ _ = translation.gettext
+ #ngettext underscore when a phrase can be singular or plural. Usage:

Deleted: packages/gtg/tags/0.2.4-6/debian/patches/reaper_hang.patch
===================================================================
--- packages/gtg/trunk/debian/patches/reaper_hang.patch	2011-08-10 21:25:22 UTC (rev 7436)
+++ packages/gtg/tags/0.2.4-6/debian/patches/reaper_hang.patch	2011-08-11 19:32:16 UTC (rev 7442)
@@ -1,36 +0,0 @@
-Do not hang on quit due to "completed tasks remover" plugin
-
-Index: gtg-0.2.4/GTG/core/plugins/engine.py
-===================================================================
---- gtg-0.2.4.orig/GTG/core/plugins/engine.py	2010-06-24 20:18:50.707020895 +0200
-+++ gtg-0.2.4/GTG/core/plugins/engine.py	2010-06-24 20:18:48.327022423 +0200
-@@ -220,6 +220,11 @@
-                         if tv:
-                             tv.modified(refresheditor=False)
-                 plugin.active = False
-+            # if plugin is enabled and has onQuit member, execute it
-+            else:
-+                for api in plugin_apis:
-+                    if hasattr(plugin.instance, 'onQuit'):
-+                        plugin.instance.onQuit(api)
-     
-     def onTaskLoad(self, plugin_api):
-         """Pass the onTaskLoad signal to all active plugins."""
-Index: gtg-0.2.4/GTG/plugins/task_reaper/reaper.py
-===================================================================
---- gtg-0.2.4.orig/GTG/plugins/task_reaper/reaper.py	2010-06-24 20:18:50.331020862 +0200
-+++ gtg-0.2.4/GTG/plugins/task_reaper/reaper.py	2010-06-24 20:18:48.327022423 +0200
-@@ -84,7 +84,13 @@
-     def onTaskOpened(self, plugin_api):
-         pass
- 
-+    def onQuit(self, plugin_api):
-+        if self.is_automatic == True:
-+            self.cancel_autopurge()
-+
-     def deactivate(self, plugin_api):
-+        if self.is_automatic == True:
-+            self.cancel_autopurge()
-         if self.menu_item_is_shown == True:
-             plugin_api.remove_menu_item(self.menu_item)
- 

Copied: packages/gtg/tags/0.2.4-6/debian/patches/reaper_hang.patch (from rev 7437, packages/gtg/trunk/debian/patches/reaper_hang.patch)
===================================================================
--- packages/gtg/tags/0.2.4-6/debian/patches/reaper_hang.patch	                        (rev 0)
+++ packages/gtg/tags/0.2.4-6/debian/patches/reaper_hang.patch	2011-08-11 19:32:16 UTC (rev 7442)
@@ -0,0 +1,37 @@
+Description: Do not hang on quit due to "completed tasks remover" plugin
+Origin: http://bazaar.launchpad.net/~gtg/gtg/trunk/revision/749
+
+Index: gtg-0.2.4/GTG/core/plugins/engine.py
+===================================================================
+--- gtg-0.2.4.orig/GTG/core/plugins/engine.py	2010-06-24 20:18:50.707020895 +0200
++++ gtg-0.2.4/GTG/core/plugins/engine.py	2010-06-24 20:18:48.327022423 +0200
+@@ -220,6 +220,11 @@
+                         if tv:
+                             tv.modified(refresheditor=False)
+                 plugin.active = False
++            # if plugin is enabled and has onQuit member, execute it
++            else:
++                for api in plugin_apis:
++                    if hasattr(plugin.instance, 'onQuit'):
++                        plugin.instance.onQuit(api)
+     
+     def onTaskLoad(self, plugin_api):
+         """Pass the onTaskLoad signal to all active plugins."""
+Index: gtg-0.2.4/GTG/plugins/task_reaper/reaper.py
+===================================================================
+--- gtg-0.2.4.orig/GTG/plugins/task_reaper/reaper.py	2010-06-24 20:18:50.331020862 +0200
++++ gtg-0.2.4/GTG/plugins/task_reaper/reaper.py	2010-06-24 20:18:48.327022423 +0200
+@@ -84,7 +84,13 @@
+     def onTaskOpened(self, plugin_api):
+         pass
+ 
++    def onQuit(self, plugin_api):
++        if self.is_automatic == True:
++            self.cancel_autopurge()
++
+     def deactivate(self, plugin_api):
++        if self.is_automatic == True:
++            self.cancel_autopurge()
+         if self.menu_item_is_shown == True:
+             plugin_api.remove_menu_item(self.menu_item)
+ 

Copied: packages/gtg/tags/0.2.4-6/debian/patches/select_right_clicked_tasks.patch (from rev 7439, packages/gtg/trunk/debian/patches/select_right_clicked_tasks.patch)
===================================================================
--- packages/gtg/tags/0.2.4-6/debian/patches/select_right_clicked_tasks.patch	                        (rev 0)
+++ packages/gtg/tags/0.2.4-6/debian/patches/select_right_clicked_tasks.patch	2011-08-11 19:32:16 UTC (rev 7442)
@@ -0,0 +1,22 @@
+Description: Change selection when right-clicking on a different task
+Origin: http://bazaar.launchpad.net/~gtg/gtg/trunk/revision/928
+
+Index: gtg-0.2.4/GTG/taskbrowser/browser.py
+===================================================================
+--- gtg-0.2.4.orig/GTG/taskbrowser/browser.py	2011-04-26 18:47:12.000000000 +0200
++++ gtg-0.2.4/GTG/taskbrowser/browser.py	2011-04-26 18:54:50.000000000 +0200
+@@ -1448,8 +1448,12 @@
+             time = event.time
+             pthinfo = treeview.get_path_at_pos(x, y)
+             if pthinfo is not None:
+-                if treeview.get_selection().count_selected_rows() <= 0:
+-                    path, col, cellx, celly = pthinfo
++                path, col, cellx, celly = pthinfo
++                selection = treeview.get_selection()
++                if selection.count_selected_rows() > 0 :
++                    if not selection.path_is_selected(path) :
++                        treeview.set_cursor(path, col, 0)
++                else :
+                     treeview.set_cursor(path, col, 0)
+                 treeview.grab_focus()
+                 self.taskpopup.popup(None, None, None, event.button, time)

Deleted: packages/gtg/tags/0.2.4-6/debian/patches/series
===================================================================
--- packages/gtg/trunk/debian/patches/series	2011-08-10 21:25:22 UTC (rev 7436)
+++ packages/gtg/tags/0.2.4-6/debian/patches/series	2011-08-11 19:32:16 UTC (rev 7442)
@@ -1,6 +0,0 @@
-test_executable.patch
-reaper_hang.patch
-xml_temp_file.patch
-x_is_running.patch
-locale.patch
-gnome2.patch

Copied: packages/gtg/tags/0.2.4-6/debian/patches/series (from rev 7439, packages/gtg/trunk/debian/patches/series)
===================================================================
--- packages/gtg/tags/0.2.4-6/debian/patches/series	                        (rev 0)
+++ packages/gtg/tags/0.2.4-6/debian/patches/series	2011-08-11 19:32:16 UTC (rev 7442)
@@ -0,0 +1,7 @@
+test_executable.patch
+reaper_hang.patch
+xml_temp_file.patch
+x_is_running.patch
+locale.patch
+gnome2.patch
+select_right_clicked_tasks.patch

Deleted: packages/gtg/tags/0.2.4-6/debian/patches/test_executable.patch
===================================================================
--- packages/gtg/trunk/debian/patches/test_executable.patch	2011-08-10 21:25:22 UTC (rev 7436)
+++ packages/gtg/tags/0.2.4-6/debian/patches/test_executable.patch	2011-08-11 19:32:16 UTC (rev 7442)
@@ -1,30 +0,0 @@
-Do not launch program to see if it is available, check if it
-is installed and has executable bit enable instead.
-
-Index: gtg-0.2.4/GTG/tools/openurl.py
-===================================================================
---- gtg-0.2.4.orig/GTG/tools/openurl.py	2010-04-15 00:04:24.606249645 +0200
-+++ gtg-0.2.4/GTG/tools/openurl.py	2010-04-15 00:07:56.202258428 +0200
-@@ -50,14 +50,18 @@
-         status = _os.waitpid(pid, 0)[1]
-         return _os.WIFEXITED(status) and (_os.WEXITSTATUS(status) == 0)
- 
--def _test_executable(*args):
--    return _spawn_executable(True, True, *args)
-+def _test_executable(name):
-+    for path in _os.getenv('PATH').split(':'):
-+        if _os.path.isfile(_os.path.join(path, name)):
-+            if _os.access(_os.path.join(path, name), _os.X_OK):
-+                return True
-+    return False
- 
- def _spawn_quiet(*args):
-     return _spawn_executable(True, False, *args)
- 
--_has_xdg = _test_executable('xdg-open', '--help')
--_has_exo = _test_executable('exo-open', '--help')
-+_has_xdg = _test_executable('xdg-open')
-+_has_exo = _test_executable('exo-open')
- 
- def openurl(url):
-     if _has_xdg: # freedesktop is the best choice :p

Copied: packages/gtg/tags/0.2.4-6/debian/patches/test_executable.patch (from rev 7437, packages/gtg/trunk/debian/patches/test_executable.patch)
===================================================================
--- packages/gtg/tags/0.2.4-6/debian/patches/test_executable.patch	                        (rev 0)
+++ packages/gtg/tags/0.2.4-6/debian/patches/test_executable.patch	2011-08-11 19:32:16 UTC (rev 7442)
@@ -0,0 +1,31 @@
+Description: Do not launch program to see if it is available, check if it is
+ installed and has executable bit enable instead
+Origin: http://bazaar.launchpad.net/~gtg/gtg/trunk/revision/714
+
+Index: gtg-0.2.4/GTG/tools/openurl.py
+===================================================================
+--- gtg-0.2.4.orig/GTG/tools/openurl.py	2010-04-15 00:04:24.606249645 +0200
++++ gtg-0.2.4/GTG/tools/openurl.py	2010-04-15 00:07:56.202258428 +0200
+@@ -50,14 +50,18 @@
+         status = _os.waitpid(pid, 0)[1]
+         return _os.WIFEXITED(status) and (_os.WEXITSTATUS(status) == 0)
+ 
+-def _test_executable(*args):
+-    return _spawn_executable(True, True, *args)
++def _test_executable(name):
++    for path in _os.getenv('PATH').split(':'):
++        if _os.path.isfile(_os.path.join(path, name)):
++            if _os.access(_os.path.join(path, name), _os.X_OK):
++                return True
++    return False
+ 
+ def _spawn_quiet(*args):
+     return _spawn_executable(True, False, *args)
+ 
+-_has_xdg = _test_executable('xdg-open', '--help')
+-_has_exo = _test_executable('exo-open', '--help')
++_has_xdg = _test_executable('xdg-open')
++_has_exo = _test_executable('exo-open')
+ 
+ def openurl(url):
+     if _has_xdg: # freedesktop is the best choice :p

Deleted: packages/gtg/tags/0.2.4-6/debian/patches/x_is_running.patch
===================================================================
--- packages/gtg/trunk/debian/patches/x_is_running.patch	2011-08-10 21:25:22 UTC (rev 7436)
+++ packages/gtg/tags/0.2.4-6/debian/patches/x_is_running.patch	2011-08-11 19:32:16 UTC (rev 7442)
@@ -1,24 +0,0 @@
-Check if a display is available instead of relying on xset
-
-Index: gtg-0.2.4/gtg
-===================================================================
---- gtg-0.2.4.orig/gtg	2010-09-05 02:08:29.896400600 +0200
-+++ gtg-0.2.4/gtg	2010-09-05 11:44:11.639955308 +0200
-@@ -32,10 +32,13 @@
- from optparse import OptionParser
- 
- def X_is_running():
--    from subprocess import Popen, PIPE
--    p = Popen(["xset", "-q"], stdout=PIPE, stderr=PIPE)
--    p.communicate()
--    return p.returncode == 0
-+    from gtk.gdk import Screen
-+    try:
-+        if Screen().get_display():
-+            return True
-+    except RuntimeError:
-+        pass
-+    return False
- 
- try:
-     parser = OptionParser()

Copied: packages/gtg/tags/0.2.4-6/debian/patches/x_is_running.patch (from rev 7437, packages/gtg/trunk/debian/patches/x_is_running.patch)
===================================================================
--- packages/gtg/tags/0.2.4-6/debian/patches/x_is_running.patch	                        (rev 0)
+++ packages/gtg/tags/0.2.4-6/debian/patches/x_is_running.patch	2011-08-11 19:32:16 UTC (rev 7442)
@@ -0,0 +1,25 @@
+Description: Check if a display is available instead of relying on xset
+Origin: http://bazaar.launchpad.net/~gtg/gtg/trunk/revision/877
+
+Index: gtg-0.2.4/gtg
+===================================================================
+--- gtg-0.2.4.orig/gtg	2010-09-05 02:08:29.896400600 +0200
++++ gtg-0.2.4/gtg	2010-09-05 11:44:11.639955308 +0200
+@@ -32,10 +32,13 @@
+ from optparse import OptionParser
+ 
+ def X_is_running():
+-    from subprocess import Popen, PIPE
+-    p = Popen(["xset", "-q"], stdout=PIPE, stderr=PIPE)
+-    p.communicate()
+-    return p.returncode == 0
++    from gtk.gdk import Screen
++    try:
++        if Screen().get_display():
++            return True
++    except RuntimeError:
++        pass
++    return False
+ 
+ try:
+     parser = OptionParser()

Deleted: packages/gtg/tags/0.2.4-6/debian/patches/xml_temp_file.patch
===================================================================
--- packages/gtg/trunk/debian/patches/xml_temp_file.patch	2011-08-10 21:25:22 UTC (rev 7436)
+++ packages/gtg/tags/0.2.4-6/debian/patches/xml_temp_file.patch	2011-08-11 19:32:16 UTC (rev 7442)
@@ -1,129 +0,0 @@
-Use temp files to temporarily store GTG status, to avoid generating empty XML files.
-
-Index: gtg-0.2.4/GTG/tools/cleanxml.py
-===================================================================
---- gtg-0.2.4.orig/GTG/tools/cleanxml.py	2010-08-07 13:05:44.582562884 +0200
-+++ gtg-0.2.4/GTG/tools/cleanxml.py	2010-08-07 13:05:41.226574167 +0200
-@@ -63,27 +63,40 @@
- #This function open an XML file if it exists and return the XML object
- #If the file doesn't exist, it is created with an empty XML tree    
- def openxmlfile(zefile,root ):
--    try :
--        if os.path.exists(zefile) :
--            #We should be more defensive here
--            doc = xml.dom.minidom.parse(zefile)
--            cleanDoc(doc,tab,enter)
--            #We should be more defensive here
--            xmlproject = doc.getElementsByTagName(root)[0]
--        #the file didn't exist, create it now
--        else :
-+    tmpfile = zefile+'__'
-+    
-+    try:
-+        if os.path.exists(zefile):
-+            f = open(zefile, "r")
-+        elif os.path.exists(tmpfile):
-+            print "Something happened last time we tried to write file. Temp file found, using it as normal."
-+            os.rename(tmpfile, zefile)
-+            f = open(zefile, "r")
-+        else:
-+            # Creating empty file
-             doc,xmlproject = emptydoc(root)
--            #then we create the file
--            f = open(zefile, mode='a+')
--            f.write(doc.toxml().encode("utf-8"))
--            f.close()
-+            newfile = savexml(zefile, doc) # use our function to save file
-+            if not newfile:
-+                sys.exit(1)
-+            return openxmlfile(zefile, root) # recursive call
-+
-+        doc = xml.dom.minidom.parse(f)
-+        cleanDoc(doc,tab,enter)
-+        xmlproject = doc.getElementsByTagName(root)[0]
-+        f.close()
-         return doc,xmlproject
-     except IOError, msg:
-         print msg
-         sys.exit(1)
--
-+        
-     except xml.parsers.expat.ExpatError, msg:
-+        f.close()
-         print "Error parsing XML file %s: %s" %(zefile, msg)
-+        if os.path.exists(tmpfile):
-+            print "Something happened last time we tried to write file. Temp file found, using it as normal."
-+            os.rename(tmpfile, zefile)
-+            # Ok, try one more time now
-+            return openxmlfile(zefile, root)
-         sys.exit(1)
- 
- 
-@@ -95,26 +108,44 @@
-     return doc, rootproject
-     
- #write a XML doc to a file
--def savexml(zefile,doc,backup=False) :
--    f = open(zefile, mode='w+')
--    pretty = doc.toprettyxml(tab,enter)
--    if f and pretty:
--        f.write(pretty.encode("utf-8"))
--        f.close()
--        if backup :
--            #We will now backup the file
--            backup_nbr = BACKUP_NBR
--            #We keep BACKUP_NBR versions of the file
--            #The 0 is the youngest one
--            while backup_nbr > 0 :
--                older = "%s.bak.%s" %(zefile,backup_nbr)
--                backup_nbr -= 1
--                newer = "%s.bak.%s" %(zefile,backup_nbr)
--                if os.path.exists(newer) :
--                    shutil.move(newer,older)
--            #The bak.0 is always a fresh copy of the closed file
--            #So that it's not touched in case of bad opening next time
--            current = "%s.bak.0" %(zefile)
--            shutil.copy(zefile,current)
--    else:
--        print "no file %s or no pretty xml"%zefile
-+def savexml(zefile,doc,backup=False):
-+    tmpfile = zefile+'__'
-+    try:
-+        if os.path.exists(zefile):
-+            os.rename(zefile, tmpfile)
-+        f = open(zefile, mode='w+')
-+        pretty = doc.toprettyxml(tab, enter).encode("utf-8")
-+        if f and pretty:
-+            bwritten = os.write(f.fileno(), pretty)
-+            if bwritten != len(pretty):
-+                print "error writing file %s" % zefile
-+                f.close()
-+                return False
-+            f.close()
-+            
-+            if os.path.exists(tmpfile):
-+                os.unlink(tmpfile)
-+                
-+            if backup :
-+                #We will now backup the file
-+                backup_nbr = BACKUP_NBR
-+                #We keep BACKUP_NBR versions of the file
-+                #The 0 is the youngest one
-+                while backup_nbr > 0 :
-+                    older = "%s.bak.%s" %(zefile,backup_nbr)
-+                    backup_nbr -= 1
-+                    newer = "%s.bak.%s" %(zefile,backup_nbr)
-+                    if os.path.exists(newer) :
-+                        shutil.move(newer,older)
-+                #The bak.0 is always a fresh copy of the closed file
-+                #So that it's not touched in case of bad opening next time
-+                current = "%s.bak.0" %(zefile)
-+                shutil.copy(zefile,current)
-+            
-+            return True
-+        else:
-+            print "no file %s or no pretty xml"%zefile
-+            return False
-+    except IOError, msg:
-+        print msg
-+        return False

Copied: packages/gtg/tags/0.2.4-6/debian/patches/xml_temp_file.patch (from rev 7437, packages/gtg/trunk/debian/patches/xml_temp_file.patch)
===================================================================
--- packages/gtg/tags/0.2.4-6/debian/patches/xml_temp_file.patch	                        (rev 0)
+++ packages/gtg/tags/0.2.4-6/debian/patches/xml_temp_file.patch	2011-08-11 19:32:16 UTC (rev 7442)
@@ -0,0 +1,131 @@
+Description: Use temp files to temporarily store GTG status to avoid generating
+ empty XML files
+Origin: http://bazaar.launchpad.net/~gtg/gtg/trunk/revision/756
+
+Index: gtg-0.2.4/GTG/tools/cleanxml.py
+===================================================================
+--- gtg-0.2.4.orig/GTG/tools/cleanxml.py	2010-08-07 13:05:44.582562884 +0200
++++ gtg-0.2.4/GTG/tools/cleanxml.py	2010-08-07 13:05:41.226574167 +0200
+@@ -63,27 +63,40 @@
+ #This function open an XML file if it exists and return the XML object
+ #If the file doesn't exist, it is created with an empty XML tree    
+ def openxmlfile(zefile,root ):
+-    try :
+-        if os.path.exists(zefile) :
+-            #We should be more defensive here
+-            doc = xml.dom.minidom.parse(zefile)
+-            cleanDoc(doc,tab,enter)
+-            #We should be more defensive here
+-            xmlproject = doc.getElementsByTagName(root)[0]
+-        #the file didn't exist, create it now
+-        else :
++    tmpfile = zefile+'__'
++    
++    try:
++        if os.path.exists(zefile):
++            f = open(zefile, "r")
++        elif os.path.exists(tmpfile):
++            print "Something happened last time we tried to write file. Temp file found, using it as normal."
++            os.rename(tmpfile, zefile)
++            f = open(zefile, "r")
++        else:
++            # Creating empty file
+             doc,xmlproject = emptydoc(root)
+-            #then we create the file
+-            f = open(zefile, mode='a+')
+-            f.write(doc.toxml().encode("utf-8"))
+-            f.close()
++            newfile = savexml(zefile, doc) # use our function to save file
++            if not newfile:
++                sys.exit(1)
++            return openxmlfile(zefile, root) # recursive call
++
++        doc = xml.dom.minidom.parse(f)
++        cleanDoc(doc,tab,enter)
++        xmlproject = doc.getElementsByTagName(root)[0]
++        f.close()
+         return doc,xmlproject
+     except IOError, msg:
+         print msg
+         sys.exit(1)
+-
++        
+     except xml.parsers.expat.ExpatError, msg:
++        f.close()
+         print "Error parsing XML file %s: %s" %(zefile, msg)
++        if os.path.exists(tmpfile):
++            print "Something happened last time we tried to write file. Temp file found, using it as normal."
++            os.rename(tmpfile, zefile)
++            # Ok, try one more time now
++            return openxmlfile(zefile, root)
+         sys.exit(1)
+ 
+ 
+@@ -95,26 +108,44 @@
+     return doc, rootproject
+     
+ #write a XML doc to a file
+-def savexml(zefile,doc,backup=False) :
+-    f = open(zefile, mode='w+')
+-    pretty = doc.toprettyxml(tab,enter)
+-    if f and pretty:
+-        f.write(pretty.encode("utf-8"))
+-        f.close()
+-        if backup :
+-            #We will now backup the file
+-            backup_nbr = BACKUP_NBR
+-            #We keep BACKUP_NBR versions of the file
+-            #The 0 is the youngest one
+-            while backup_nbr > 0 :
+-                older = "%s.bak.%s" %(zefile,backup_nbr)
+-                backup_nbr -= 1
+-                newer = "%s.bak.%s" %(zefile,backup_nbr)
+-                if os.path.exists(newer) :
+-                    shutil.move(newer,older)
+-            #The bak.0 is always a fresh copy of the closed file
+-            #So that it's not touched in case of bad opening next time
+-            current = "%s.bak.0" %(zefile)
+-            shutil.copy(zefile,current)
+-    else:
+-        print "no file %s or no pretty xml"%zefile
++def savexml(zefile,doc,backup=False):
++    tmpfile = zefile+'__'
++    try:
++        if os.path.exists(zefile):
++            os.rename(zefile, tmpfile)
++        f = open(zefile, mode='w+')
++        pretty = doc.toprettyxml(tab, enter).encode("utf-8")
++        if f and pretty:
++            bwritten = os.write(f.fileno(), pretty)
++            if bwritten != len(pretty):
++                print "error writing file %s" % zefile
++                f.close()
++                return False
++            f.close()
++            
++            if os.path.exists(tmpfile):
++                os.unlink(tmpfile)
++                
++            if backup :
++                #We will now backup the file
++                backup_nbr = BACKUP_NBR
++                #We keep BACKUP_NBR versions of the file
++                #The 0 is the youngest one
++                while backup_nbr > 0 :
++                    older = "%s.bak.%s" %(zefile,backup_nbr)
++                    backup_nbr -= 1
++                    newer = "%s.bak.%s" %(zefile,backup_nbr)
++                    if os.path.exists(newer) :
++                        shutil.move(newer,older)
++                #The bak.0 is always a fresh copy of the closed file
++                #So that it's not touched in case of bad opening next time
++                current = "%s.bak.0" %(zefile)
++                shutil.copy(zefile,current)
++            
++            return True
++        else:
++            print "no file %s or no pretty xml"%zefile
++            return False
++    except IOError, msg:
++        print msg
++        return False




More information about the Python-apps-commits mailing list