[Python-modules-commits] r11540 - in packages/lazr.restfulclient/trunk/debian (7 files)

[dktrkranz at users.alioth.debian.org]

    Date: Wednesday, February 3, 2010 @ 21:15:48
  Author: dktrkranz
Revision: 11540

* debian/patches/comparison_fixes.patch:
  - Cherrypick a fix from upstream bzr repository to fix comparisons of
    entries and hosted files with None (LP: #495326).
* debian/control:
  - Bump Standards-Version to 3.8.4, no changes required.
* Switch to format 3.0 (quilt).

Added:
  packages/lazr.restfulclient/trunk/debian/patches/
  packages/lazr.restfulclient/trunk/debian/patches/comparison_fixes.patch
  packages/lazr.restfulclient/trunk/debian/patches/series
  packages/lazr.restfulclient/trunk/debian/source/
  packages/lazr.restfulclient/trunk/debian/source/format
Modified:
  packages/lazr.restfulclient/trunk/debian/changelog
  packages/lazr.restfulclient/trunk/debian/control

Modified: packages/lazr.restfulclient/trunk/debian/changelog
===================================================================
--- packages/lazr.restfulclient/trunk/debian/changelog	2010-02-03 20:04:02 UTC (rev 11539)
+++ packages/lazr.restfulclient/trunk/debian/changelog	2010-02-03 21:15:48 UTC (rev 11540)
@@ -1,3 +1,14 @@
+lazr.restfulclient (0.9.10-2) unstable; urgency=low
+
+  * debian/patches/comparison_fixes.patch:
+    - Cherrypick a fix from upstream bzr repository to fix comparisons of
+      entries and hosted files with None (LP: #495326).
+  * debian/control:
+    - Bump Standards-Version to 3.8.4, no changes required.
+  * Switch to format 3.0 (quilt).
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Wed, 03 Feb 2010 22:08:45 +0100
+
 lazr.restfulclient (0.9.10-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/lazr.restfulclient/trunk/debian/control
===================================================================
--- packages/lazr.restfulclient/trunk/debian/control	2010-02-03 20:04:02 UTC (rev 11539)
+++ packages/lazr.restfulclient/trunk/debian/control	2010-02-03 21:15:48 UTC (rev 11540)
@@ -4,7 +4,7 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Luca Falavigna <dktrkranz at debian.org>, James Westby <james.westby at ubuntu.com>
 Build-Depends: debhelper (>= 7.3.0), python (>= 2.4), python-support, python-setuptools
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: https://launchpad.net/lazr.restfulclient
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/lazr.restfulclient/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/lazr.restfulclient/trunk/

Added: packages/lazr.restfulclient/trunk/debian/patches/comparison_fixes.patch
===================================================================
--- packages/lazr.restfulclient/trunk/debian/patches/comparison_fixes.patch	                        (rev 0)
+++ packages/lazr.restfulclient/trunk/debian/patches/comparison_fixes.patch	2010-02-03 21:15:48 UTC (rev 11540)
@@ -0,0 +1,25 @@
+Description: fix comparisons of entries and hosted files with None
+Origin: http://bazaar.launchpad.net/~lazr-developers/lazr.restfulclient/trunk/revision/85
+
+Index: lazr.restfulclient-0.9.10/src/lazr/restfulclient/resource.py
+===================================================================
+--- lazr.restfulclient-0.9.10.orig/src/lazr/restfulclient/resource.py	2010-02-03 22:02:30.293287800 +0100
++++ lazr.restfulclient-0.9.10/src/lazr/restfulclient/resource.py	2010-02-03 22:02:28.045291500 +0100
+@@ -365,7 +365,8 @@
+         retrieve or modify the hosted file contents is to open a
+         filehandle, which goes direct to the server.
+         """
+-        return self._wadl_resource.url == other._wadl_resource.url
++        return (other is not None and
++                self._wadl_resource.url == other._wadl_resource.url)
+ 
+ 
+ class ServiceRoot(Resource):
+@@ -600,6 +601,7 @@
+         contain the same values.
+         """
+         return (
++            other is not None and
+             self.self_link == other.self_link and
+             self.http_etag == other.http_etag and
+             self._dirty_attributes == other._dirty_attributes)

Added: packages/lazr.restfulclient/trunk/debian/patches/series
===================================================================
--- packages/lazr.restfulclient/trunk/debian/patches/series	                        (rev 0)
+++ packages/lazr.restfulclient/trunk/debian/patches/series	2010-02-03 21:15:48 UTC (rev 11540)
@@ -0,0 +1 @@
+comparison_fixes.patch

Added: packages/lazr.restfulclient/trunk/debian/source/format
===================================================================
--- packages/lazr.restfulclient/trunk/debian/source/format	                        (rev 0)
+++ packages/lazr.restfulclient/trunk/debian/source/format	2010-02-03 21:15:48 UTC (rev 11540)
@@ -0,0 +1 @@
+3.0 (quilt)