[Python-modules-commits] r15206 - in packages/python-gdata/trunk/debian (9 files)

anoteng-guest at users.alioth.debian.org anoteng-guest at users.alioth.debian.org
Wed Dec 29 10:12:49 UTC 2010 

    Date: Wednesday, December 29, 2010 @ 10:12:45
  Author: anoteng-guest
Revision: 15206

New upstream release.

Added:
  packages/python-gdata/trunk/debian/patches/fix_wrong_interpreter_path.patch
  packages/python-gdata/trunk/debian/patches/remove_string_exception.patch
  packages/python-gdata/trunk/debian/patches/series
Modified:
  packages/python-gdata/trunk/debian/changelog
  packages/python-gdata/trunk/debian/compat
  packages/python-gdata/trunk/debian/control
  packages/python-gdata/trunk/debian/patches/remove_shebangs.patch
  packages/python-gdata/trunk/debian/rules
  packages/python-gdata/trunk/debian/source/format

Modified: packages/python-gdata/trunk/debian/changelog
===================================================================
--- packages/python-gdata/trunk/debian/changelog	2010-12-29 03:18:07 UTC (rev 15205)
+++ packages/python-gdata/trunk/debian/changelog	2010-12-29 10:12:45 UTC (rev 15206)
@@ -1,3 +1,15 @@
+python-gdata (2.0.13-1) unstable; urgency=low
+
+  * Team upload.
+  * New upstream release (Closes: #581812)
+  * Standards-Version bumped to 3.9.1:
+    - No change needed.
+  * Change source format to 3.0 (quilt)
+  * Remove patch python2.4_shebangs.patch (fixed upstream)
+  * Remove deprecated string exception (patch from upstream bts) (Closes: #585294)
+
+ -- Andreas Noteng <andreas at noteng.no>  Tue, 28 Dec 2010 00:18:40 +0100
+
 python-gdata (2.0.8-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.

Modified: packages/python-gdata/trunk/debian/compat
===================================================================
--- packages/python-gdata/trunk/debian/compat	2010-12-29 03:18:07 UTC (rev 15205)
+++ packages/python-gdata/trunk/debian/compat	2010-12-29 10:12:45 UTC (rev 15206)
@@ -1 +1 @@
-5
+8

Modified: packages/python-gdata/trunk/debian/control
===================================================================
--- packages/python-gdata/trunk/debian/control	2010-12-29 03:18:07 UTC (rev 15205)
+++ packages/python-gdata/trunk/debian/control	2010-12-29 10:12:45 UTC (rev 15206)
@@ -3,11 +3,11 @@
 Priority: extra
 Maintainer: Gustavo Franco <stratus at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5), python, python-support (>= 0.5.3)
+Build-Depends: cdbs (>= 0.4.43), debhelper (>= 8), python, python-support (>= 0.5.3)
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-gdata/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-gdata/trunk/
 Homepage: http://code.google.com/p/gdata-python-client
-Standards-Version: 3.8.0
+Standards-Version: 3.9.1
 
 Package: python-gdata
 Architecture: all 

Added: packages/python-gdata/trunk/debian/patches/fix_wrong_interpreter_path.patch
===================================================================
--- packages/python-gdata/trunk/debian/patches/fix_wrong_interpreter_path.patch	                        (rev 0)
+++ packages/python-gdata/trunk/debian/patches/fix_wrong_interpreter_path.patch	2010-12-29 10:12:45 UTC (rev 15206)
@@ -0,0 +1,10 @@
+Index: gdata-2.0.13/src/gdata/Crypto/Util/RFC1751.py
+===================================================================
+--- gdata-2.0.13.orig/src/gdata/Crypto/Util/RFC1751.py	2010-12-29 10:39:23.586095902 +0100
++++ gdata-2.0.13/src/gdata/Crypto/Util/RFC1751.py	2010-12-29 10:39:38.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/python
++#!/usr/bin/python
+ # rfc1751.py : Converts between 128-bit strings and a human-readable
+ # sequence of words, as defined in RFC1751: "A Convention for
+ # Human-Readable 128-bit Keys", by Daniel L. McDonald.

Modified: packages/python-gdata/trunk/debian/patches/remove_shebangs.patch
===================================================================
--- packages/python-gdata/trunk/debian/patches/remove_shebangs.patch	2010-12-29 03:18:07 UTC (rev 15205)
+++ packages/python-gdata/trunk/debian/patches/remove_shebangs.patch	2010-12-29 10:12:45 UTC (rev 15206)
@@ -1,118 +1,133 @@
-diff -ruN src.orig/atom/__init__.py src/atom/__init__.py
---- src.orig/atom/__init__.py	2007-10-04 03:31:06.000000000 +0200
-+++ src/atom/__init__.py	2007-11-15 20:58:19.000000000 +0100
+Index: gdata-2.0.13/src/atom/__init__.py
+===================================================================
+--- gdata-2.0.13.orig/src/atom/__init__.py	2010-07-08 20:32:46.000000000 +0200
++++ gdata-2.0.13/src/atom/__init__.py	2010-12-29 10:31:57.870095902 +0100
 @@ -1,4 +1,3 @@
 -#!/usr/bin/python
  #
  # Copyright (C) 2006 Google Inc.
  #
-diff -ruN src.orig/atom/service.py src/atom/service.py
---- src.orig/atom/service.py	2007-08-28 02:55:31.000000000 +0200
-+++ src/atom/service.py	2007-11-15 20:58:22.000000000 +0100
+Index: gdata-2.0.13/src/atom/service.py
+===================================================================
+--- gdata-2.0.13.orig/src/atom/service.py	2010-07-08 20:32:46.000000000 +0200
++++ gdata-2.0.13/src/atom/service.py	2010-12-29 10:31:57.874095902 +0100
 @@ -1,4 +1,3 @@
 -#!/usr/bin/python
  #
- # Copyright (C) 2006 Google Inc.
+ # Copyright (C) 2006, 2007, 2008 Google Inc.
  #
-diff -ruN src.orig/gdata/apps/__init__.py src/gdata/apps/__init__.py
---- src.orig/gdata/apps/__init__.py	2007-08-20 20:23:44.000000000 +0200
-+++ src/gdata/apps/__init__.py	2007-11-15 20:58:24.000000000 +0100
+Index: gdata-2.0.13/src/gdata/apps/__init__.py
+===================================================================
+--- gdata-2.0.13.orig/src/gdata/apps/__init__.py	2010-07-08 20:32:47.000000000 +0200
++++ gdata-2.0.13/src/gdata/apps/__init__.py	2010-12-29 10:31:57.878095902 +0100
 @@ -1,4 +1,3 @@
 -#!/usr/bin/python
  #
  # Copyright (C) 2007 SIOS Technology, Inc.
  #
-diff -ruN src.orig/gdata/apps/service.py src/gdata/apps/service.py
---- src.orig/gdata/apps/service.py	2007-07-10 20:58:39.000000000 +0200
-+++ src/gdata/apps/service.py	2007-11-15 20:58:27.000000000 +0100
+Index: gdata-2.0.13/src/gdata/apps/service.py
+===================================================================
+--- gdata-2.0.13.orig/src/gdata/apps/service.py	2010-07-08 20:32:47.000000000 +0200
++++ gdata-2.0.13/src/gdata/apps/service.py	2010-12-29 10:31:57.882095902 +0100
 @@ -1,4 +1,3 @@
 -#!/usr/bin/python
  #
  # Copyright (C) 2007 SIOS Technology, Inc.
  #
-diff -ruN src.orig/gdata/base/__init__.py src/gdata/base/__init__.py
---- src.orig/gdata/base/__init__.py	2007-09-13 01:42:00.000000000 +0200
-+++ src/gdata/base/__init__.py	2007-11-15 20:58:30.000000000 +0100
+Index: gdata-2.0.13/src/gdata/base/__init__.py
+===================================================================
+--- gdata-2.0.13.orig/src/gdata/base/__init__.py	2010-10-29 22:42:59.000000000 +0200
++++ gdata-2.0.13/src/gdata/base/__init__.py	2010-12-29 10:31:57.882095902 +0100
 @@ -1,4 +1,3 @@
 -#!/usr/bin/python
  #
  # Copyright (C) 2006 Google Inc.
  #
-diff -ruN src.orig/gdata/base/service.py src/gdata/base/service.py
---- src.orig/gdata/base/service.py	2007-09-13 01:36:33.000000000 +0200
-+++ src/gdata/base/service.py	2007-11-15 20:58:32.000000000 +0100
+Index: gdata-2.0.13/src/gdata/base/service.py
+===================================================================
+--- gdata-2.0.13.orig/src/gdata/base/service.py	2010-07-08 20:32:47.000000000 +0200
++++ gdata-2.0.13/src/gdata/base/service.py	2010-12-29 10:31:57.886095902 +0100
 @@ -1,4 +1,3 @@
 -#!/usr/bin/python
  #
  # Copyright (C) 2006 Google Inc.
  #
-diff -ruN src.orig/gdata/calendar/__init__.py src/gdata/calendar/__init__.py
---- src.orig/gdata/calendar/__init__.py	2007-10-06 02:42:24.000000000 +0200
-+++ src/gdata/calendar/__init__.py	2007-11-15 20:58:34.000000000 +0100
+Index: gdata-2.0.13/src/gdata/calendar/__init__.py
+===================================================================
+--- gdata-2.0.13.orig/src/gdata/calendar/__init__.py	2010-07-08 20:32:47.000000000 +0200
++++ gdata-2.0.13/src/gdata/calendar/__init__.py	2010-12-29 10:31:57.930095900 +0100
 @@ -1,4 +1,3 @@
 -#!/usr/bin/python
  #
  # Copyright (C) 2006 Google Inc.
  #
-diff -ruN src.orig/gdata/calendar/service.py src/gdata/calendar/service.py
---- src.orig/gdata/calendar/service.py	2007-10-13 02:52:41.000000000 +0200
-+++ src/gdata/calendar/service.py	2007-11-15 20:58:36.000000000 +0100
+Index: gdata-2.0.13/src/gdata/calendar/service.py
+===================================================================
+--- gdata-2.0.13.orig/src/gdata/calendar/service.py	2010-07-08 20:32:47.000000000 +0200
++++ gdata-2.0.13/src/gdata/calendar/service.py	2010-12-29 10:31:57.938095900 +0100
 @@ -1,4 +1,3 @@
 -#!/usr/bin/python
  #
  # Copyright (C) 2006 Google Inc.
  #
-diff -ruN src.orig/gdata/docs/__init__.py src/gdata/docs/__init__.py
---- src.orig/gdata/docs/__init__.py	2007-08-20 20:24:10.000000000 +0200
-+++ src/gdata/docs/__init__.py	2007-11-15 20:58:38.000000000 +0100
+Index: gdata-2.0.13/src/gdata/docs/__init__.py
+===================================================================
+--- gdata-2.0.13.orig/src/gdata/docs/__init__.py	2010-07-08 20:32:47.000000000 +0200
++++ gdata-2.0.13/src/gdata/docs/__init__.py	2010-12-29 10:31:57.938095900 +0100
 @@ -1,4 +1,3 @@
 -#!/usr/bin/python
  #
- # Copyright (C) 2006 Google Inc.
+ # Copyright 2009 Google Inc. All Rights Reserved.
  #
-diff -ruN src.orig/gdata/docs/service.py src/gdata/docs/service.py
---- src.orig/gdata/docs/service.py	2007-09-13 22:24:46.000000000 +0200
-+++ src/gdata/docs/service.py	2007-11-15 20:58:40.000000000 +0100
+Index: gdata-2.0.13/src/gdata/docs/service.py
+===================================================================
+--- gdata-2.0.13.orig/src/gdata/docs/service.py	2010-11-04 22:23:31.000000000 +0100
++++ gdata-2.0.13/src/gdata/docs/service.py	2010-12-29 10:31:57.942095900 +0100
 @@ -1,4 +1,3 @@
 -#!/usr/bin/python
  #
- # Copyright (C) 2006 Google Inc.
+ # Copyright 2009 Google Inc. All Rights Reserved.
  #
-diff -ruN src.orig/gdata/__init__.py src/gdata/__init__.py
---- src.orig/gdata/__init__.py	2007-10-12 03:01:48.000000000 +0200
-+++ src/gdata/__init__.py	2007-11-15 20:58:47.000000000 +0100
+Index: gdata-2.0.13/src/gdata/__init__.py
+===================================================================
+--- gdata-2.0.13.orig/src/gdata/__init__.py	2010-07-08 20:32:46.000000000 +0200
++++ gdata-2.0.13/src/gdata/__init__.py	2010-12-29 10:31:57.946095900 +0100
 @@ -1,4 +1,3 @@
 -#!/usr/bin/python
  #
  # Copyright (C) 2006 Google Inc.
  #
-diff -ruN src.orig/gdata/service.py src/gdata/service.py
---- src.orig/gdata/service.py	2007-10-16 00:38:47.000000000 +0200
-+++ src/gdata/service.py	2007-11-15 20:58:55.000000000 +0100
+Index: gdata-2.0.13/src/gdata/service.py
+===================================================================
+--- gdata-2.0.13.orig/src/gdata/service.py	2010-08-26 01:31:19.000000000 +0200
++++ gdata-2.0.13/src/gdata/service.py	2010-12-29 10:31:57.954095900 +0100
 @@ -1,4 +1,3 @@
 -#!/usr/bin/python
  #
- # Copyright (C) 2006 Google Inc.
+ # Copyright (C) 2006,2008 Google Inc.
  #
-diff -ruN src.orig/gdata/spreadsheet/__init__.py src/gdata/spreadsheet/__init__.py
---- src.orig/gdata/spreadsheet/__init__.py	2007-10-13 02:51:43.000000000 +0200
-+++ src/gdata/spreadsheet/__init__.py	2007-11-15 20:58:42.000000000 +0100
+Index: gdata-2.0.13/src/gdata/spreadsheet/__init__.py
+===================================================================
+--- gdata-2.0.13.orig/src/gdata/spreadsheet/__init__.py	2010-07-08 20:32:48.000000000 +0200
++++ gdata-2.0.13/src/gdata/spreadsheet/__init__.py	2010-12-29 10:31:57.958095900 +0100
 @@ -1,4 +1,3 @@
 -#!/usr/bin/python
  #
  # Copyright (C) 2007 Google Inc.
  #
-diff -ruN src.orig/gdata/spreadsheet/service.py src/gdata/spreadsheet/service.py
---- src.orig/gdata/spreadsheet/service.py	2007-10-12 02:58:16.000000000 +0200
-+++ src/gdata/spreadsheet/service.py	2007-11-15 20:58:45.000000000 +0100
+Index: gdata-2.0.13/src/gdata/spreadsheet/service.py
+===================================================================
+--- gdata-2.0.13.orig/src/gdata/spreadsheet/service.py	2010-07-12 22:49:16.000000000 +0200
++++ gdata-2.0.13/src/gdata/spreadsheet/service.py	2010-12-29 10:31:58.030095901 +0100
 @@ -1,4 +1,3 @@
 -#!/usr/bin/python
  #
  # Copyright (C) 2007 Google Inc.
  #
-diff -ruN src.orig/gdata/test_data.py src/gdata/test_data.py
---- src.orig/gdata/test_data.py	2007-10-16 00:23:35.000000000 +0200
-+++ src/gdata/test_data.py	2007-11-15 20:58:50.000000000 +0100
+Index: gdata-2.0.13/src/gdata/test_data.py
+===================================================================
+--- gdata-2.0.13.orig/src/gdata/test_data.py	2010-11-16 22:45:26.000000000 +0100
++++ gdata-2.0.13/src/gdata/test_data.py	2010-12-29 10:31:58.058095901 +0100
 @@ -1,4 +1,3 @@
 -#!/usr/bin/python
  #

Added: packages/python-gdata/trunk/debian/patches/remove_string_exception.patch
===================================================================
--- packages/python-gdata/trunk/debian/patches/remove_string_exception.patch	                        (rev 0)
+++ packages/python-gdata/trunk/debian/patches/remove_string_exception.patch	2010-12-29 10:12:45 UTC (rev 15206)
@@ -0,0 +1,41 @@
+Index: gdata-2.0.13/src/atom/service.py
+===================================================================
+--- gdata-2.0.13.orig/src/atom/service.py	2010-12-29 10:59:19.014095901 +0100
++++ gdata-2.0.13/src/atom/service.py	2010-12-29 11:02:03.000000000 +0100
+@@ -426,7 +426,7 @@
+        
+       p_status=response.split()[1]
+       if p_status!=str(200):
+-        raise 'Error status=',str(p_status)
++        raise atom.http.ProxyError('Error status=%s' % p_status)
+ 
+       # Trivial setup for ssl socket.
+       ssl = socket.ssl(p_sock, None, None)
+Index: gdata-2.0.13/tests/atom_tests/service_test.py
+===================================================================
+--- gdata-2.0.13.orig/tests/atom_tests/service_test.py	2010-12-29 11:02:33.834095901 +0100
++++ gdata-2.0.13/tests/atom_tests/service_test.py	2010-12-29 11:05:01.000000000 +0100
+@@ -16,6 +16,7 @@
+ 
+ __author__ = 'j.s at google.com (Jeff Scudder)'
+ 
++import os
+ import unittest
+ import atom.service
+ import atom.mock_http_core
+@@ -153,6 +154,15 @@
+     response = client.Get('http://example.com:1234')
+     self.assertEqual(response.getheader('Echo-Host'), 'example.com:1234')
+ 
++    def testBadHttpsProxyRaisesRealException(self):
++      """Test that real exceptions are raised when there is an error connecting to
++      a host with an https proxy    
++      """
++      client = atom.service.AtomService(server='example.com')
++      client.server = 'example.com'
++      os.environ['https_proxy'] = 'http://example.com'
++      self.assertRaises(atom.http.ProxyError,
++          atom.service.PrepareConnection, client, 'https://example.com')
+ 
+ def suite():
+   return conf.build_suite([AtomServiceUnitTest])

Added: packages/python-gdata/trunk/debian/patches/series
===================================================================
--- packages/python-gdata/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-gdata/trunk/debian/patches/series	2010-12-29 10:12:45 UTC (rev 15206)
@@ -0,0 +1,3 @@
+remove_shebangs.patch
+fix_wrong_interpreter_path.patch
+remove_string_exception.patch

Modified: packages/python-gdata/trunk/debian/rules
===================================================================
--- packages/python-gdata/trunk/debian/rules	2010-12-29 03:18:07 UTC (rev 15205)
+++ packages/python-gdata/trunk/debian/rules	2010-12-29 10:12:45 UTC (rev 15206)
@@ -3,7 +3,6 @@
 DEB_PYTHON_SYSTEM := pysupport
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
 DEB_INSTALL_CHANGELOGS_ALL += RELEASE_NOTES.txt

Modified: packages/python-gdata/trunk/debian/source/format
===================================================================
--- packages/python-gdata/trunk/debian/source/format	2010-12-29 03:18:07 UTC (rev 15205)
+++ packages/python-gdata/trunk/debian/source/format	2010-12-29 10:12:45 UTC (rev 15206)
@@ -1 +1 @@
-1.0
+3.0 (quilt)

More information about the Python-modules-commits mailing list