diff -u python-gdata-1.0/debian/changelog python-gdata-1.0/debian/changelog
--- python-gdata-1.0/debian/changelog
+++ python-gdata-1.0/debian/changelog
@@ -1,3 +1,9 @@
+python-gdata (1.0-1ubuntu1) gutsy; urgency=low
+
+  * Add clause for importing elementtree in python 2.5 (Closes: LP #138349).
+
+ -- Basilio A. Kublik <sourcercito@gmail.com>  Sun, 23 Sep 2007 12:21:06 -0400
+
 python-gdata (1.0-1) unstable; urgency=low
 
   * Initial release. (Closes: #419343)
only in patch2:
unchanged:
--- python-gdata-1.0.orig/gdata_service_test.py
+++ python-gdata-1.0/gdata_service_test.py
@@ -18,7 +18,12 @@
 
 import unittest
 import getpass
-from elementtree import ElementTree
+import platform
+ver = platform.python_version()
+if ver >= '2.5':
+	from xml.etree.ElementTree import ElementTree
+else:
+	from elementtree import ElementTree
 import gdata_service
 import gdata
 import atom
only in patch2:
unchanged:
--- python-gdata-1.0.orig/gcalendar.py
+++ python-gdata-1.0/gcalendar.py
@@ -25,7 +25,12 @@
 __author__ = 'api.vli (Vivian Li), api.rboyd (Ryan Boyd)'
 
 
-from elementtree import ElementTree
+import platform
+ver = platform.python_version()
+if ver >= '2.5':
+	from xml.etree.ElementTree import ElementTree
+else:
+	from elementtree import ElementTree
 import atom
 import gdata
 
only in patch2:
unchanged:
--- python-gdata-1.0.orig/gcalendar_test.py
+++ python-gdata-1.0/gcalendar_test.py
@@ -19,7 +19,12 @@
 
 
 import unittest
-from elementtree import ElementTree
+import platform
+ver = platform.python_version()
+if ver >= '2.5':
+	from xml.etree.ElementTree import ElementTree
+else:
+	from elementtree import ElementTree
 import atom 
 import gdata
 import test_data
only in patch2:
unchanged:
--- python-gdata-1.0.orig/gspreadsheet.py
+++ python-gdata-1.0/gspreadsheet.py
@@ -20,7 +20,12 @@
 __author__ = 'api.laurabeth@gmail.com (Laura Beth Lincoln)'
 
 
-from elementtree import ElementTree
+import platform
+ver = platform.python_version()
+if ver >= '2.5':
+	from xml.etree.ElementTree import ElementTree
+else:
+	from elementtree import ElementTree
 import atom
 import gdata
 import re
only in patch2:
unchanged:
--- python-gdata-1.0.orig/gcalendar_service.py
+++ python-gdata-1.0/gcalendar_service.py
@@ -26,7 +26,12 @@
 
 __author__ = 'api.vli (Vivian Li)'
 
-from elementtree import ElementTree
+import platform
+ver = platform.python_version()
+if ver >= '2.5':
+	from xml.etree.ElementTree import ElementTree
+else:
+	from elementtree import ElementTree
 import urllib
 import gdata
 import app_service
only in patch2:
unchanged:
--- python-gdata-1.0.orig/gspreadsheet_test.py
+++ python-gdata-1.0/gspreadsheet_test.py
@@ -19,7 +19,12 @@
 
 
 import unittest
-from elementtree import ElementTree
+import platform
+ver = platform.python_version()
+if ver >= '2.5':
+	from xml.etree.ElementTree import ElementTree
+else:
+	from elementtree import ElementTree
 import gdata
 import gspreadsheet
 
only in patch2:
unchanged:
--- python-gdata-1.0.orig/gdata_service.py
+++ python-gdata-1.0/gdata_service.py
@@ -58,7 +58,12 @@
 
 import httplib
 import urllib
-from elementtree import ElementTree
+import platform
+ver = platform.python_version()
+if ver >= '2.5':
+	from xml.etree.ElementTree import ElementTree
+else:
+	from elementtree import ElementTree
 import app_service
 import gdata
 import atom
only in patch2:
unchanged:
--- python-gdata-1.0.orig/gspreadsheet_service_test.py
+++ python-gdata-1.0/gspreadsheet_service_test.py
@@ -17,7 +17,12 @@
 __author__ = 'api.laurabeth@gmail.com (Laura Beth Lincoln)'
 
 import unittest
-from elementtree import ElementTree
+import platform
+ver = platform.python_version()
+if ver >= '2.5':
+	from xml.etree.ElementTree import ElementTree
+else:
+	from elementtree import ElementTree
 import gspreadsheet_service
 import gdata_service
 import app_service
only in patch2:
unchanged:
--- python-gdata-1.0.orig/gbase_service_test.py
+++ python-gdata-1.0/gbase_service_test.py
@@ -20,7 +20,12 @@
 
 import unittest
 import getpass
-from elementtree import ElementTree
+import platform
+ver = platform.python_version()
+if ver >= '2.5':
+	from xml.etree.ElementTree import ElementTree
+else:
+	from elementtree import ElementTree
 import gbase_service
 import gdata_service
 import app_service
only in patch2:
unchanged:
--- python-gdata-1.0.orig/gbase_test.py
+++ python-gdata-1.0/gbase_test.py
@@ -19,7 +19,12 @@
 
 
 import unittest
-from elementtree import ElementTree
+import platform
+ver = platform.python_version()
+if ver >= '2.5':
+	from xml.etree.ElementTree import ElementTree
+else:
+	from elementtree import ElementTree
 import gdata
 import test_data
 import gbase
only in patch2:
unchanged:
--- python-gdata-1.0.orig/atom.py
+++ python-gdata-1.0/atom.py
@@ -45,7 +45,12 @@
 __author__ = 'api.jscudder (Jeffrey Scudder)'
 
 
-from elementtree import ElementTree
+import platform
+ver = platform.python_version()
+if ver >= '2.5':
+	from xml.etree.ElementTree import ElementTree
+else:
+	from elementtree import ElementTree
 
 
 # XML namespaces which are often used in GData entities.
only in patch2:
unchanged:
--- python-gdata-1.0.orig/gdata_test.py
+++ python-gdata-1.0/gdata_test.py
@@ -19,7 +19,12 @@
 
 
 import unittest
-from elementtree import ElementTree
+import platform
+ver = platform.python_version()
+if ver >= '2.5':
+	from xml.etree.ElementTree import ElementTree
+else:
+	from elementtree import ElementTree
 import gdata
 import test_data
 
only in patch2:
unchanged:
--- python-gdata-1.0.orig/gspreadsheet_service.py
+++ python-gdata-1.0/gspreadsheet_service.py
@@ -27,7 +27,12 @@
 
 __author__ = 'api.laurabeth@gmail.com (Laura Beth Lincoln)'
 
-from elementtree import ElementTree
+import platform
+ver = platform.python_version()
+if ver >= '2.5':
+	from xml.etree.ElementTree import ElementTree
+else:
+	from elementtree import ElementTree
 import urllib
 import gdata
 import app_service
only in patch2:
unchanged:
--- python-gdata-1.0.orig/gcalendar_service_test.py
+++ python-gdata-1.0/gcalendar_service_test.py
@@ -17,7 +17,12 @@
 __author__ = 'api.rboyd@google.com (Ryan Boyd)'
 
 import unittest
-from elementtree import ElementTree
+import platform
+ver = platform.python_version()
+if ver >= '2.5':
+	from xml.etree.ElementTree import ElementTree
+else:
+	from elementtree import ElementTree
 import atom
 import gcalendar
 import gcalendar_service
only in patch2:
unchanged:
--- python-gdata-1.0.orig/app_service.py
+++ python-gdata-1.0/app_service.py
@@ -27,7 +27,12 @@
 
 import httplib
 import urllib
-from elementtree import ElementTree
+import platform
+ver = platform.python_version()
+if ver >= '2.5':
+	from xml.etree.ElementTree import ElementTree
+else:
+	from elementtree import ElementTree
 
 
 class AtomService(object):
only in patch2:
unchanged:
--- python-gdata-1.0.orig/gbase.py
+++ python-gdata-1.0/gbase.py
@@ -21,7 +21,12 @@
 
 #TODO: create the following GBaseAttribute, GBaseAttributesFeed, GBaseItemType, GBaseItemTypeFeed, Attribute, Value, ...
 
-from elementtree import ElementTree
+import platform
+ver = platform.python_version()
+if ver >= '2.5':
+	from xml.etree.ElementTree import ElementTree
+else:
+	from elementtree import ElementTree
 import atom
 import gdata
 
only in patch2:
unchanged:
--- python-gdata-1.0.orig/gbase_service.py
+++ python-gdata-1.0/gbase_service.py
@@ -26,7 +26,12 @@
 
 __author__ = 'api.jscudder (Jeffrey Scudder)'
 
-from elementtree import ElementTree
+import platform
+ver = platform.python_version()
+if ver >= '2.5':
+	from xml.etree.ElementTree import ElementTree
+else:
+	from elementtree import ElementTree
 import urllib
 import gdata
 import app_service
only in patch2:
unchanged:
--- python-gdata-1.0.orig/atom_test.py
+++ python-gdata-1.0/atom_test.py
@@ -19,7 +19,12 @@
 
 
 import unittest
-from elementtree import ElementTree
+import platform
+ver = platform.python_version()
+if ver >= '2.5':
+	from xml.etree.ElementTree import ElementTree
+else:
+	from elementtree import ElementTree
 import atom
 import test_data
 
only in patch2:
unchanged:
--- python-gdata-1.0.orig/gdata.py
+++ python-gdata-1.0/gdata.py
@@ -26,7 +26,12 @@
 __author__ = 'api.jscudder (Jeffrey Scudder)'
 
 
-from elementtree import ElementTree
+import platform
+ver = platform.python_version()
+if ver >= '2.5':
+	from xml.etree.ElementTree import ElementTree
+else:
+	from elementtree import ElementTree
 import atom