diff -Nru python-gdata-1.2.4/debian/changelog python-gdata-1.2.4-0ubuntu2/debian/changelog
--- python-gdata-1.2.4/debian/changelog	2009-06-22 15:59:28.000000000 -0600
+++ python-gdata-1.2.4-0ubuntu2/debian/changelog	2009-06-22 15:58:21.000000000 -0600
@@ -1,3 +1,17 @@
+python-gdata (1.2.4-0ubuntu2-1) jaunty; urgency=low
+
+  * Fixed applied to Jaunty.
+
+ -- Mike Basinger <mike.basinger@ubuntu.com>  Mon, 22 Jun 2009 15:50:50 -0600
+
+python-gdata (1.2.4-0ubuntu2) karmic; urgency=low
+
+  * debian/patches
+    - added 01_deprecated_sha.patch to fix deprecation-warning with
+      python 2.6 (LP: #336706) Thanks to Peter Bui for the patch.
+
+ -- Andreas Moog <amoog@ubuntu.com>  Tue, 19 May 2009 00:47:27 +0200
+
 python-gdata (1.2.4-0ubuntu1) jaunty; urgency=low
 
   * New upstream release (LP: #319182).
diff -Nru python-gdata-1.2.4/debian/patches/01_deprecated_sha.patch python-gdata-1.2.4-0ubuntu2/debian/patches/01_deprecated_sha.patch
--- python-gdata-1.2.4/debian/patches/01_deprecated_sha.patch	1969-12-31 17:00:00.000000000 -0700
+++ python-gdata-1.2.4-0ubuntu2/debian/patches/01_deprecated_sha.patch	2009-06-22 15:50:11.000000000 -0600
@@ -0,0 +1,27 @@
+#
+# Ubuntu: https://bugs.launchpad.net/bugs/336706
+# Upstream: http://code.google.com/p/gdata-python-client/issues/detail?id=236
+# Patch: http://gdata-python-client.googlecode.com/issues/attachment?aid=7561271055489411765&name=gdata-cryptomath_sha_deprecation.diff
+# Description: don't use deprecated sha module anymore, switch to hashlib instead
+#
+diff -Nur -x '*.orig' -x '*~' python-gdata-1.2.4/src/gdata/tlslite/utils/cryptomath.py python-gdata-1.2.4.new/src/gdata/tlslite/utils/cryptomath.py
+--- python-gdata-1.2.4/src/gdata/tlslite/utils/cryptomath.py	2008-12-02 03:35:26.000000000 +0100
++++ python-gdata-1.2.4.new/src/gdata/tlslite/utils/cryptomath.py	2009-05-19 00:44:00.000000000 +0200
+@@ -6,7 +6,7 @@
+ import math
+ import base64
+ import binascii
+-import sha
++import hashlib
+ 
+ from compat import *
+ 
+@@ -195,7 +195,7 @@
+     return int(math.ceil(bits / 8.0))
+ 
+ def hashAndBase64(s):
+-    return stringToBase64(sha.sha(s).digest())
++    return stringToBase64(hashlib.sha1(s).digest())
+ 
+ def getBase64Nonce(numChars=22): #defaults to an 132 bit nonce
+     bytes = getRandomBytes(numChars)