[Python-modules-commits] r4961 - in packages/python-openid/trunk/debian (6 files)

[dottedmag-guest at users.alioth.debian.org]

    Date: Monday, March 31, 2008 @ 16:43:28
  Author: dottedmag-guest
Revision: 4961

Updated python-central dependency to avoid bug #452227.
Added patch taken from upstream, fixing compatibility.

Added:
  packages/python-openid/trunk/debian/patches/fix-openid1.0-compatibility.patch
Modified:
  packages/python-openid/trunk/debian/changelog
  packages/python-openid/trunk/debian/control
  packages/python-openid/trunk/debian/patches/build-extensions.patch
  packages/python-openid/trunk/debian/patches/series
  packages/python-openid/trunk/debian/rules

Modified: packages/python-openid/trunk/debian/changelog
===================================================================
--- packages/python-openid/trunk/debian/changelog	2008-03-31 06:12:00 UTC (rev 4960)
+++ packages/python-openid/trunk/debian/changelog	2008-03-31 16:43:28 UTC (rev 4961)
@@ -1,18 +1,21 @@
-python-openid (2.1.1-1) UNRELEASED; urgency=low
+python-openid (2.1.1-1) unstable; urgency=low
 
   [ Mikhail Gusarov ]
-  * New upstream release (Closes: #465699, #457081)
+  * New upstream release (Closes: #465699, #457081).
 
   * Get rid of CDBS and use debhelper directly.
     - cdbs dependency removed.
-  * Remove empty /usr/lib from the package manually until pycentral bug
-    #452227 is closed.
+  * Depend on pycentral >= 0.6 to avoid bug #452227.
 
+  * Added patch fix-openid1.0-compatibility.patch, cherry-picked from
+    upstream (Closes: #471798).
+  * build-extensions.patch refreshed.
+
   [ Sandro Tosi ]
   * debian/watch
-    - fixed version regexp to consider only numerical versions
+    - fixed version regexp to consider only numerical versions.
   * debian/control
-    - added Vcs-Svn and Vcs-Browser
+    - added Vcs-Svn and Vcs-Browser.
 
  -- Mikhail Gusarov <dottedmag at dottedmag.net>  Fri, 21 Mar 2008 12:50:26 +0600
 

Modified: packages/python-openid/trunk/debian/control
===================================================================
--- packages/python-openid/trunk/debian/control	2008-03-31 06:12:00 UTC (rev 4960)
+++ packages/python-openid/trunk/debian/control	2008-03-31 16:43:28 UTC (rev 4961)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Mikhail Gusarov <dottedmag at dottedmag.net>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), quilt
+Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-11), python-central (>= 0.6), quilt
 Standards-Version: 3.7.2
 XS-Python-Version: all
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-openid/trunk/

Modified: packages/python-openid/trunk/debian/patches/build-extensions.patch
===================================================================
--- packages/python-openid/trunk/debian/patches/build-extensions.patch	2008-03-31 06:12:00 UTC (rev 4960)
+++ packages/python-openid/trunk/debian/patches/build-extensions.patch	2008-03-31 16:43:28 UTC (rev 4961)
@@ -1,9 +1,9 @@
-Index: python-openid-2.0.2/setup.py
+Index: python-openid-2.1.1/setup.py
 ===================================================================
---- python-openid-2.0.2.orig/setup.py	2007-11-20 16:34:45.000000000 +0600
-+++ python-openid-2.0.2/setup.py	2007-11-20 16:34:59.000000000 +0600
-@@ -42,6 +42,7 @@
-     url='http://www.openidenabled.com/openid/libraries/python/',
+--- python-openid-2.1.1.orig/setup.py	2007-12-15 06:10:46.000000000 +0600
++++ python-openid-2.1.1/setup.py	2008-03-31 23:40:52.000000000 +0700
+@@ -20,6 +20,7 @@
+     url='http://openidenabled.com/python-openid/',
      packages=['openid',
                'openid.consumer',
 +              'openid.extensions',

Added: packages/python-openid/trunk/debian/patches/fix-openid1.0-compatibility.patch
===================================================================
--- packages/python-openid/trunk/debian/patches/fix-openid1.0-compatibility.patch	                        (rev 0)
+++ packages/python-openid/trunk/debian/patches/fix-openid1.0-compatibility.patch	2008-03-31 16:43:28 UTC (rev 4961)
@@ -0,0 +1,10 @@
+--- a/openid/server/server.py	2008-03-20 21:31:33.000000000 +0200
++++ b/openid/server/server.py	2008-03-20 21:31:45.000000000 +0200
+@@ -609,6 +609,8 @@ class CheckIDRequest(OpenIDRequest):
+                      "claimed_id")
+                 raise ProtocolError(message, text=s)
+ 
++        elif self.identity:
++            self.claimed_id = self.identity
+         else:
+             self.claimed_id = None

Modified: packages/python-openid/trunk/debian/patches/series
===================================================================
--- packages/python-openid/trunk/debian/patches/series	2008-03-31 06:12:00 UTC (rev 4960)
+++ packages/python-openid/trunk/debian/patches/series	2008-03-31 16:43:28 UTC (rev 4961)
@@ -1 +1,2 @@
 build-extensions.patch
+fix-openid1.0-compatibility.patch

Modified: packages/python-openid/trunk/debian/rules
===================================================================
--- packages/python-openid/trunk/debian/rules	2008-03-31 06:12:00 UTC (rev 4960)
+++ packages/python-openid/trunk/debian/rules	2008-03-31 16:43:28 UTC (rev 4961)
@@ -32,8 +32,6 @@
 	dh_installexamples
 	dh_install "doc/*" usr/share/doc/$(PACKAGE_NAME)/html
 	dh_pycentral
-	# Remove empty /usr/lib left after dh_pycentral
-	rmdir $(CURDIR)/debian/$(PACKAGE_NAME)/usr/lib
 	dh_compress -X.py -Xexamples
 	dh_fixperms
 	dh_installdeb